libgweather r184 - in trunk: . data

[vuntz svn gnome org]

Author: vuntz
Date: Fri Apr 18 14:26:16 2008
New Revision: 184
URL: http://svn.gnome.org/viewvc/libgweather?rev=184&view=rev

Log:
2008-04-18  Vincent Untz  <vuntz gnome org>

	* data/Makefile.am: make "make -jX" work. Fix bug #528359.


Modified:
   trunk/ChangeLog
   trunk/data/Makefile.am

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Fri Apr 18 14:26:16 2008
@@ -6,6 +6,8 @@
 
 if USE_ONE_BIG_XML
 
+LOCATIONS_STAMP = 
+
 libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml)
 
 %.xml: %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po)
@@ -13,6 +15,8 @@
 
 else # USE_ONE_BIG_XML
 
+LOCATIONS_STAMP = stamp-Locations.xml
+
 PO_LOCATIONS = $(shell if test -n "$(LINGUAS)"; then for lang in $(LINGUAS); do if test -f "$(top_srcdir)/po-locations/$$lang.po"; then echo "$(top_srcdir)/po-locations/$$lang.po "; fi; done; else for pofile in $(top_srcdir)/po-locations/*.po; do echo $$pofile; done; fi)
 
 # Helper variable
@@ -20,7 +24,12 @@
 
 libgweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/po-locations/|Locations.|g;s|\.po|.xml|g") $(libgweatherlocations_data)
 
-$(libgweatherlocations_DATA): $(libgweatherlocations_in_files) $(PO_LOCATIONS)
+# We need this step so that we merge all the make Locations.xy.xml destinations
+# into one unique destination. This makes -j2 work. (Else, we end up with
+# multiple and conflicting calls to intltool-merge)
+$(libgweatherlocations_DATA): $(LOCATIONS_STAMP)
+
+$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS)
 	LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data)
 	for pofile in $(PO_LOCATIONS); do \
 		locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`;	\
@@ -31,6 +40,7 @@
 	xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data)
 	rm -f C/$(libgweatherlocations_data)
 	test -d C && rmdir C
+	touch $@
 
 endif # USE_ONE_BIG_XML
 
@@ -45,4 +55,5 @@
 	README
 
 CLEANFILES =	\
-	$(libgweatherlocations_DATA)
+	$(libgweatherlocations_DATA)		\
+	$(LOCATIONS_STAMP)