diff options
| author | midipix <writeonce@midipix.org> | 2016-05-10 16:27:36 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2016-05-10 16:51:05 -0400 |
| commit | e1e881d49c54fc2ae66e56bac6de8ff10c22b901 (patch) | |
| tree | 284d117fba9eb8f9efbcc89c02858319d226515a | |
| parent | c6de7289a6517de8bbb3c1759b6c7888bcbecc4e (diff) | |
| download | slibtool-e1e881d49c54fc2ae66e56bac6de8ff10c22b901.tar.bz2 slibtool-e1e881d49c54fc2ae66e56bac6de8ff10c22b901.tar.xz | |
build system: Makefile.in, version.mk: added --avoid-version support.
| -rw-r--r-- | Makefile.in | 11 | ||||
| -rw-r--r-- | project/version.mk | 21 |
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 |