From 2d66926d3362f44f43766b9561be46587a5de8d8 Mon Sep 17 00:00:00 2001 From: midipix Date: Tue, 25 Dec 2018 02:28:50 -0500 Subject: build system: sofort: promoted and renamed custom.mk --> flavor.mk. --- Makefile.in | 2 +- sofort/custom.mk | 76 -------------------------------------------------------- sofort/flavor.mk | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 77 deletions(-) delete mode 100644 sofort/custom.mk create mode 100644 sofort/flavor.mk diff --git a/Makefile.in b/Makefile.in index 01d7caa..e0029cc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -128,8 +128,8 @@ include ./usrdefs.mk endif include $(PROJECT_DIR)/sofort/defs.mk +include $(PROJECT_DIR)/sofort/flavor.mk include $(PROJECT_DIR)/sofort/version.mk -include $(PROJECT_DIR)/sofort/custom.mk include $(PROJECT_DIR)/sofort/pkgconf.mk include $(PROJECT_DIR)/project/osforce.mk diff --git a/sofort/custom.mk b/sofort/custom.mk deleted file mode 100644 index 8e0bbc4..0000000 --- a/sofort/custom.mk +++ /dev/null @@ -1,76 +0,0 @@ -ifeq ($(OS_BINFMT),PE) -include $(PROJECT_DIR)/sysinfo/os/pe.mk -endif - -ifeq ($(OS_BINFMT),ELF) -include $(PROJECT_DIR)/sysinfo/os/elf.mk -endif - - - -ifeq ($(DISABLE_STATIC),yes) -package-static: -package-install-static: -else -package-static: static -package-install-static: install-static -endif - -ifeq ($(DISABLE_SHARED),yes) -package-shared: -package-install-shared: -else -package-shared: shared -package-install-shared: install-shared -endif - - - -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 diff --git a/sofort/flavor.mk b/sofort/flavor.mk new file mode 100644 index 0000000..8e0bbc4 --- /dev/null +++ b/sofort/flavor.mk @@ -0,0 +1,76 @@ +ifeq ($(OS_BINFMT),PE) +include $(PROJECT_DIR)/sysinfo/os/pe.mk +endif + +ifeq ($(OS_BINFMT),ELF) +include $(PROJECT_DIR)/sysinfo/os/elf.mk +endif + + + +ifeq ($(DISABLE_STATIC),yes) +package-static: +package-install-static: +else +package-static: static +package-install-static: install-static +endif + +ifeq ($(DISABLE_SHARED),yes) +package-shared: +package-install-shared: +else +package-shared: shared +package-install-shared: install-shared +endif + + + +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 -- cgit v1.2.3