summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2016-05-05 21:09:30 -0400
committermidipix <writeonce@midipix.org>2016-05-06 11:03:41 -0400
commita5e87f1a1d5bb826aece34b16da80eaedd781f43 (patch)
tree6e25947bb7c3c0a2df30a2f7e145557de33b154f
parentcc13115f5076ecda85fc1b195ebdafce8608427b (diff)
downloadapimagic-a5e87f1a1d5bb826aece34b16da80eaedd781f43.tar.bz2
apimagic-a5e87f1a1d5bb826aece34b16da80eaedd781f43.tar.xz
build system: always install headers with install-static and install-shared.
-rw-r--r--Makefile.in4
-rw-r--r--project/custom.mk10
2 files changed, 2 insertions, 12 deletions
diff --git a/Makefile.in b/Makefile.in
index d96bf5e..2314ebb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -121,19 +121,19 @@ app.tag: package-app
install-libs: package-install-shared
install-libs: package-install-static
-install-libs: package-install-headers
install-headers:package-shared package-static
mkdir -p $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE)
cp $(API_HEADERS) $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE)
install-shared: shared install-lib install-soname install-solink install-implib
+install-shared: install-headers
install-lib: shared
mkdir -p $(DESTDIR)$(LIBDIR)
cp $(SHARED_LIB) $(DESTDIR)$(LIBDIR)
-install-static: static
+install-static: static install-headers
mkdir -p $(DESTDIR)$(LIBDIR)
cp $(STATIC_LIB) $(DESTDIR)$(LIBDIR)
diff --git a/project/custom.mk b/project/custom.mk
index 056855d..b0adcdd 100644
--- a/project/custom.mk
+++ b/project/custom.mk
@@ -24,16 +24,6 @@ package-shared: shared
package-install-shared: install-shared
endif
-ifneq ($(DISABLE_STATIC),yes)
-package-install-headers:install-headers
-
-else ifneq ($(DISABLE_SHARED),yes)
-package-install-headers:install-headers
-
-else
-package-install-headers:
-endif
-
ifeq ($(ALL_STATIC),yes)