David Hampton's automake patch

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/1.6@6784 57a11ea4-9604-0410-9ed3-97b8803252fd

Makefile.am

@@ -56,7 +56,7 @@ make-gnucash-patch: make-gnucash-patch.in
 	chmod +x $@.tmp
 	mv $@.tmp $@
 
-DISTCLEANFILES += \
+DISTCLEANFILES = \
   TAGS.stamp cscope.files cscope.out etags.files make-gnucash-patch
 
 cscope.files:

accounts/C/Makefile.am

@@ -35,8 +35,6 @@ EXTRA_DIST = \
   acctlist_renter.gnucash-xea \
   acctlist_retiremt.gnucash-xea \
   acctlist_spouseinc.gnucash-xea \
-  acctlist_spouseretire.gnucash-xea
-
-EXTRA_DIST = \
+  acctlist_spouseretire.gnucash-xea \
   ${account_DATA} \
   .cvsignore

doc-tools/Makefile.am

@@ -25,4 +25,4 @@ build-help-index: build-help-index.in
 	chmod +x $@.tmp
 	mv $@.tmp $@
 
-CLEANFILES += build-help-index
+CLEANFILES = build-help-index

rpm/Makefile.am

@@ -15,4 +15,4 @@ gnucash.spec: gnucash.spec.in Makefile
             -e 's:@-VERSION-@:${VERSION}:'
 	mv $@.tmp $@
 
-CLEANFILES += gnucash.spec
+CLEANFILES = gnucash.spec

src/experimental/cgi-bin/Makefile.am

@@ -9,8 +9,6 @@ LDADD = 			\
   ../../engine/libgncengine.la 	\
   -lxml -lghttp -lglib -lfcgi
 
-INCLUDES =
-
 hello_SOURCES = \
   hello.c
 
@@ -33,8 +31,6 @@ EXTRA_DIST = \
   .cvsignore \
   README 
 
-CFLAGS = @CFLAGS@ 
-
 #  glib puts its header files in a bizarre place ...
 INCLUDES = 			\
   -I/usr/lib/glib/include 	\

src/gnome/Makefile.am

@@ -175,7 +175,7 @@ gnc-dir.h: gnc-dir.h.in
 	    -e 's:@-GNC_PIXMAP_DIR-@:${GNC_PIXMAP_DIR}:g' \
 	    -e 's:@-GNC_ACCOUNTS_DIR-@:${GNC_ACCOUNTS_DIR}:g'
 	mv $@.tmp $@
-BUILT_SOURCES += gnc-dir.h
+BUILT_SOURCES = gnc-dir.h
 
 # We have to do this because otherwise automake insists on putting
 # these files into the dist tarfile.  If there's a a better way,

src/quotes/Makefile.am

@@ -23,7 +23,7 @@ finance-quote-helper: finance-quote-helper.in
             -e 's:@-PERLINCL-@:${PERLINCL}:g'
 	chmod +x $@.tmp
 	mv $@.tmp $@
-CLEANFILES += finance-quote-helper
+CLEANFILES = finance-quote-helper
 
 update-finance-quote: update-finance-quote.in
 	rm -f $@.tmp

src/scm/Makefile.am

@@ -72,7 +72,7 @@ EXTRA_DIST = \
 guile-strings.c: ${gncscm_DATA}
 	rm -f guile-strings.c
 	guile -s ./xgettext.scm ${gncscm_DATA}
-CLEANFILES += guile-strings.c
+CLEANFILES = guile-strings.c
 
 all-local: guile-strings.c
 

src/scm/gnumeric/Makefile.am

@@ -12,6 +12,6 @@ EXTRA_DIST = \
 guile-strings.c: ${gncscm_DATA}
 	rm -f guile-strings.c
 	guile -s ../xgettext.scm ${gncscm_DATA}
-CLEANFILES += guile-strings.c
+CLEANFILES = guile-strings.c
 
 all-local: guile-strings.c

src/scm/printing/Makefile.am

@@ -12,6 +12,6 @@ EXTRA_DIST = \
 guile-strings.c: ${gncscm_DATA}
 	rm -f guile-strings.c
 	guile -s ../xgettext.scm ${gncscm_DATA}
-CLEANFILES += guile-strings.c
+CLEANFILES = guile-strings.c
 
 all-local: guile-strings.c

src/scm/qif-import/Makefile.am

@@ -21,6 +21,6 @@ EXTRA_DIST = \
 guile-strings.c: ${gncscm_DATA}
 	rm -f guile-strings.c
 	guile -s ../xgettext.scm ${gncscm_DATA}
-CLEANFILES += guile-strings.c
+CLEANFILES = guile-strings.c
 
 all-local: guile-strings.c

src/scm/report/Makefile.am

@@ -37,6 +37,6 @@ EXTRA_DIST = \
 guile-strings.c: ${SCM_FILES}
 	rm -f guile-strings.c
 	guile -s ../xgettext.scm ${SCM_FILES}
-CLEANFILES += guile-strings.c
+CLEANFILES = guile-strings.c
 
 all-local: guile-strings.c