Kaydet (Commit) cdb86989 authored tarafından Peter Foley's avatar Peter Foley

MAKE not GNUMAKE

Change-Id: I0f57a5a3f9d4f710715a478439e87409378f151e
üst 0ce5edfb
...@@ -26,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) : ...@@ -26,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
cd $(EXTERNAL_WORKDIR)/source \ cd $(EXTERNAL_WORKDIR)/source \
&& export LIB="$(ILIB)" \ && export LIB="$(ILIB)" \
&& CFLAGS="$(SOLARINC)" CPPFLAGS="$(SOLARINC)" CXXFLAGS="$(SOLARINC)" ./runConfigureICU Cygwin/MSVC \ && CFLAGS="$(SOLARINC)" CPPFLAGS="$(SOLARINC)" CXXFLAGS="$(SOLARINC)" ./runConfigureICU Cygwin/MSVC \
&& $(GNUMAKE) \ && $(MAKE) \
&& touch $@ && touch $@
else else
$(call gb_ExternalProject_get_state_target,icu,build) : $(call gb_ExternalProject_get_state_target,icu,build) :
...@@ -39,7 +39,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) : ...@@ -39,7 +39,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
--with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source) \ --with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source) \
--enable-layout --disable-static --enable-shared --disable-samples \ --enable-layout --disable-static --enable-shared --disable-samples \
&& $(GNUMAKE) \ && $(MAKE) \
&& for lib in icudata icuin icuuc icule icutu; do \ && for lib in icudata icuin icuuc icule icutu; do \
@touch $$lib; \ @touch $$lib; \
done \ done \
...@@ -77,7 +77,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) : ...@@ -77,7 +77,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
--disable-static --enable-shared $(if $(filter ANDROID,$(OS)),--with-library-suffix=lo)) \ --disable-static --enable-shared $(if $(filter ANDROID,$(OS)),--with-library-suffix=lo)) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)\ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)\
--with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source)\ --with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source)\
&& $(GNUMAKE) \ && $(MAKE) \
&& touch $@ && touch $@
endif endif
......
...@@ -29,7 +29,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build): ...@@ -29,7 +29,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
--with-regex-library=posix --with-decimal=none --with-www=xml \ --with-regex-library=posix --with-decimal=none --with-www=xml \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --target=$(HOST_PLATFORM) \ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --target=$(HOST_PLATFORM) \
lt_cv_cc_dll_switch="-shared" \ lt_cv_cc_dll_switch="-shared" \
&& $(GNUMAKE) \ && $(MAKE) \
&& touch $@ && touch $@
else else
$(call gb_ExternalProject_get_state_target,raptor,build): $(call gb_ExternalProject_get_state_target,raptor,build):
...@@ -53,7 +53,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build): ...@@ -53,7 +53,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
$(if $(filter NO,$(SYSTEM_LIBXML)), \ $(if $(filter NO,$(SYSTEM_LIBXML)), \
LIBXML2LIB=-lxml2 \ LIBXML2LIB=-lxml2 \
--with-xml2-config=$(OUTDIR)/bin/xml2-config) \ --with-xml2-config=$(OUTDIR)/bin/xml2-config) \
&& $(GNUMAKE) \ && $(MAKE) \
&& touch $@ && touch $@
endif endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -31,7 +31,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build): ...@@ -31,7 +31,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
--disable-pcre --with-decimal=none --with-www=xml \ --disable-pcre --with-decimal=none --with-www=xml \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
lt_cv_cc_dll_switch="-shared" \ lt_cv_cc_dll_switch="-shared" \
&& $(GNUMAKE) \ && $(MAKE) \
&& touch $@ && touch $@
else else
$(call gb_ExternalProject_get_state_target,rasqal,build): $(call gb_ExternalProject_get_state_target,rasqal,build):
...@@ -50,7 +50,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build): ...@@ -50,7 +50,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)\ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)\
$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
&& $(GNUMAKE) \ && $(MAKE) \
&& touch $@ && touch $@
endif endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,redland,build): ...@@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
--with-www=xml --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ --with-www=xml --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
lt_cv_cc_dll_switch="-shared" \ lt_cv_cc_dll_switch="-shared" \
&& cd librdf \ && cd librdf \
&& $(GNUMAKE) \ && $(MAKE) \
&& touch $@ && touch $@
else else
$(call gb_ExternalProject_get_state_target,redland,build): $(call gb_ExternalProject_get_state_target,redland,build):
...@@ -55,7 +55,7 @@ $(call gb_ExternalProject_get_state_target,redland,build): ...@@ -55,7 +55,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
$(if $(filter-out ANDROID,$(OS)),--with-threads) \ $(if $(filter-out ANDROID,$(OS)),--with-threads) \
&& cd librdf \ && cd librdf \
&& $(GNUMAKE) \ && $(MAKE) \
&& touch $@ && touch $@
endif endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment