[Gnucash-changes] r12271 - gnucash/trunk - Yet more build tweaks for .pot file generation.

[Chris Shoemaker]

Author: chris
Date: 2006-01-05 21:49:27 -0500 (Thu, 05 Jan 2006)
New Revision: 12271
Trac: http://svn.gnucash.org/trac/changeset/12271

Removed:
   gnucash/trunk/po/POTFILES.in
Modified:
   gnucash/trunk/Makefile.am
Log:
Yet more build tweaks for .pot file generation.

Remove po/POTFILES.in (again) from svn.  Since po/POTFILES.in is added
to BUILT_SOURCES, it's auto-generated now whenever the `make all',
`make check', or `make install' targets are processed, (but not
recreated every time).  And `make pot' forces the recreation of
po/POTFILES.in.  Hopefully, this will works even on OSX.


Modified: gnucash/trunk/Makefile.am
===================================================================
--- gnucash/trunk/Makefile.am	2006-01-05 15:54:34 UTC (rev 12270)
+++ gnucash/trunk/Makefile.am	2006-01-06 02:49:27 UTC (rev 12271)
@@ -93,7 +93,6 @@
             -e 's:@-PERL-@:${PERL}:g'
 	chmod +x $@.tmp
 	mv $@.tmp $@
-	./make-gnucash-potfiles > ./po/POTFILES.in
 
 .goffice-links: 
 	rm -f goffice
@@ -162,12 +161,21 @@
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
 
-pot: Makefile
+.PHONY: pot
+pot: Makefile po/POTFILES.in
 	rm -f intl-scm/guile-strings.c
-	make -C intl-scm
+	${MAKE} -C intl-scm
 	rm -f po/$(PACKAGE).pot
-	make -C po $(PACKAGE).pot
+	${MAKE} -C po $(PACKAGE).pot
 
+
+BUILT_SOURCES = po/POTFILES.in
+
+po/POTFILES.in: make-gnucash-potfiles .potfiles
+	./make-gnucash-potfiles > ./po/POTFILES.in
+
+.potfiles:
+
 SVN = svn
 XSLTPROC = xsltproc
 ChangeLog.svn:

Deleted: gnucash/trunk/po/POTFILES.in
===================================================================
--- gnucash/trunk/po/POTFILES.in	2006-01-05 15:54:34 UTC (rev 12270)
+++ gnucash/trunk/po/POTFILES.in	2006-01-06 02:49:27 UTC (rev 12271)
@@ -1,9 +0,0 @@
-# POTFILES.in: This file is overwritten my the `make pot` target or by
-# the make-gnucash-potfiles script.  
-# 
-# The reason why we version-control this generated file is because the
-# Makefile in this directory is not under our control (but instead
-# gettext's) and it doesn't contain any rules for creating this
-# file. The gettext setup assumes by convention that this file exists
-# and doesn't need to be generated, so as long as we use the gettext
-# build system in the po directory, we need to follow that convention.