summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2016-05-10 16:27:36 -0400
committermidipix <writeonce@midipix.org>2016-11-11 00:22:44 -0500
commit53e4f7917aafb3b4c549790ba23565b466632102 (patch)
tree6802eb490ae9ad50478ca4c8d2dc553a22eef5c6
parentf6f91474dd8a4a8a516a8c6ce47b151ae3cae52d (diff)
downloadmdso-53e4f7917aafb3b4c549790ba23565b466632102.tar.bz2
mdso-53e4f7917aafb3b4c549790ba23565b466632102.tar.xz
build system: Makefile.in, version.mk: added --avoid-version support.
-rw-r--r--Makefile.in11
-rw-r--r--project/version.mk21
2 files changed, 30 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index e869656..418a787 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,6 +3,7 @@ NICKNAME = @nickname@
PROJECT_DIR = @project_dir@
GIT_REFERENCE_DIR = @git_reference_dir@
CUSTOM_INSTALL_HEADERS = @custom_install_headers@
+AVOID_VERSION = @avoid_version@
BUILD = @build@
HOST = @host@
@@ -128,7 +129,8 @@ install-headers-default:
mkdir -p $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE)
cp $(API_HEADERS) $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE)
-install-shared: shared install-lib install-soname install-solink install-implib
+install-shared: shared install-lib install-implib
+install-shared: package-install-soname package-install-solink
install-shared: install-headers
install-lib: shared
@@ -149,7 +151,8 @@ install-static-app: static-app install-app-extras
-shared: shared-lib shared-soname shared-solink implib
+shared: shared-lib implib
+shared: package-shared-soname package-shared-solink
static: static-lib
@@ -365,9 +368,13 @@ clean: clean-implib
.PHONY: all install shared static app \
package-app \
shared-objs shared-lib \
+ shared-soname shared-solink \
+ package-shared-soname package-shared-solink \
static-objs static-lib \
default-app shared-app static-app \
install-shared install-static \
+ install-soname install-solink \
+ package-install-soname package-install-solink \
install-headers install-app \
install-headers-default install-headers-custom \
clean distclean clean-implib version \
diff --git a/project/version.mk b/project/version.mk
index 1d58cf3..930a295 100644
--- a/project/version.mk
+++ b/project/version.mk
@@ -4,9 +4,28 @@ 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 $@.tmp
@@ -40,3 +59,5 @@ install-soname: install-lib
$(SHARED_SONAME): $(SHARED_LIB)
cp $(SHARED_LIB) $(SHARED_SONAME)
endif
+
+endif