summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2018-11-10 11:46:40 -0500
committermidipix <writeonce@midipix.org>2018-11-10 20:47:46 -0500
commit8941e3eb6b35193d0cede949b2455f51ff41151d (patch)
tree106510a6d76d2b9ba75e5cd956717fa5f5c53384
parent3a48bb35749f83d48e5b2e66a8e5fbdf9a7cbb6e (diff)
downloadsofort-8941e3eb6b35193d0cede949b2455f51ff41151d.tar.bz2
sofort-8941e3eb6b35193d0cede949b2455f51ff41151d.tar.xz
build system: host flavors: support suffixed library extensions.
'cause you cannot eat your Apfel and eat it two.
-rw-r--r--Makefile.in2
-rw-r--r--sofort/defs.mk4
-rw-r--r--sysinfo/os/any-os.mk4
-rw-r--r--sysinfo/os/bsd.mk4
-rw-r--r--sysinfo/os/cygwin.mk4
-rw-r--r--sysinfo/os/darwin.mk4
-rw-r--r--sysinfo/os/linux.mk4
-rw-r--r--sysinfo/os/midipix.mk4
-rw-r--r--sysinfo/os/mingw.mk4
-rw-r--r--sysinfo/os/msys.mk4
10 files changed, 35 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index 917d875..abe70c5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -135,7 +135,7 @@ src/%.lo: $(SOURCE_DIR)/src/%.c $(ALL_HEADERS) host.tag tree.tag
src/%.o: $(SOURCE_DIR)/src/%.c $(ALL_HEADERS) host.tag tree.tag
$(CC) -c -o $@ $< $(CFLAGS_STATIC)
-lib/%$(OS_LIB_SUFFIX)$(VER_XYZ):
+lib/%$(OS_LIB_PREFIXED_SUFFIX)$(VER_XYZ)$(OS_LIB_SUFFIXED_SUFFIX):
$(CC) -shared -o $@ $^ $(LDFLAGS_SHARED)
lib/%$(OS_ARCHIVE_EXT):
diff --git a/sofort/defs.mk b/sofort/defs.mk
index 2fbc41b..151bc3d 100644
--- a/sofort/defs.mk
+++ b/sofort/defs.mk
@@ -17,8 +17,8 @@ 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_SUFFIX)$(VER_XYZ)
-DSO_SONAME = $(OS_LIB_PREFIX)$(PACKAGE)$(OS_LIB_SUFFIX)$(VER_SONAME)
+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)
diff --git a/sysinfo/os/any-os.mk b/sysinfo/os/any-os.mk
index cf8ec00..6c5a2af 100644
--- a/sysinfo/os/any-os.mk
+++ b/sysinfo/os/any-os.mk
@@ -10,3 +10,7 @@ OS_SONAME = symlink
OS_BINFMT = ELF
.PHONY: $(IMPLIB_DEF) $(IMPLIB_VER) $(IMPLIB_SONAME) $(IMPLIB_SOLINK)
+
+# dso suffix notation
+OS_LIB_PREFIXED_SUFFIX = $(OS_LIB_SUFFIX)
+OS_LIB_SUFFIXED_SUFFIX =
diff --git a/sysinfo/os/bsd.mk b/sysinfo/os/bsd.mk
index 6e8fac0..61a3a05 100644
--- a/sysinfo/os/bsd.mk
+++ b/sysinfo/os/bsd.mk
@@ -10,3 +10,7 @@ OS_SONAME = symlink
OS_BINFMT = ELF
.PHONY: $(IMPLIB_DEF) $(IMPLIB_VER) $(IMPLIB_SONAME) $(IMPLIB_SOLINK)
+
+# dso suffix notation
+OS_LIB_PREFIXED_SUFFIX = $(OS_LIB_SUFFIX)
+OS_LIB_SUFFIXED_SUFFIX =
diff --git a/sysinfo/os/cygwin.mk b/sysinfo/os/cygwin.mk
index 21cb1a1..290aa0d 100644
--- a/sysinfo/os/cygwin.mk
+++ b/sysinfo/os/cygwin.mk
@@ -11,3 +11,7 @@ OS_BINFMT = PE
OS_IMPLIB_TOOL = dlltool
CFLAGS_PIC =
+
+# dso suffix notation
+OS_LIB_PREFIXED_SUFFIX = $(OS_LIB_SUFFIX)
+OS_LIB_SUFFIXED_SUFFIX =
diff --git a/sysinfo/os/darwin.mk b/sysinfo/os/darwin.mk
index 5a0b99e..abc9bc7 100644
--- a/sysinfo/os/darwin.mk
+++ b/sysinfo/os/darwin.mk
@@ -12,3 +12,7 @@ OS_BINFMT = MACHO
CFLAGS_OS += -D_DARWIN_C_SOURCE
.PHONY: $(IMPLIB_DEF) $(IMPLIB_VER) $(IMPLIB_SONAME) $(IMPLIB_SOLINK)
+
+# dso suffix notation
+OS_LIB_PREFIXED_SUFFIX =
+OS_LIB_SUFFIXED_SUFFIX = $(OS_LIB_SUFFIX)
diff --git a/sysinfo/os/linux.mk b/sysinfo/os/linux.mk
index 082026b..fffe324 100644
--- a/sysinfo/os/linux.mk
+++ b/sysinfo/os/linux.mk
@@ -10,3 +10,7 @@ OS_SONAME = symlink
OS_BINFMT = ELF
.PHONY: $(IMPLIB_DEF) $(IMPLIB_VER) $(IMPLIB_SONAME) $(IMPLIB_SOLINK)
+
+# dso suffix notation
+OS_LIB_PREFIXED_SUFFIX = $(OS_LIB_SUFFIX)
+OS_LIB_SUFFIXED_SUFFIX =
diff --git a/sysinfo/os/midipix.mk b/sysinfo/os/midipix.mk
index b2d7096..d23d387 100644
--- a/sysinfo/os/midipix.mk
+++ b/sysinfo/os/midipix.mk
@@ -9,3 +9,7 @@ OS_ARCHIVE_EXT = .a
OS_SONAME = symlink
OS_BINFMT = PE
OS_IMPLIB_TOOL = mdso
+
+# dso suffix notation
+OS_LIB_PREFIXED_SUFFIX = $(OS_LIB_SUFFIX)
+OS_LIB_SUFFIXED_SUFFIX =
diff --git a/sysinfo/os/mingw.mk b/sysinfo/os/mingw.mk
index 53fe2d6..1a352ba 100644
--- a/sysinfo/os/mingw.mk
+++ b/sysinfo/os/mingw.mk
@@ -12,3 +12,7 @@ OS_IMPLIB_TOOL = dlltool
CFLAGS_PIC =
CFLAGS_OS += -U__STRICT_ANSI__
+
+# dso suffix notation
+OS_LIB_PREFIXED_SUFFIX = $(OS_LIB_SUFFIX)
+OS_LIB_SUFFIXED_SUFFIX =
diff --git a/sysinfo/os/msys.mk b/sysinfo/os/msys.mk
index 27482e0..70fcd68 100644
--- a/sysinfo/os/msys.mk
+++ b/sysinfo/os/msys.mk
@@ -12,3 +12,7 @@ OS_IMPLIB_TOOL = dlltool
CFLAGS_PIC =
CFLAGS_OS += -U__STRICT_ANSI__
+
+# dso suffix notation
+OS_LIB_PREFIXED_SUFFIX = $(OS_LIB_SUFFIX)
+OS_LIB_SUFFIXED_SUFFIX =