project, config/x86_64-linux-musl: refactor, define extension subsets.

3 files changed, 151 insertions, 132 deletions

diff --git a/config/x86_64-linux-musl/config.mk b/config/x86_64-linux-musl/config.mk
index 1008d8b..9ac2f9d 100644
--- a/config/x86_64-linux-musl/config.mk
+++ b/config/x86_64-linux-musl/config.mk
@@ -1,3 +1,5 @@
+include $(PROJECT_DIR)/profiles/pyexts/subsets.mk
+
 PYTHON_PATH	=
 PYTHON_PLATFORM	= linux2
 
@@ -39,130 +41,12 @@ CONFIG_SRCS = \
 
 shared-lib: LDFLAGS_CONFIG += -Wl,-no-undefined
 
-PYEXT_SUBSET_SHARED = \
-	$(PYEXT_ARRAY_SHARED) \
-	$(PYEXT_AUDIOOP_SHARED) \
-	$(PYEXT_BINASCII_SHARED) \
-	$(PYEXT_BISECT_SHARED) \
-	$(PYEXT_BZ2_SHARED) \
-	$(PYEXT_CMATH_SHARED) \
-	$(PYEXT_CODECS_CN_SHARED) \
-	$(PYEXT_CODECS_HK_SHARED) \
-	$(PYEXT_CODECS_ISO2022_SHARED) \
-	$(PYEXT_CODECS_JP_SHARED) \
-	$(PYEXT_CODECS_KR_SHARED) \
-	$(PYEXT_CODECS_TW_SHARED) \
-	$(PYEXT_COLLECTIONS_SHARED) \
-	$(PYEXT_CPICKLE_SHARED) \
-	$(PYEXT_CRYPT_SHARED) \
-	$(PYEXT_CSTRINGIO_SHARED) \
-	$(PYEXT_CSV_SHARED) \
-	$(PYEXT_CTYPES_SHARED) \
-	$(PYEXT_CTYPES_TEST_SHARED) \
-	$(PYEXT_CURSES_PANEL_SHARED) \
-	$(PYEXT_CURSES_SHARED) \
-	$(PYEXT_DATETIME_SHARED) \
-	$(PYEXT_DBM_SHARED) \
-	$(PYEXT_ELEMENTTREE_SHARED) \
-	$(PYEXT_FCNTL_SHARED) \
-	$(PYEXT_FUNCTOOLS_SHARED) \
-	$(PYEXT_FUTURE_BUILTINS_SHARED) \
-	$(PYEXT_GDBM_SHARED) \
-	$(PYEXT_GRP_SHARED) \
-	$(PYEXT_HASHLIB_SHARED) \
-	$(PYEXT_HEAPQ_SHARED) \
-	$(PYEXT_HOTSHOT_SHARED) \
-	$(PYEXT_IO_SHARED) \
-	$(PYEXT_ITERTOOLS_SHARED) \
-	$(PYEXT_JSON_SHARED) \
-	$(PYEXT_LINUXAUDIODEV_SHARED) \
-	$(PYEXT_LOCALE_SHARED) \
-	$(PYEXT_LSPROF_SHARED) \
-	$(PYEXT_MATH_SHARED) \
-	$(PYEXT_MMAP_SHARED) \
-	$(PYEXT_MULTIBYTECODEC_SHARED) \
-	$(PYEXT_MULTIPROCESSING_SHARED) \
-	$(PYEXT_OPERATOR_SHARED) \
-	$(PYEXT_OSSAUDIODEV_SHARED) \
-	$(PYEXT_PARSER_SHARED) \
-	$(PYEXT_PYEXPAT_SHARED) \
-	$(PYEXT_RANDOM_SHARED) \
-	$(PYEXT_READLINE_SHARED) \
-	$(PYEXT_RESOURCE_SHARED) \
-	$(PYEXT_SELECT_SHARED) \
-	$(PYEXT_SOCKET_SHARED) \
-	$(PYEXT_SPWD_SHARED) \
-	$(PYEXT_SQLITE3_SHARED) \
-	$(PYEXT_SSL_SHARED) \
-	$(PYEXT_STROP_SHARED) \
-	$(PYEXT_STRUCT_SHARED) \
-	$(PYEXT_SYSLOG_SHARED) \
-	$(PYEXT_TERMIOS_SHARED) \
-	$(PYEXT_TESTCAPI_SHARED) \
-	$(PYEXT_TIME_SHARED) \
-	$(PYEXT_UNICODEDATA_SHARED) \
-	$(PYEXT_ZLIB_SHARED) \
+PYEXT_SHARED = \
+	$(PYEXT_SUBSET_SHARED_ANYOS_CORE) \
+	$(PYEXT_SUBSET_SHARED_ANYOS_AUDIO) \
+	$(PYEXT_SUBSET_SHARED_LINUX_AUDIO)  \
 
