Mercurial > mxe-octave

changeset 4951:13d5b82424f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dont install docs on libraries * Makefile.in: add dist_apidoc_DATA to MXE_DISABLE_DOCS list * src/flac.mk: use $(MXE_DISABLE_DOCS) in install * src/freetds.mk: set TARGET_DOCDIR to build dir * src/libunistring.mk: set htmldir to build dir * src/theora.mk: use $(MXE_DISABLE_DOCS) in install * src/ogg.mk: use $(MXE_DISABLE_DOCS) in install * src/vorbis.mk: use $(MXE_DISABLE_DOCS) in install
author John Donoghue
date Tue, 05 Feb 2019 16:46:14 -0500
parents 1dc692fb6187
children fa56d6006e32
files Makefile.in src/flac.mk src/freetds.mk src/libunistring.mk src/ogg.mk src/theora.mk src/vorbis.mk
diffstat 7 files changed, 12 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Tue Feb 05 12:05:47 2019 -0500
+++ b/Makefile.in	Tue Feb 05 16:46:14 2019 -0500
@@ -190,6 +190,7 @@
     pkghtml_DATA= \
     examples_DATA= \
     dist_examples_SCRIPTS= \
+    dist_apidoc_DATA= \
     INFO_DEPS= 
 else
   MXE_DISABLE_DOCS :=
--- a/src/flac.mk	Tue Feb 05 12:05:47 2019 -0500
+++ b/src/flac.mk	Tue Feb 05 16:46:14 2019 -0500
@@ -28,6 +28,6 @@
         --enable-cpplibs \
         --enable-ogg \
         --disable-oggtest
-    $(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_PROGS) $(MXE_DISABLE_DOCS)
+    $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS)
 endef
--- a/src/freetds.mk	Tue Feb 05 12:05:47 2019 -0500
+++ b/src/freetds.mk	Tue Feb 05 16:46:14 2019 -0500
@@ -38,5 +38,5 @@
         --with-gnutls \
         $($(PKG)_CONFIG_OPTS) \
         PKG_CONFIG='$(MXE_PKG_CONFIG)'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install man_MANS=
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_DOCS) TARGET_DOCDIR='$(1)'
 endef
--- a/src/libunistring.mk	Tue Feb 05 12:05:47 2019 -0500
+++ b/src/libunistring.mk	Tue Feb 05 16:46:14 2019 -0500
@@ -24,6 +24,6 @@
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --enable-threads=win32
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_DOCS)
+    $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_DOCS) htmldir=$(1)
 endef
--- a/src/ogg.mk	Tue Feb 05 12:05:47 2019 -0500
+++ b/src/ogg.mk	Tue Feb 05 16:46:14 2019 -0500
@@ -21,6 +21,6 @@
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
-    $(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_PROGS) $(MXE_DISABLE_DOCS)
+    $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS)
 endef
--- a/src/theora.mk	Tue Feb 05 12:05:47 2019 -0500
+++ b/src/theora.mk	Tue Feb 05 16:46:14 2019 -0500
@@ -25,6 +25,7 @@
     cd '$(1)' && ./configure \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
-        --prefix='$(HOST_PREFIX)'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= doc_DATA=
+        --prefix='$(HOST_PREFIX)' \
+        --disable-spec --datadir='$(1)'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS)
 endef
--- a/src/vorbis.mk	Tue Feb 05 12:05:47 2019 -0500
+++ b/src/vorbis.mk	Tue Feb 05 16:46:14 2019 -0500
@@ -22,5 +22,5 @@
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         PKG_CONFIG='$(MXE_PKG_CONFIG)'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS)
 endef