build system: sofort: refactored, rearranged using distinct sub-folders.

4 files changed, 239 insertions, 0 deletions

diff --git a/sofort/core/defs.mk b/sofort/core/defs.mk
new file mode 100644
index 0000000..151bc3d
--- /dev/null
+++ b/sofort/core/defs.mk
@@ -0,0 +1,66 @@
+SHARED_LIB_DEPS =
+SHARED_APP_DEPS =
+STATIC_APP_DEPS =
+
+COMMON_LOBJS	= $(COMMON_SRCS:.c=.lo)
+COMMON_OBJS	= $(COMMON_SRCS:.c=.o)
+
+ARCH_LOBJS	= $(ARCH_SRCS:.c=.lo)
+ARCH_OBJS	= $(ARCH_SRCS:.c=.o)
+
+APP_LOBJS	= $(APP_SRCS:.c=.lo)
+APP_OBJS	= $(APP_SRCS:.c=.o)
+
+SHARED_OBJS	= $(COMMON_LOBJS) $(ARCH_LOBJS)
+STATIC_OBJS	= $(COMMON_OBJS)  $(ARCH_OBJS)
+
+STATIC_LIB_NAME	= $(OS_LIB_PREFIX)$(PACKAGE)$(OS_ARCHIVE_EXT)
+STATIC_LIB	= lib/$(STATIC_LIB_NAME)
+
+DSO_VER		= $(OS_LIB_PREFIX)$(PACKAGE)$(OS_LIB_PREFIXED_SUFFIX)$(VER_XYZ)$(OS_LIB_SUFFIXED_SUFFIX)
+DSO_SONAME	= $(OS_LIB_PREFIX)$(PACKAGE)$(OS_LIB_PREFIXED_SUFFIX)$(VER_SONAME)$(OS_LIB_SUFFIXED_SUFFIX)
+DSO_SOLINK	= $(OS_LIB_PREFIX)$(PACKAGE)$(OS_LIB_SUFFIX)
+
+SHARED_LIB	= lib/$(DSO_VER)
+SHARED_SONAME	= lib/$(DSO_SONAME)
+SHARED_SOLINK	= lib/$(DSO_SOLINK)
+
+IMP_DEF		= $(OS_LIB_PREFIX)$(PACKAGE)$(VER_XYZ)$(OS_LIBDEF_EXT)
+IMP_VER		= $(OS_LIB_PREFIX)$(PACKAGE)$(VER_XYZ)$(OS_IMPLIB_EXT)
+IMP_SONAME	= $(OS_LIB_PREFIX)$(PACKAGE)$(VER_SONAME)$(OS_IMPLIB_EXT)
+IMP_SOLINK	= $(OS_LIB_PREFIX)$(PACKAGE)$(OS_IMPLIB_EXT)
+
+IMPLIB_DEF	= lib/$(IMP_DEF)
+IMPLIB_VER	= lib/$(IMP_VER)
+IMPLIB_SONAME	= lib/$(IMP_SONAME)
+IMPLIB_SOLINK	= lib/$(IMP_SOLINK)
+
+APP		= bin/$(OS_APP_PREFIX)$(NICKNAME)$(OS_APP_SUFFIX)
+DEFAULT_APP	= bin/$(OS_APP_PREFIX)$(NICKNAME)-default$(OS_APP_SUFFIX)
+SHARED_APP	= bin/$(OS_APP_PREFIX)$(NICKNAME)-shared$(OS_APP_SUFFIX)
+STATIC_APP	= bin/$(OS_APP_PREFIX)$(NICKNAME)-static$(OS_APP_SUFFIX)
+
+CFLAGS		= $(CFLAGS_DEBUG)  $(CFLAGS_CONFIG)  $(CFLAGS_SYSROOT) \
+		   $(CFLAGS_COMMON) $(CFLAGS_CMDLINE) $(CFLAGS_HOST)	\
+		   $(CFLAGS_PATH) $(CFLAGS_OS) $(CFLAGS_SITE)            \
+		   $(CFLAGS_VERSION) $(CFLAGS_STRICT)                     \
+                   $(CFLAGS_LAST)    $(CFLAGS_ONCE)
+
+CFLAGS_SHARED	= $(CFLAGS) $(CFLAGS_PIC) $(CFLAGS_SHARED_ATTR)
+CFLAGS_STATIC	= $(CFLAGS) $(CFLAGS_OBJ) $(CFLAGS_STATIC_ATTR)
+CFLAGS_APP	= $(CFLAGS) $(CFLAGS_OBJ) $(CFLAGS_APP_ATTR) $(CFLAGS_UTIL)
+
+LDFLAGS_SHARED	= $(LDFLAGS_DEBUG)   $(LDFLAGS_CONFIG)  $(LDFLAGS_SYSROOT) \
+		   $(LDFLAGS_COMMON)  $(LDFLAGS_CMDLINE) $(LDFLAGS_HOST)    \
+		   $(LDFLAGS_PATH)    $(SHARED_LIB_DEPS) $(LDFLAGS_STRICT)   \
+		   $(LDFLAGS_LAST)    $(LDFLAGS_ONCE)
+
+LDFLAGS_APP	= $(LDFLAGS_DEBUG)   $(LDFLAGS_CONFIG)  $(LDFLAGS_SYSROOT) \
+		   $(LDFLAGS_COMMON)  $(LDFLAGS_CMDLINE) $(LDFLAGS_HOST)    \
+		   $(LDFLAGS_PATH)    $(SHARED_APP_DEPS) $(LDFLAGS_STRICT)   \
+		   $(LDFLAGS_UTIL)    $(LDFLAGS_LAST)    $(LDFLAGS_ONCE)
+
+LDFLAGS_STATIC	= $(LDFLAGS_DEBUG)   $(LDFLAGS_CONFIG)  $(LDFLAGS_SYSROOT) \
+		   $(LDFLAGS_COMMON)  $(LDFLAGS_CMDLINE) $(LDFLAGS_HOST)    \
+		   $(LDFLAGS_PATH)    $(STATIC_APP_DEPS) $(LDFLAGS_STRICT)   \
+		   $(LDFLAGS_LAST)    $(LDFLAGS_ONCE)
diff --git a/sofort/core/flavor.mk b/sofort/core/flavor.mk
new file mode 100644
index 0000000..bd9ab06
--- /dev/null
+++ b/sofort/core/flavor.mk
@@ -0,0 +1,70 @@
+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
+
+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/core/pkgconf.mk b/sofort/core/pkgconf.mk
new file mode 100644
index 0000000..f266b9f
--- /dev/null
+++ b/sofort/core/pkgconf.mk
@@ -0,0 +1,40 @@
+ifeq ($(PKGCONF),no)
+
+install-pkgconf:
+
+else
+
+PKGCONF_VERSION = $(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
+
+build/$(PACKAGE).pc: .pkgconf dirs.tag
+
+build/$(PACKAGE).pc:
+	@touch $@
+	@chmod 0644 $@
+		PKGCONF_NAME='$(PKGNAME)' \
+		PKGCONF_DESC='$(PKGDESC)' \
+		PKGCONF_USRC='$(PKGUSRC)' \
+		PKGCONF_REPO='$(PKGREPO)' \
+		PKGCONF_PSRC='$(PKGPSRC)' \
+		PKGCONF_DURL='$(PKGDURL)' \
+		PKGCONF_DEFS='$(PKGDEFS)' \
+		PKGCONF_LIBS='$(PKGLIBS)' \
+					  \
+		PKGCONF_EXEC_PREFIX='$(EXEC_PREFIX)' \
+		PKGCONF_PREFIX='$(PREFIX)'           \
+		PKGCONF_LIBDIR='$(LIBDIR)'           \
+		PKGCONF_INCLUDEDIR='$(INCLUDEDIR)'   \
+		PKGCONF_VERSION='$(PKGCONF_VERSION)' \
+	$(PROJECT_DIR)/sofort/tools/pkgconf.sh > $@
+
+install-pkgconf: build/$(PACKAGE).pc
+	mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
+	cp -p build/$(PACKAGE).pc    $(DESTDIR)$(LIBDIR)/pkgconfig
+
+install-shared: install-pkgconf
+
+install-static: install-pkgconf
+
+.PHONY: .pkgconf install-pkgconf
+
+endif
diff --git a/sofort/core/version.mk b/sofort/core/version.mk
new file mode 100644
index 0000000..5ef0ee2
--- /dev/null
+++ b/sofort/core/version.mk
@@ -0,0 +1,63 @@
+include $(PROJECT_DIR)/project/tagver.mk
+
+CFLAGS_VERSION	+= -D$(VER_NAMESPACE)_TAG_VER_MAJOR=$(VER_MAJOR)
+CFLAGS_VERSION	+= -D$(VER_NAMESPACE)_TAG_VER_MINOR=$(VER_MINOR)
+CFLAGS_VERSION	+= -D$(VER_NAMESPACE)_TAG_VER_PATCH=$(VER_PATCH)
+
+ifeq ($(AVOID_VERSION),yes)
+
+VER_XYZ		=
+VER_SONAME	=
+
+package-shared-soname:
+package-shared-solink:
+package-install-soname:
+package-install-solink:
+
+else
+
+VER_XYZ		= .$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
+VER_SONAME	= .$(VER_MAJOR)
+
+package-shared-soname:	shared-soname
+package-shared-solink:	shared-solink
+package-install-soname:	install-soname
+package-install-solink:	install-solink
+
+
+
+# libfoo.so (common)
+install-solink:		install-lib
+			rm -f $(SHARED_SOLINK).tmp
+			ln -s $(DSO_VER) $(SHARED_SOLINK).tmp
+			mv $(SHARED_SOLINK).tmp $(DESTDIR)$(LIBDIR)/$(DSO_SOLINK)
+
+$(SHARED_SOLINK):	$(SHARED_LIB)
+			rm -f $@.tmp
+			ln -s $(DSO_VER) $@.tmp
+			mv $@.tmp $@
+
+# libfoo.so.x (symlink)
+ifeq ($(OS_SONAME),symlink)
+$(SHARED_SONAME):	$(SHARED_LIB)
+			rm -f $@.tmp
+			ln -s $(DSO_VER) $@.tmp
+			mv $@.tmp $@
+
+install-soname:		install-lib
+			rm -f $(SHARED_SONAME).tmp
+			ln -s $(DSO_VER) $(SHARED_SONAME).tmp
+			mv $(SHARED_SONAME).tmp $(DESTDIR)$(LIBDIR)/$(DSO_SONAME)
+endif
+
+
+# libfoo.so.x (copy)
+ifeq ($(OS_SONAME),copy)
+install-soname:		install-lib
+			cp $(SHARED_LIB) $(DESTDIR)$(LIBDIR)/$(DSO_SONAME)
+
+$(SHARED_SONAME):	$(SHARED_LIB)
+			cp $(SHARED_LIB) $(SHARED_SONAME)
+endif
+
+endif