[Gnucash-changes] r12273 - gnucash/trunk - Fixes for `make check' in toplevel Makefile.am.

[Chris Shoemaker]

Author: chris
Date: 2006-01-06 16:31:22 -0500 (Fri, 06 Jan 2006)
New Revision: 12273
Trac: http://svn.gnucash.org/trac/changeset/12273

Modified:
   gnucash/trunk/Makefile.am
Log:
Fixes for `make check' in toplevel Makefile.am.

Conditionally add symlink from ./gsf to ./lib/libgsf-1.12.3/gsf.

Also, silence warning:
/usr/share/automake-1.9/am/tags.am: ctags was already defined in condition !GNC_CTAGS_FILE, which is included in condition TRUE ...
Makefile.am:138: ... `ctags' previously defined here

and avoid possible `make dist' failure by added po/POTFILES.in to dist-hook.


Modified: gnucash/trunk/Makefile.am
===================================================================
--- gnucash/trunk/Makefile.am	2006-01-06 15:49:45 UTC (rev 12272)
+++ gnucash/trunk/Makefile.am	2006-01-06 21:31:22 UTC (rev 12273)
@@ -6,7 +6,7 @@
 GNC_CTAGS_FILE = @GNC_CTAGS_FILE@
 GNC_ETAGS_FILE = @GNC_ETAGS_FILE@
 
-noinst_DATA = make-gnucash-patch make-gnucash-potfiles .goffice-links
+noinst_DATA = make-gnucash-patch make-gnucash-potfiles .links
 
 doc_DATA = \
   AUTHORS \
@@ -94,18 +94,21 @@
 	chmod +x $@.tmp
 	mv $@.tmp $@
 
-.goffice-links: 
-	rm -f goffice
+.links: 
+	rm -f goffice gsf
 if !HAVE_GOFFICE
 	ln -sf . goffice
 endif
-	touch .goffice-links
+if !HAVE_LIBGSF
+	ln -sf lib/libgsf-1.12.3/gsf gsf
+endif
+	touch .links
 
 DISTCLEANFILES = \
   intltool-extract intltool-update intltool-merge\
   cscope.files cscope.out etags.files make-gnucash-patch \
   make-gnucash-potfiles po/.intltool-merge-cache \
-  goffice .goffice-links po/POTFILES.in
+  goffice gsf .links po/POTFILES.in
 
 cscope.files:
 	find . -name '*.[ch]' > cscope.files
@@ -113,34 +116,26 @@
 cscope.out: cscope.files
 	cscope -b
 
-if GNC_ETAGS_FILE
 
 # make sure etags.files is up to date.
 # and use the contents of etags.files to re-make TAGS if needed.
 etags:
+if GNC_ETAGS_FILE
 	${MAKE} -f Makefile.TAGS etags.files
 	${MAKE} -f Makefile.TAGS TAGS
-
 else
-
-etags:
 	@echo "You must ./configure with --enable-etags to use etags."
-
 endif
 
-if GNC_CTAGS_FILE
 
 # make sure etags.files is up to date.
-# and use the contents of etags.files to re-make TAGS if needed.
+# and use the contents of etags.files to re-make tags if needed.
 ctags:
+if GNC_CTAGS_FILE
 	${MAKE} -f Makefile.TAGS etags.files
 	${MAKE} -f Makefile.TAGS tags
-
 else
-
-ctags:
 	@echo "You must ./configure with --enable-ctags to use ctags."
-
 endif
 
 .PHONY: etags ctags
@@ -176,6 +171,10 @@
 
 .potfiles:
 
+dist-hook:
+	./make-gnucash-potfiles > $(distdir)/po/POTFILES.in
+
+
 SVN = svn
 XSLTPROC = xsltproc
 ChangeLog.svn: