diff options
| author | Vincent Untz <vuntz@gnome.org> | 2008-04-18 14:26:27 +0000 |
|---|---|---|
| committer | Vincent Untz <vuntz@src.gnome.org> | 2008-04-18 14:26:27 +0000 |
| commit | d309f5310ed72109ef10691ee1337390be22fa2b (patch) | |
| tree | 06ccc23fcd72cd36ff2bf452fe8498f16f544a75 | |
| parent | 80ea8f185705f6454009433656a82516766f02ea (diff) | |
| download | libgweather-d309f5310ed72109ef10691ee1337390be22fa2b.tar.gz | |
make "make -jX" work. Fix bug #528359.
2008-04-18 Vincent Untz <vuntz@gnome.org>
* data/Makefile.am: make "make -jX" work. Fix bug #528359.
svn path=/branches/gnome-2-22/; revision=185
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | data/Makefile.am | 15 |
2 files changed, 17 insertions, 2 deletions
@@ -1,5 +1,9 @@ 2008-04-18 Vincent Untz <vuntz@gnome.org> + * data/Makefile.am: make "make -jX" work. Fix bug #528359. + +2008-04-18 Vincent Untz <vuntz@gnome.org> + * data/Makefile.am: fix build when $LINGUAS is set. Fix bug #528031. 2008-04-15 Vincent Untz <vuntz@gnome.org> diff --git a/data/Makefile.am b/data/Makefile.am index 4393c4d..48144c5 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -6,6 +6,8 @@ libgweatherlocations_in_files = Locations.xml.in 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 @@ libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml) 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 = $(libgweatherlocations_in_files:.xml.in=.xml) 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 @@ $(libgweatherlocations_DATA): $(libgweatherlocations_in_files) $(PO_LOCATIONS) 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 @@ EXTRA_DIST = \ README CLEANFILES = \ - $(libgweatherlocations_DATA) + $(libgweatherlocations_DATA) \ + $(LOCATIONS_STAMP) |