Merge pull request #481 from uwehermann/no_cruft

Add MXE_DISABLE_{PROGRAMS,DOCS,CRUFT} and use it in a few packages

7 files changed, 54 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 0054b97..9ccc04c 100644
--- a/Makefile
+++ b/Makefile
@@ -68,6 +68,48 @@ MXE_CONFIGURE_OPTS = \
         --enable-static --disable-shared , \
         --disable-static --enable-shared )
 
+# Append these to the "make" and "make install" steps of autotools packages
+# in order to neither build nor install unwanted binaries, manpages,
+# infopages and API documentation (reduces build time and disk space usage).
+# NOTE: We don't include bin_SCRIPTS (and variations), since many packages
+# install files such as pcre-config (which we do want to be installed).
+
+MXE_DISABLE_PROGRAMS = \
+    bin_PROGRAMS= \
+    sbin_PROGRAMS= \
+    noinst_PROGRAMS= \
+    check_PROGRAMS=
+
+MXE_DISABLE_DOCS = \
+    man_MANS= \
+    man1_MANS= \
+    man2_MANS= \
+    man3_MANS= \
+    man4_MANS= \
+    man5_MANS= \
+    man6_MANS= \
+    man7_MANS= \
+    man8_MANS= \
+    man9_MANS= \
+    dist_man_MANS= \
+    dist_man1_MANS= \
+    dist_man2_MANS= \
+    dist_man3_MANS= \
+    dist_man4_MANS= \
+    dist_man5_MANS= \
+    dist_man6_MANS= \
+    dist_man7_MANS= \
+    dist_man8_MANS= \
+    dist_man9_MANS= \
+    notrans_dist_man_MANS= \
+    info_TEXINFOS= \
+    doc_DATA= \
+    dist_doc_DATA= \
+    html_DATA= \
+    dist_html_DATA=
+
+MXE_DISABLE_CRUFT = $(MXE_DISABLE_PROGRAMS) $(MXE_DISABLE_DOCS)
+
 MAKE_SHARED_FROM_STATIC = \
 	'$(TOP_DIR)/tools/make-shared-from-static' \
 	$(if $(findstring mingw,$(TARGET)),--windowsdll) \
diff --git a/src/curl.mk b/src/curl.mk
index 5f3360c..e2a0eee 100644
--- a/src/curl.mk
+++ b/src/curl.mk
@@ -25,7 +25,7 @@ define $(PKG)_BUILD
         --enable-sspi \
         --enable-ipv6 \
         --with-libssh2
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_CRUFT)
     ln -sf '$(PREFIX)/$(TARGET)/bin/curl-config' '$(PREFIX)/bin/$(TARGET)-curl-config'
 
     '$(TARGET)-gcc' \
diff --git a/src/libssh2.mk b/src/libssh2.mk
index cd1f27c..082f783 100644
--- a/src/libssh2.mk
+++ b/src/libssh2.mk
@@ -21,10 +21,11 @@ define $(PKG)_BUILD
     cd '$(1)' && ./buildconf
     cd '$(1)' && ./configure \
         $(MXE_CONFIGURE_OPTS) \
+        --disable-examples-build \
         --without-openssl \
         --with-libgcrypt \
         PKG_CONFIG='$(TARGET)-pkg-config'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install noinst_PROGRAMS= dist_man_MANS=
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_CRUFT)
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
diff --git a/src/libzip.mk b/src/libzip.mk
index d6f0385..8a5cd22 100644
--- a/src/libzip.mk
+++ b/src/libzip.mk
@@ -21,7 +21,7 @@ define $(PKG)_BUILD
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-shared
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_CRUFT) SUBDIRS=lib
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
diff --git a/src/opus.mk b/src/opus.mk
index faafe02..3dac60f 100644
--- a/src/opus.mk
+++ b/src/opus.mk
@@ -23,6 +23,9 @@ endef
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         $(MXE_CONFIGURE_OPTS)
-    $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
-    $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_CRUFT)
+    $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_CRUFT)
+    rm -f '$(PREFIX)/$(TARGET)'/share/man/man3/opus_*.3
+    rm -f '$(PREFIX)/$(TARGET)'/share/man/man3/opus.h.3
+    rm -rf '$(PREFIX)/$(TARGET)'/share/doc/opus/html
 endef
diff --git a/src/pcre.mk b/src/pcre.mk
index f01e2ee..39ee8aa 100644
--- a/src/pcre.mk
+++ b/src/pcre.mk
@@ -27,8 +27,9 @@ define $(PKG)_BUILD_SHARED
         --disable-pcregrep-libz \
         --disable-pcregrep-libbz2 \
         --disable-pcretest-libreadline
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_CRUFT)
     rm -f '$(PREFIX)/$(TARGET)'/share/man/man3/pcre16*.3
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    rm -f '$(PREFIX)/$(TARGET)'/share/man/man3/pcre32*.3
     ln -sf '$(PREFIX)/$(TARGET)/bin/pcre-config' '$(PREFIX)/bin/$(TARGET)-pcre-config'
 endef
 
diff --git a/src/tiff.mk b/src/tiff.mk
index 3683c4e..8284030 100644
--- a/src/tiff.mk
+++ b/src/tiff.mk
@@ -21,5 +21,5 @@ define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         $(MXE_CONFIGURE_OPTS) \
         --without-x
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_CRUFT)
 endef