-PYEXT_SUBSET_STATIC = \
-	$(PYEXT_ARRAY_STATIC) \
-	$(PYEXT_AUDIOOP_STATIC) \
-	$(PYEXT_BINASCII_STATIC) \
-	$(PYEXT_BISECT_STATIC) \
-	$(PYEXT_BZ2_STATIC) \
-	$(PYEXT_CMATH_STATIC) \
-	$(PYEXT_CODECS_CN_STATIC) \
-	$(PYEXT_CODECS_HK_STATIC) \
-	$(PYEXT_CODECS_ISO2022_STATIC) \
-	$(PYEXT_CODECS_JP_STATIC) \
-	$(PYEXT_CODECS_KR_STATIC) \
-	$(PYEXT_CODECS_TW_STATIC) \
-	$(PYEXT_COLLECTIONS_STATIC) \
-	$(PYEXT_CPICKLE_STATIC) \
-	$(PYEXT_CRYPT_STATIC) \
-	$(PYEXT_CSTRINGIO_STATIC) \
-	$(PYEXT_CSV_STATIC) \
-	$(PYEXT_CTYPES_STATIC) \
-	$(PYEXT_CTYPES_TEST_STATIC) \
-	$(PYEXT_CURSES_PANEL_STATIC) \
-	$(PYEXT_CURSES_STATIC) \
-	$(PYEXT_DATETIME_STATIC) \
-	$(PYEXT_DBM_STATIC) \
-	$(PYEXT_ELEMENTTREE_STATIC) \
-	$(PYEXT_FCNTL_STATIC) \
-	$(PYEXT_FUNCTOOLS_STATIC) \
-	$(PYEXT_FUTURE_BUILTINS_STATIC) \
-	$(PYEXT_GDBM_STATIC) \
-	$(PYEXT_GRP_STATIC) \
-	$(PYEXT_HASHLIB_STATIC) \
-	$(PYEXT_HEAPQ_STATIC) \
-	$(PYEXT_HOTSHOT_STATIC) \
-	$(PYEXT_IO_STATIC) \
-	$(PYEXT_ITERTOOLS_STATIC) \
-	$(PYEXT_JSON_STATIC) \
-	$(PYEXT_LINUXAUDIODEV_STATIC) \
-	$(PYEXT_LOCALE_STATIC) \
-	$(PYEXT_LSPROF_STATIC) \
-	$(PYEXT_MATH_STATIC) \
-	$(PYEXT_MMAP_STATIC) \
-	$(PYEXT_MULTIBYTECODEC_STATIC) \
-	$(PYEXT_MULTIPROCESSING_STATIC) \
-	$(PYEXT_OPERATOR_STATIC) \
-	$(PYEXT_OSSAUDIODEV_STATIC) \
-	$(PYEXT_PARSER_STATIC) \
-	$(PYEXT_PYEXPAT_STATIC) \
-	$(PYEXT_RANDOM_STATIC) \
-	$(PYEXT_READLINE_STATIC) \
-	$(PYEXT_RESOURCE_STATIC) \
-	$(PYEXT_SELECT_STATIC) \
-	$(PYEXT_SOCKET_STATIC) \
-	$(PYEXT_SPWD_STATIC) \
-	$(PYEXT_SQLITE3_STATIC) \
-	$(PYEXT_SSL_STATIC) \
-	$(PYEXT_STROP_STATIC) \
-	$(PYEXT_STRUCT_STATIC) \
-	$(PYEXT_SYSLOG_STATIC) \
-	$(PYEXT_TERMIOS_STATIC) \
-	$(PYEXT_TESTCAPI_STATIC) \
-	$(PYEXT_TIME_STATIC) \
-	$(PYEXT_UNICODEDATA_STATIC) \
-	$(PYEXT_ZLIB_STATIC) \
+PYEXT_STATIC = \
+	$(PYEXT_SUBSET_STATIC_ANYOS_CORE) \
+	$(PYEXT_SUBSET_STATIC_ANYOS_AUDIO) \
+	$(PYEXT_SUBSET_STATIC_LINUX_AUDIO)  \
diff --git a/profiles/pyexts/subsets.mk b/profiles/pyexts/subsets.mk
new file mode 100644
index 0000000..6b36125
--- /dev/null
+++ b/profiles/pyexts/subsets.mk
@@ -0,0 +1,138 @@
+# extension subsets: shared
+PYEXT_SUBSET_SHARED_ANYOS_CORE = \
+	$(PYEXT_ARRAY_SHARED) \
+	$(PYEXT_BINASCII_SHARED) \
+	$(PYEXT_BISECT_SHARED) \
+	$(PYEXT_BZ2_SHARED) \
+	$(PYEXT_CMATH_SHARED) \
+	$(PYEXT_CODECS_CN_SHARED) \
+	$(PYEXT_CODECS_HK_SHARED) \
+	$(PYEXT_CODECS_ISO2022_SHARED) \
+	$(PYEXT_CODECS_JP_SHARED) \
+	$(PYEXT_CODECS_KR_SHARED) \
+	$(PYEXT_CODECS_TW_SHARED) \
+	$(PYEXT_COLLECTIONS_SHARED) \
+	$(PYEXT_CPICKLE_SHARED) \
+	$(PYEXT_CRYPT_SHARED) \
+	$(PYEXT_CSTRINGIO_SHARED) \
+	$(PYEXT_CSV_SHARED) \
+	$(PYEXT_CTYPES_SHARED) \
+	$(PYEXT_CTYPES_TEST_SHARED) \
+	$(PYEXT_CURSES_PANEL_SHARED) \
+	$(PYEXT_CURSES_SHARED) \
+	$(PYEXT_DATETIME_SHARED) \
+	$(PYEXT_DBM_SHARED) \
+	$(PYEXT_ELEMENTTREE_SHARED) \
+	$(PYEXT_FCNTL_SHARED) \
+	$(PYEXT_FUNCTOOLS_SHARED) \
+	$(PYEXT_FUTURE_BUILTINS_SHARED) \
+	$(PYEXT_GDBM_SHARED) \
+	$(PYEXT_GRP_SHARED) \
+	$(PYEXT_HASHLIB_SHARED) \
+	$(PYEXT_HEAPQ_SHARED) \
+	$(PYEXT_HOTSHOT_SHARED) \
+	$(PYEXT_IO_SHARED) \
+	$(PYEXT_ITERTOOLS_SHARED) \
+	$(PYEXT_JSON_SHARED) \
+	$(PYEXT_LOCALE_SHARED) \
+	$(PYEXT_LSPROF_SHARED) \
+	$(PYEXT_MATH_SHARED) \
+	$(PYEXT_MMAP_SHARED) \
+	$(PYEXT_MULTIBYTECODEC_SHARED) \
+	$(PYEXT_MULTIPROCESSING_SHARED) \
+	$(PYEXT_OPERATOR_SHARED) \
+	$(PYEXT_PARSER_SHARED) \
+	$(PYEXT_PYEXPAT_SHARED) \
+	$(PYEXT_RANDOM_SHARED) \
+	$(PYEXT_READLINE_SHARED) \
+	$(PYEXT_RESOURCE_SHARED) \
+	$(PYEXT_SELECT_SHARED) \
+	$(PYEXT_SOCKET_SHARED) \
+	$(PYEXT_SPWD_SHARED) \
+	$(PYEXT_SQLITE3_SHARED) \
+	$(PYEXT_SSL_SHARED) \
+	$(PYEXT_STROP_SHARED) \
+	$(PYEXT_STRUCT_SHARED) \
+	$(PYEXT_SYSLOG_SHARED) \
+	$(PYEXT_TERMIOS_SHARED) \
+	$(PYEXT_TESTCAPI_SHARED) \
+	$(PYEXT_TIME_SHARED) \
+	$(PYEXT_UNICODEDATA_SHARED) \
+	$(PYEXT_ZLIB_SHARED) \
+
+PYEXT_SUBSET_SHARED_ANYOS_AUDIO = \
+	$(PYEXT_AUDIOOP_SHARED) \
+	$(PYEXT_OSSAUDIODEV_SHARED) \
+
+PYEXT_SUBSET_SHARED_LINUX_AUDIO = \
+	$(PYEXT_LINUXAUDIODEV_SHARED) \
+
+
+# extension subsets: static
+PYEXT_SUBSET_STATIC_ANYOS_CORE = \
+	$(PYEXT_ARRAY_STATIC) \
+	$(PYEXT_BINASCII_STATIC) \
+	$(PYEXT_BISECT_STATIC) \
+	$(PYEXT_BZ2_STATIC) \
+	$(PYEXT_CMATH_STATIC) \
+	$(PYEXT_CODECS_CN_STATIC) \
+	$(PYEXT_CODECS_HK_STATIC) \
+	$(PYEXT_CODECS_ISO2022_STATIC) \
+	$(PYEXT_CODECS_JP_STATIC) \
+	$(PYEXT_CODECS_KR_STATIC) \
+	$(PYEXT_CODECS_TW_STATIC) \
+	$(PYEXT_COLLECTIONS_STATIC) \
+	$(PYEXT_CPICKLE_STATIC) \
+	$(PYEXT_CRYPT_STATIC) \
+	$(PYEXT_CSTRINGIO_STATIC) \
+	$(PYEXT_CSV_STATIC) \
+	$(PYEXT_CTYPES_STATIC) \
+	$(PYEXT_CTYPES_TEST_STATIC) \
+	$(PYEXT_CURSES_PANEL_STATIC) \
+	$(PYEXT_CURSES_STATIC) \
+	$(PYEXT_DATETIME_STATIC) \
+	$(PYEXT_DBM_STATIC) \
+	$(PYEXT_ELEMENTTREE_STATIC) \
+	$(PYEXT_FCNTL_STATIC) \
+	$(PYEXT_FUNCTOOLS_STATIC) \
+	$(PYEXT_FUTURE_BUILTINS_STATIC) \
+	$(PYEXT_GDBM_STATIC) \
+	$(PYEXT_GRP_STATIC) \
+	$(PYEXT_HASHLIB_STATIC) \
+	$(PYEXT_HEAPQ_STATIC) \
+	$(PYEXT_HOTSHOT_STATIC) \
+	$(PYEXT_IO_STATIC) \
+	$(PYEXT_ITERTOOLS_STATIC) \
+	$(PYEXT_JSON_STATIC) \
+	$(PYEXT_LOCALE_STATIC) \
+	$(PYEXT_LSPROF_STATIC) \
+	$(PYEXT_MATH_STATIC) \
+	$(PYEXT_MMAP_STATIC) \
+	$(PYEXT_MULTIBYTECODEC_STATIC) \
+	$(PYEXT_MULTIPROCESSING_STATIC) \
+	$(PYEXT_OPERATOR_STATIC) \
+	$(PYEXT_PARSER_STATIC) \
+	$(PYEXT_PYEXPAT_STATIC) \
+	$(PYEXT_RANDOM_STATIC) \
+	$(PYEXT_READLINE_STATIC) \
+	$(PYEXT_RESOURCE_STATIC) \
+	$(PYEXT_SELECT_STATIC) \
+	$(PYEXT_SOCKET_STATIC) \
+	$(PYEXT_SPWD_STATIC) \
+	$(PYEXT_SQLITE3_STATIC) \
+	$(PYEXT_SSL_STATIC) \
+	$(PYEXT_STROP_STATIC) \
+	$(PYEXT_STRUCT_STATIC) \
+	$(PYEXT_SYSLOG_STATIC) \
+	$(PYEXT_TERMIOS_STATIC) \
+	$(PYEXT_TESTCAPI_STATIC) \
+	$(PYEXT_TIME_STATIC) \
+	$(PYEXT_UNICODEDATA_STATIC) \
+	$(PYEXT_ZLIB_STATIC) \
+
+PYEXT_SUBSET_STATIC_ANYOS_AUDIO = \
+	$(PYEXT_AUDIOOP_STATIC) \
+	$(PYEXT_OSSAUDIODEV_STATIC) \
+
+PYEXT_SUBSET_STATIC_LINUX_AUDIO = \
+	$(PYEXT_LINUXAUDIODEV_STATIC) \
diff --git a/project/extras.mk b/project/extras.mk
index f8bfa4b..2db9e76 100644
--- a/project/extras.mk
+++ b/project/extras.mk
@@ -14,7 +14,7 @@ CFLAGS_CONFIG += -DPYTHONPATH=\"$(PYTHON_PATH)\"
 ifeq ($(ALL_STATIC),yes)
 	CFLAGS_STATIC	+= -DPY_ALL_STATIC
 
-	LDFLAGS_STATIC	+= $(PYEXT_SUBSET_STATIC)
+	LDFLAGS_STATIC	+= $(PYEXT_STATIC)
 
 	LDFLAGS_STATIC	+= $(LDFLAGS_PYEXT_STATIC)
 
@@ -92,8 +92,5 @@ include $(PROJECT_DIR)/project/pyexts.mk
 
 
 # shared extension modules: desired subset
-ifeq ($(ALL_STATIC),yes)
-all:	$(PYEXT_SUBSET_STATIC)
-else
-all:	$(PYEXT_SUBSET_SHARED)
-endif
+$(SHARED_APP): $(PYEXT_SHARED)
+$(STATIC_APP): $(PYEXT_STATIC)