[Libreoffice-commits] .: icu/ExternalProject_icu.mk redland/ExternalProject_raptor.mk redland/ExternalProject_rasqal.mk redland/ExternalProject_redland.mk

[Libreoffice Gerrit user]

 icu/ExternalProject_icu.mk         |    6 +++---
 redland/ExternalProject_raptor.mk  |    4 ++--
 redland/ExternalProject_rasqal.mk  |    4 ++--
 redland/ExternalProject_redland.mk |    4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit cdb86989d118eb9944537be5178275c6d8d7e038
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Tue Jan 1 12:54:49 2013 -0500

    MAKE not GNUMAKE
    
    Change-Id: I0f57a5a3f9d4f710715a478439e87409378f151e

diff --git a/icu/ExternalProject_icu.mk b/icu/ExternalProject_icu.mk
index 2be2957..b76b333 100644
--- a/icu/ExternalProject_icu.mk
+++ b/icu/ExternalProject_icu.mk
@@ -26,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
 	cd $(EXTERNAL_WORKDIR)/source \
 	&& export LIB="$(ILIB)" \
 	&& CFLAGS="$(SOLARINC)" CPPFLAGS="$(SOLARINC)" CXXFLAGS="$(SOLARINC)" ./runConfigureICU Cygwin/MSVC \
-	&& $(GNUMAKE) \
+	&& $(MAKE) \
 	&& touch $@
 else
 $(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) \
 		--with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source) \
 	--enable-layout --disable-static --enable-shared --disable-samples \
-	&& $(GNUMAKE) \
+	&& $(MAKE) \
 	&& for lib in icudata icuin icuuc icule icutu; do \
 	@touch $$lib; \
 	done \
@@ -77,7 +77,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
 		--disable-static --enable-shared $(if $(filter ANDROID,$(OS)),--with-library-suffix=lo)) \
 		$(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)\
-	&& $(GNUMAKE) \
+	&& $(MAKE) \
 	&& touch $@
 
 endif
diff --git a/redland/ExternalProject_raptor.mk b/redland/ExternalProject_raptor.mk
index 1571821..baf0873 100644
--- a/redland/ExternalProject_raptor.mk
+++ b/redland/ExternalProject_raptor.mk
@@ -29,7 +29,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
 	--with-regex-library=posix --with-decimal=none --with-www=xml \
 	--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --target=$(HOST_PLATFORM) \
 	lt_cv_cc_dll_switch="-shared" \
-	&& $(GNUMAKE) \
+	&& $(MAKE) \
 	&& touch $@
 else
 $(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)), \
 		LIBXML2LIB=-lxml2 \
 		--with-xml2-config=$(OUTDIR)/bin/xml2-config) \
-	&& $(GNUMAKE) \
+	&& $(MAKE) \
 	&& touch $@
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk
index 5007046..d52ef3a 100644
--- a/redland/ExternalProject_rasqal.mk
+++ b/redland/ExternalProject_rasqal.mk
@@ -31,7 +31,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
 	--disable-pcre --with-decimal=none --with-www=xml \
 	--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
 	lt_cv_cc_dll_switch="-shared" \
-	&& $(GNUMAKE) \
+	&& $(MAKE) \
 	&& touch $@
 else
 $(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 MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)\
 	$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
-	&& $(GNUMAKE) \
+	&& $(MAKE) \
 	&& touch $@
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk
index 1200e84..86fe869 100644
--- a/redland/ExternalProject_redland.mk
+++ b/redland/ExternalProject_redland.mk
@@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
 	--with-www=xml --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
 	lt_cv_cc_dll_switch="-shared" \
 	&& cd librdf \
-	&& $(GNUMAKE) \
+	&& $(MAKE) \
 	&& touch $@
 else
 $(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-out ANDROID,$(OS)),--with-threads) \
 	&& cd librdf \
-	&& $(GNUMAKE) \
+	&& $(MAKE) \
 	&& touch $@
 endif
 # vim: set noet sw=4 ts=4: