[vlc-commits] contrib: gettext: revector and simplify

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Aug  6 10:28:48 2016 +0300| [e4d0543de91e1cf5c7f846ddaa4fd71c9927a6c5] | committer: Rémi Denis-Courmont

contrib: gettext: revector and simplify

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e4d0543de91e1cf5c7f846ddaa4fd71c9927a6c5
---

 contrib/src/gettext/rules.mak | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/contrib/src/gettext/rules.mak b/contrib/src/gettext/rules.mak
index c16c2ba..5d210a6 100644
--- a/contrib/src/gettext/rules.mak
+++ b/contrib/src/gettext/rules.mak
@@ -19,25 +19,27 @@ gettext: gettext-$(GETTEXT_VERSION).tar.gz .sum-gettext
 
 DEPS_gettext = iconv $(DEPS_iconv)
 
-.gettext: gettext
-	#cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-relocatable --disable-java --disable-native-java --without-emacs
-	#cd $< && $(MAKE) install
-	#cd $< && $(MAKE) -C gettext-runtime/intl && $(MAKE) -C gettext-runtime/intl install && $(MAKE) -C gettext-tools/misc install
-	#touch $@
-
+GETTEXT_CONF = \
+	--disable-relocatable \
+	--disable-java \
+	--disable-native-java \
+	--without-emacs
 ifdef HAVE_WIN32
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-relocatable --disable-java --disable-native-java --disable-threads
-	cd $< && $(MAKE) -C gettext-runtime install && $(MAKE) -C gettext-tools/misc install && $(MAKE) -C gettext-tools/m4 install
-else
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-java --disable-native-java --without-emacs
-	cd $< && $(MAKE) -C gettext-runtime install && $(MAKE) -C gettext-tools/intl && $(MAKE) -C gettext-tools/misc install && $(MAKE) -C gettext-tools/m4 install
-ifndef HAVE_ANDROID
-	cd $< && $(MAKE) -C gettext-tools/libgrep && $(MAKE) -C gettext-tools/gnulib-lib && $(MAKE) -C gettext-tools/src install
+GETTEXT_CONF += --disable-threads
 endif
+
+.gettext: gettext
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(GETTEXT_CONF)
+ifndef HAVE_ANDROID
+	cd $< && $(MAKE) install
+else
+	cd $< && $(MAKE) -C gettext-runtime install
+	cd $< && $(MAKE) -C gettext-tools/intl
+	cd $< && $(MAKE) -C gettext-tools/misc install
+	cd $< && $(MAKE) -C gettext-tools/m4 install
 endif
 ifdef HAVE_MACOSX
 	# detect libintl correctly in configure for static library
 	sed -i.orig  's/$$LIBS $$LIBINTL/$$LIBS $$LIBINTL $$INTL_MACOSX_LIBS/' "$(PREFIX)"/share/aclocal/gettext.m4
 endif
 	touch $@
-