libgweather r139 - in trunk: . data po-locations

[sdroege svn gnome org]

Author: sdroege
Date: Wed Mar 12 15:51:36 2008
New Revision: 139
URL: http://svn.gnome.org/viewvc/libgweather?rev=139&view=rev

Log:
* Makefile.am:
* configure.in:
* data/Makefile.am:
* po-locations/Makefile.am: Also dist Locations.xml.in and
po-locations/*. Based on a patch by LoÃc Minier.
Closes bug #419863.


Added:
   trunk/po-locations/Makefile.am
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in
   trunk/data/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed Mar 12 15:51:36 2008
@@ -1,4 +1,4 @@
-SUBDIRS = po libgweather data
+SUBDIRS = po po-locations libgweather data
 
 EXTRA_DIST = \
 	MAINTAINERS			\

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Mar 12 15:51:36 2008
@@ -131,6 +131,7 @@
 AC_OUTPUT([
 Makefile
 po/Makefile.in
+po-locations/Makefile
 libgweather/Makefile
 libgweather/gweather.pc
 data/Makefile

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Wed Mar 12 15:51:36 2008
@@ -1,9 +1,11 @@
 EXTRA_DIST =			\
 	locations_diff.py	\
 	locations.dtd		\
-	Locations.xml
+	Locations.xml           \
+	Locations.xml.in
 
 libgweatherlocationsdir = $(pkgdatadir)
 libgweatherlocations_in_files = Locations.xml.in
-libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml) locations.dtd
-%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po-locations/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $@
+dist_libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml) locations.dtd
+%.xml: %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po)
+	LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $@

Added: trunk/po-locations/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/po-locations/Makefile.am	Wed Mar 12 15:51:36 2008
@@ -0,0 +1,5 @@
+EXTRA_DIST = ChangeLog \
+	POTFILES.in \
+	POTFILES.skip \
+	$(wildcard *.po)
+