1 files changed, 5 insertions, 66 deletions
diff --git a/sofort/core/flavor.mk b/sofort/core/flavor.mk
index 85c41a2..6a7c97a 100644
--- a/sofort/core/flavor.mk
+++ b/sofort/core/flavor.mk
@@ -1,73 +1,12 @@
 # flavor.mk: top-level handling of build flavors.
 # this file is covered by COPYING.SOFORT.
 
-ifneq ($(OS_DSO_EXRULES),)
 include $(PROJECT_DIR)/sofort/exrules/$(OS_DSO_EXRULES).mk
-endif
 
-ifeq ($(DISABLE_STATIC),yes)
-package-static:
-package-install-static:
-else
-package-static:		static
-package-install-static:	install-static
-endif
+include $(PROJECT_DIR)/sofort/core/_flavor/flavor_static_library_$(STATIC_LIBRARY_OPT).mk
+include $(PROJECT_DIR)/sofort/core/_flavor/flavor_shared_library_$(SHARED_LIBRARY_OPT).mk
 
-ifeq ($(DISABLE_SHARED),yes)
-package-shared:
-package-install-shared:
-else
-package-shared:		shared
-package-install-shared:	install-shared
-endif
+include $(PROJECT_DIR)/sofort/core/_flavor/flavor_app_frontend_$(APP_FRONTEND_OPT).mk
+include $(PROJECT_DIR)/sofort/core/_flavor/flavor_app_linking_$(APP_LINKING_OPT).mk
 
-
-
-ifeq ($(DISABLE_FRONTEND),yes)
-app-tag:
-package-install-app:
-package-install-extras:
-else
-app-tag:		package-app app.tag
-package-install-app:	install-app
-package-install-extras:	install-extras
-endif
-
-
-
-ifeq ($(ALL_STATIC),yes)
-
-package-app:	static-app
-app:		PACKAGE_APP = $(STATIC_APP)
-app-tag:	PACKAGE_APP = $(STATIC_APP)
-app.tag:	$(STATIC_APP)
-
-
-else ifeq ($(ALL_SHARED),yes)
-
-package-app:	shared-app
-app:		PACKAGE_APP = $(SHARED_APP)
-app-tag:	PACKAGE_APP = $(SHARED_APP)
-app.tag:	$(SHARED_APP)
-
-
-else
-
-package-app:	default-app
-app:		PACKAGE_APP = $(DEFAULT_APP)
-app-tag:	PACKAGE_APP = $(DEFAULT_APP)
-app.tag:	$(DEFAULT_APP)
-
-endif
-
-
-
-ifeq ($(CUSTOM_INSTALL_HEADERS),yes)
-
-install-headers:install-headers-custom
-
-else
-
-install-headers:install-headers-default
-
-endif
+include $(PROJECT_DIR)/sofort/core/_flavor/flavor_install_headers_$(INSTALL_HEADERS_OPT).mk