diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-13 16:50:36 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-13 16:56:20 +0100 |
commit | 904f9284a2250e17ff4c25f2c5d7540430a0c020 (patch) | |
tree | 0e96ec19150427ab0061dbdc117634e8056648dd | |
parent | 10a5a1511127fbc6fb1e13323ab6a77f77311747 (diff) |
More passing of MAKE into external configure
...like 2fdf78109e815a64169fdab1a8175b63ef9c64d4 "Pass MAKE into
external/poppler's configure"
Change-Id: I4e2f1a13d120a7398fa81884710c589bb905714d
-rw-r--r-- | external/firebird/ExternalProject_firebird.mk | 2 | ||||
-rw-r--r-- | external/libabw/ExternalProject_libabw.mk | 2 | ||||
-rw-r--r-- | external/libcdr/ExternalProject_libcdr.mk | 2 | ||||
-rw-r--r-- | external/libebook/ExternalProject_libebook.mk | 2 | ||||
-rw-r--r-- | external/libetonyek/ExternalProject_libetonyek.mk | 2 | ||||
-rw-r--r-- | external/libfreehand/ExternalProject_libfreehand.mk | 2 | ||||
-rw-r--r-- | external/liblangtag/ExternalProject_langtag.mk | 2 | ||||
-rw-r--r-- | external/libmspub/ExternalProject_libmspub.mk | 2 | ||||
-rw-r--r-- | external/liborcus/ExternalProject_liborcus.mk | 2 | ||||
-rw-r--r-- | external/libpagemaker/ExternalProject_libpagemaker.mk | 2 | ||||
-rw-r--r-- | external/libvisio/ExternalProject_libvisio.mk | 2 | ||||
-rw-r--r-- | external/libwpd/ExternalProject_libwpd.mk | 2 | ||||
-rw-r--r-- | external/libwpg/ExternalProject_libwpg.mk | 2 |
13 files changed, 13 insertions, 13 deletions
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index f557a36104e3..ed802c3de85a 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -46,7 +46,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build): -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \ ) \ " \ - && ./configure \ + && MAKE=$(MAKE) ./configure \ --without-editline \ --disable-superserver \ --with-system-icu --without-fbsample --without-fbsample-db \ diff --git a/external/libabw/ExternalProject_libabw.mk b/external/libabw/ExternalProject_libabw.mk index d45ef05a6a85..fd0b98ae5ac5 100644 --- a/external/libabw/ExternalProject_libabw.mk +++ b/external/libabw/ExternalProject_libabw.mk @@ -25,7 +25,7 @@ $(eval $(call gb_ExternalProject_use_externals,libabw,\ $(call gb_ExternalProject_get_state_target,libabw,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && ./configure \ + && MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/libcdr/ExternalProject_libcdr.mk b/external/libcdr/ExternalProject_libcdr.mk index 67f79b67377e..fd9658d0997c 100644 --- a/external/libcdr/ExternalProject_libcdr.mk +++ b/external/libcdr/ExternalProject_libcdr.mk @@ -26,7 +26,7 @@ $(eval $(call gb_ExternalProject_use_externals,libcdr,\ $(call gb_ExternalProject_get_state_target,libcdr,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && ./configure \ + && MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk index 1bc7f7c42e0f..5e7f2b010537 100644 --- a/external/libebook/ExternalProject_libebook.mk +++ b/external/libebook/ExternalProject_libebook.mk @@ -27,7 +27,7 @@ $(eval $(call gb_ExternalProject_use_externals,libebook,\ $(call gb_ExternalProject_get_state_target,libebook,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && ./configure \ + && MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk index 9f57a10ca31c..f5ea45705ef2 100644 --- a/external/libetonyek/ExternalProject_libetonyek.mk +++ b/external/libetonyek/ExternalProject_libetonyek.mk @@ -25,7 +25,7 @@ $(eval $(call gb_ExternalProject_use_externals,libetonyek,\ $(call gb_ExternalProject_get_state_target,libetonyek,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && ./configure \ + && MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/libfreehand/ExternalProject_libfreehand.mk b/external/libfreehand/ExternalProject_libfreehand.mk index 39380e9bc01a..c2620c68a14e 100644 --- a/external/libfreehand/ExternalProject_libfreehand.mk +++ b/external/libfreehand/ExternalProject_libfreehand.mk @@ -23,7 +23,7 @@ $(eval $(call gb_ExternalProject_use_externals,libfreehand,\ $(call gb_ExternalProject_get_state_target,libfreehand,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && ./configure \ + && MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk index 8835bdf001b2..15c78a9bc8de 100644 --- a/external/liblangtag/ExternalProject_langtag.mk +++ b/external/liblangtag/ExternalProject_langtag.mk @@ -22,7 +22,7 @@ $(eval $(call gb_ExternalProject_register_targets,langtag,\ # Results in "cl : Command line error D8003 : missing source filename" $(call gb_ExternalProject_get_state_target,langtag,build): $(call gb_ExternalProject_run,build,\ - ./configure --disable-modules --disable-test --disable-introspection --disable-shared --enable-static --with-pic \ + MAKE=$(MAKE) ./configure --disable-modules --disable-test --disable-introspection --disable-shared --enable-static --with-pic \ $(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \ LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \ diff --git a/external/libmspub/ExternalProject_libmspub.mk b/external/libmspub/ExternalProject_libmspub.mk index cac6c810cfb3..2bc21172652c 100644 --- a/external/libmspub/ExternalProject_libmspub.mk +++ b/external/libmspub/ExternalProject_libmspub.mk @@ -24,7 +24,7 @@ $(eval $(call gb_ExternalProject_use_externals,libmspub,\ $(call gb_ExternalProject_get_state_target,libmspub,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && ./configure \ + && MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index bd4abd9649de..85f1588aa147 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -88,7 +88,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : $(if $(liborcus_LDFLAGS),LDFLAGS='$(liborcus_LDFLAGS)') \ MDDS_CFLAGS='$(MDDS_CFLAGS)' \ MDDS_LIBS=' ' \ - ./configure \ + MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/libpagemaker/ExternalProject_libpagemaker.mk b/external/libpagemaker/ExternalProject_libpagemaker.mk index 73d06f8c27b4..f892d42a1162 100644 --- a/external/libpagemaker/ExternalProject_libpagemaker.mk +++ b/external/libpagemaker/ExternalProject_libpagemaker.mk @@ -23,7 +23,7 @@ $(eval $(call gb_ExternalProject_use_externals,libpagemaker,\ $(call gb_ExternalProject_get_state_target,libpagemaker,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && ./configure \ + && MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk index 83eff112d7e4..db65a450ffb7 100644 --- a/external/libvisio/ExternalProject_libvisio.mk +++ b/external/libvisio/ExternalProject_libvisio.mk @@ -26,7 +26,7 @@ $(eval $(call gb_ExternalProject_use_externals,libvisio,\ $(call gb_ExternalProject_get_state_target,libvisio,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && ./configure \ + && MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/libwpd/ExternalProject_libwpd.mk b/external/libwpd/ExternalProject_libwpd.mk index 88b771580d80..7aed6518bdeb 100644 --- a/external/libwpd/ExternalProject_libwpd.mk +++ b/external/libwpd/ExternalProject_libwpd.mk @@ -22,7 +22,7 @@ $(eval $(call gb_ExternalProject_use_externals,libwpd,\ $(call gb_ExternalProject_get_state_target,libwpd,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && ./configure \ + && MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/libwpg/ExternalProject_libwpg.mk b/external/libwpg/ExternalProject_libwpg.mk index 804a989f4598..908af2c8d3dd 100644 --- a/external/libwpg/ExternalProject_libwpg.mk +++ b/external/libwpg/ExternalProject_libwpg.mk @@ -23,7 +23,7 @@ $(eval $(call gb_ExternalProject_use_externals,libwpg,\ $(call gb_ExternalProject_get_state_target,libwpg,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ - && ./configure \ + && MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ --disable-shared \ |