[Gnash-commit] /srv/bzr/gnash/trunk r9917: Use paths relative to top sourcedir for po files, so updates from

[Sandro Santilli]

------------------------------------------------------------
revno: 9917
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Sat 2008-10-04 09:06:19 +0200
message:
  Use paths relative to top sourcedir for po files, so updates from
  different hosts don't change just for that. Other cleanups.
modified:
  po/Makefile.am

=== modified file 'po/Makefile.am'
--- a/po/Makefile.am    2008-10-03 12:27:00 +0000
+++ b/po/Makefile.am    2008-10-04 07:06:19 +0000
@@ -28,56 +28,50 @@
 pofiles := $(patsubst %,%.po,$(translations))
 gmofiles := $(patsubst %,%.gmo,$(translations))
 
-MAINTAINERCLEANFILES = \
-       gnash.pot 
-
 CLEANFILES = \
-       $(gmofiles) \
-       POTFILES 
+       $(gmofiles) 
 
-dirs =  $(top_srcdir)/libbase \
-       $(top_srcdir)/backend \
-       $(top_srcdir)/libamf \
-       $(top_srcdir)/libmedia \
-       $(top_srcdir)/libmedia/ffmpeg \
-       $(top_srcdir)/libmedia/gst \
-       $(top_srcdir)/libcore \
-       $(top_srcdir)/libcore/vm \
-       $(top_srcdir)/libcore/swf \
-       $(top_srcdir)/libcore/parser \
-       $(top_srcdir)/libcore/asobj \
-       $(top_srcdir)/utilities \
-       $(top_srcdir)/plugin \
-       $(top_srcdir)/gui \
-       $(top_srcdir)/extensions \
-       $(top_srcdir)/extensions/dbus \
-       $(top_srcdir)/extensions/dejagnu \
-       $(top_srcdir)/extensions/fileio \
-       $(top_srcdir)/extensions/lirc \
-       $(top_srcdir)/extensions/gtk2 \
-       $(top_srcdir)/extensions/metome \
-       $(top_srcdir)/extensions/mysql
+dirs =  libbase \
+       backend \
+       libamf \
+       libmedia \
+       libmedia/ffmpeg \
+       libmedia/gst \
+       libcore \
+       libcore/vm \
+       libcore/swf \
+       libcore/parser \
+       libcore/asobj \
+       utilities \
+       plugin \
+       gui \
+       extensions \
+       extensions/dbus \
+       extensions/dejagnu \
+       extensions/fileio \
+       extensions/lirc \
+       extensions/gtk2 \
+       extensions/metome \
+       extensions/mysql
        
-srcfiles := $(foreach dir,$(dirs),$(wildcard $(dir)/*.cpp))
-
 EXTRA_DIST = $(pofiles) gnash.pot 
 
 all: $(gmofiles)
 
-POTFILES: $(srcfiles)
-       @echo "Building POTFILES..."
-       @rm -f POTFILES
-       @for i in $(srcfiles) ; do \
-         echo "$$i" >> POTFILES;\
-       done
-
 if HAS_GETTEXT
 
-gnash.pot: POTFILES
-       $(XGETTEXT) --language=C++ --files-from=POTFILES -o $(srcdir)/gnash.pot 
\
+gnash.pot: force
+       cd $(top_srcdir); \
+       pwd; \
+       rm -f po/POTFILES; \
+       for i in `find $(dirs) -name '*.cpp'`; do \
+         echo "$$i" >> po/POTFILES;\
+       done; \
+       $(XGETTEXT) --language=C++ --files-from=po/POTFILES -o po/gnash.pot \
          --default-domain=gnash --force \
          --flag=_:1:pass-c-format --keyword=_ \
-         --copyright-holder='Free Software Foundation, Inc.'
+         --copyright-holder='Free Software Foundation, Inc.';  \
+       rm -f po/POTFILES
 
 update-po: gnash.pot
        @for i in $(pofiles); do \
@@ -85,8 +79,6 @@
          $(MSGMERGE) --update $(srcdir)/$$i $(srcdir)/gnash.pot; \
        done
 
-$(gmofiles): #update-po
-
 SUFFIXES = .po .gmo
 .po.gmo:
        $(GMSGFMT) --statistics --directory=$(srcdir) -o $*.gmo $(@:%.gmo=%.po)