summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2021-04-11 04:11:56 +0000
committermidipix <writeonce@midipix.org>2021-04-11 04:15:25 +0000
commit08f4f252bfef70043726adcfc3d0183d37662935 (patch)
tree8ec09ff93b5c7a2ace9ab0507aa20617b553e507
parent8eba8c20680a5e0c32ab3f02d894ab043aef41c2 (diff)
downloadapimagic-08f4f252bfef70043726adcfc3d0183d37662935.tar.bz2
apimagic-08f4f252bfef70043726adcfc3d0183d37662935.tar.xz
build system: posix make support: refactored PE library versioning rules.
-rw-r--r--sofort/exrules/_pe/pe_mdso_version_none.mk2
-rw-r--r--sofort/exrules/_pe/pe_mdso_version_used.mk5
-rw-r--r--sofort/exrules/_pe/pe_version_none.mk7
-rw-r--r--sofort/exrules/_pe/pe_version_used.mk23
-rw-r--r--sofort/exrules/pe-mdso.mk9
-rw-r--r--sofort/exrules/pe-version.mk32
6 files changed, 39 insertions, 39 deletions
diff --git a/sofort/exrules/_pe/pe_mdso_version_none.mk b/sofort/exrules/_pe/pe_mdso_version_none.mk
new file mode 100644
index 0000000..cf5e350
--- /dev/null
+++ b/sofort/exrules/_pe/pe_mdso_version_none.mk
@@ -0,0 +1,2 @@
+# pe_mdso_version_none.mk: PE shared library rules for targets using mdso.
+# this file is covered by COPYING.SOFORT.
diff --git a/sofort/exrules/_pe/pe_mdso_version_used.mk b/sofort/exrules/_pe/pe_mdso_version_used.mk
new file mode 100644
index 0000000..fac0246
--- /dev/null
+++ b/sofort/exrules/_pe/pe_mdso_version_used.mk
@@ -0,0 +1,5 @@
+# pe_mdso_version_used.mk: PE shared library rules for targets using mdso.
+# this file is covered by COPYING.SOFORT.
+
+$(IMPLIB_SONAME): $(IMPLIB_DEF)
+ $(MDSO) -m $(CC_BITS) -i $(IMPLIB_SONAME) -n $(DSO_SONAME) $(IMPLIB_DEF)
diff --git a/sofort/exrules/_pe/pe_version_none.mk b/sofort/exrules/_pe/pe_version_none.mk
new file mode 100644
index 0000000..df33976
--- /dev/null
+++ b/sofort/exrules/_pe/pe_version_none.mk
@@ -0,0 +1,7 @@
+# pe_version_none.mk: handling of PE shared library versioning schemes.
+# this file is covered by COPYING.SOFORT.
+
+package-implib-soname:
+package-implib-solink:
+package-install-implib-soname:
+package-install-implib-solink:
diff --git a/sofort/exrules/_pe/pe_version_used.mk b/sofort/exrules/_pe/pe_version_used.mk
new file mode 100644
index 0000000..8710dae
--- /dev/null
+++ b/sofort/exrules/_pe/pe_version_used.mk
@@ -0,0 +1,23 @@
+# pe_version_used.mk: handling of PE shared library versioning schemes.
+# this file is covered by COPYING.SOFORT.
+
+package-implib-soname: implib-soname
+package-implib-solink: implib-solink
+package-install-implib-soname: install-implib-soname
+package-install-implib-solink: install-implib-solink
+
+
+$(IMPLIB_SOLINK): $(IMPLIB_SONAME)
+ rm -f $(IMPLIB_SOLINK).tmp
+ ln -s $(IMP_SONAME) $(IMPLIB_SOLINK).tmp
+ mv $(IMPLIB_SOLINK).tmp $(IMPLIB_SOLINK)
+
+install-implib-soname: implib-soname
+ mkdir -p $(DESTDIR)$(LIBDIR)
+ cp $(IMPLIB_SONAME) $(DESTDIR)$(LIBDIR)
+
+install-implib-solink: implib-soname
+ mkdir -p $(DESTDIR)$(LIBDIR)
+ rm -f $(IMPLIB_SOLINK).tmp
+ ln -s $(IMP_SONAME) $(IMPLIB_SOLINK).tmp
+ mv $(IMPLIB_SOLINK).tmp $(DESTDIR)$(LIBDIR)/$(IMP_SOLINK)
diff --git a/sofort/exrules/pe-mdso.mk b/sofort/exrules/pe-mdso.mk
index 9a3b941..a5127eb 100644
--- a/sofort/exrules/pe-mdso.mk
+++ b/sofort/exrules/pe-mdso.mk
@@ -6,13 +6,6 @@ include $(PROJECT_DIR)/sofort/exrules/pe-common.mk
$(IMPLIB_VER): $(IMPLIB_DEF)
$(MDSO) -m $(CC_BITS) -i $(IMPLIB_VER) -n $(DSO_VER) -l $(DSO_LIBPATH) $<
-ifeq ($(AVOID_VERSION),yes)
-
-else
-
-$(IMPLIB_SONAME): $(IMPLIB_DEF)
- $(MDSO) -m $(CC_BITS) -i $(IMPLIB_SONAME) -n $(DSO_SONAME) $(IMPLIB_DEF)
-
-endif
+include $(PROJECT_DIR)/sofort/exrules/_pe/pe_mdso_version_$(VERSION_OPT).mk
include $(PROJECT_DIR)/sofort/exrules/pe-version.mk
diff --git a/sofort/exrules/pe-version.mk b/sofort/exrules/pe-version.mk
index 97ad4ca..7f5b658 100644
--- a/sofort/exrules/pe-version.mk
+++ b/sofort/exrules/pe-version.mk
@@ -1,34 +1,4 @@
# pe-version.mk: handling of PE shared library versioning schemes.
# this file is covered by COPYING.SOFORT.
-ifeq ($(AVOID_VERSION),yes)
-
-package-implib-soname:
-package-implib-solink:
-package-install-implib-soname:
-package-install-implib-solink:
-
-else
-
-package-implib-soname: implib-soname
-package-implib-solink: implib-solink
-package-install-implib-soname: install-implib-soname
-package-install-implib-solink: install-implib-solink
-
-
-$(IMPLIB_SOLINK): $(IMPLIB_SONAME)
- rm -f $(IMPLIB_SOLINK).tmp
- ln -s $(IMP_SONAME) $(IMPLIB_SOLINK).tmp
- mv $(IMPLIB_SOLINK).tmp $(IMPLIB_SOLINK)
-
-install-implib-soname: implib-soname
- mkdir -p $(DESTDIR)$(LIBDIR)
- cp $(IMPLIB_SONAME) $(DESTDIR)$(LIBDIR)
-
-install-implib-solink: implib-soname
- mkdir -p $(DESTDIR)$(LIBDIR)
- rm -f $(IMPLIB_SOLINK).tmp
- ln -s $(IMP_SONAME) $(IMPLIB_SOLINK).tmp
- mv $(IMPLIB_SOLINK).tmp $(DESTDIR)$(LIBDIR)/$(IMP_SOLINK)
-
-endif
+include $(PROJECT_DIR)/sofort/exrules/_pe/pe_version_$(VERSION_OPT).mk