From b3c01c57b857132e77efa75517295b5397a51914 Mon Sep 17 00:00:00 2001 From: midipix Date: Thu, 5 May 2016 21:09:30 -0400 Subject: build system: always install headers with install-static and install-shared. --- Makefile.in | 4 ++-- project/custom.mk | 10 ---------- 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) -- cgit v1.2.3