From fc02baaa87193d07a177f54c373dd12dbb4b64b5 Mon Sep 17 00:00:00 2001 From: Chris Shoemaker Date: Sat, 14 Jan 2006 03:56:53 +0000 Subject: [PATCH] Add 'Makefile' as a dependency for targets that are generated from scriptlets in Makefile. That way, if the generating scriptlet is changed, (or the Makefile is regenerated) the target will also be remade. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@12350 57a11ea4-9604-0410-9ed3-97b8803252fd --- configure.in | 1 - doc/Makefile.am | 6 +++--- lib/libc/Makefile.am | 2 +- lib/libqof/backend/file/Makefile.am | 2 +- src/bin/Makefile.am | 9 +++++---- src/bin/overrides/Makefile.am | 6 +++--- src/gnome-utils/Makefile.am | 8 ++++---- src/gnome/Makefile.am | 4 ++-- src/quotes/Makefile.am | 6 +++--- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/configure.in b/configure.in index 7d8c91a0fb..7da417595d 100644 --- a/configure.in +++ b/configure.in @@ -2058,7 +2058,6 @@ AC_MSG_RESULT($warnFLAGS) chmod u+x ${srcdir}/src/gnc-test-env chmod u+x ${srcdir}/src/bin/generate-gnc-script -chmod u+x ${srcdir}/src/bin/overrides/gnucash chmod u+x ${srcdir}/src/bin/overrides/gnucash-run-script chmod u+x ${srcdir}/src/bin/overrides/gnucash-make-guids diff --git a/doc/Makefile.am b/doc/Makefile.am index 3987b34946..007e3ecd7b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -37,7 +37,7 @@ EXTRA_DIST = \ ## brackets here, instead of the usual @...@. This prevents autoconf ## from substituting the values directly into the left-hand sides of ## the sed substitutions. -gnc-prices.1: gnc-prices.1.in +gnc-prices.1: gnc-prices.1.in Makefile rm -f $@.tmp ${SED} < $< > $@.tmp \ -e 's:@-VERSION-@:${VERSION}:g' \ @@ -45,7 +45,7 @@ gnc-prices.1: gnc-prices.1.in chmod +x $@.tmp mv $@.tmp $@ -gnucash.1: gnucash.1.in +gnucash.1: gnucash.1.in Makefile rm -f $@.tmp ${SED} < $< > $@.tmp \ -e 's:@-VERSION-@:${VERSION}:g' \ @@ -53,7 +53,7 @@ gnucash.1: gnucash.1.in chmod +x $@.tmp mv $@.tmp $@ -tip_of_the_day.list: tip_of_the_day.list.in +tip_of_the_day.list: tip_of_the_day.list.in Makefile gcc -E -P -x c -D'N_(x)=x' -o $@.tmp $< cat -s $@.tmp | ${SED} -e 's/^ *\"\(.*\)\" *$$/\1/m' > $@ rm -f $@.tmp diff --git a/lib/libc/Makefile.am b/lib/libc/Makefile.am index 9f596459c0..92214b48a6 100644 --- a/lib/libc/Makefile.am +++ b/lib/libc/Makefile.am @@ -21,6 +21,6 @@ libc_missing_la_LIBADD = $(LTLIBOBJS) # should be removed. EXTRA_DIST = scm_strptime.c -print_libobjs: +print_libobjs: Makefile @echo "LIBOBJS = $(LIBOBJS)" @echo "LTLIBOBJS = $(LTLIBOBJS)" diff --git a/lib/libqof/backend/file/Makefile.am b/lib/libqof/backend/file/Makefile.am index ae08ca9bdd..319a89fdae 100644 --- a/lib/libqof/backend/file/Makefile.am +++ b/lib/libqof/backend/file/Makefile.am @@ -31,7 +31,7 @@ EXTRA_DIST = \ qof-backend-qsf.h \ qsf-xml.h -qsf-dir.h: qsf-dir.h.in +qsf-dir.h: qsf-dir.h.in Makefile rm -f $@.tmp sed < $< > $@.tmp \ -e 's:@-QSF_SCHEMA_DIR-@:${QOF_XML_DIR}:g' diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index d14e241f3b..b62dee3ae4 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -9,7 +9,7 @@ gnucash_bin_SOURCES = gnucash-bin.c gnucash_bin_LDADD = ${GUILE_LIBS} ${GLIB_LIBS} ${GNOME_LIBS} ${GTK_LIBS} \ ${top_srcdir}/src/gnc-module/libgncmodule.la -gnucash: gnucash.in ${top_builddir}/config.status +gnucash: gnucash.in ${top_builddir}/config.status Makefile rm -f $@.tmp sed < $< > $@.tmp \ -e 's:@-BIN_DIR-@:${bindir}:g' \ @@ -25,7 +25,7 @@ gnucash: gnucash.in ${top_builddir}/config.status BUILT_SOURCES = i18n.h -i18n.h: i18n.h.in ${top_builddir}/config.status +i18n.h: i18n.h.in ${top_builddir}/config.status Makefile rm -f $@.tmp sed < $< > $@.tmp \ -e 's:@-PACKAGE-@:${PACKAGE}:g' \ @@ -33,7 +33,7 @@ i18n.h: i18n.h.in ${top_builddir}/config.status mv $@.tmp $@ -gnucash-valgrind: gnucash-valgrind.in ${top_builddir}/config.status +gnucash-valgrind: gnucash-valgrind.in ${top_builddir}/config.status Makefile rm -f $@.tmp sed < $< > $@.tmp \ -e 's:@-BIN_DIR-@:${bindir}:g' \ @@ -85,7 +85,8 @@ CLEANFILES += ${gnc_common_scripts} update-gnucash-gconf ## brackets here, instead of the usual @...@. This prevents autoconf ## from substituting the values directly into the left-hand sides of ## the sed substitutions. -update-gnucash-gconf: update-gnucash-gconf.in ${top_builddir}/config.status +update-gnucash-gconf: update-gnucash-gconf.in \ + ${top_builddir}/config.status Makefile rm -f $@.tmp sed < $< > $@.tmp \ -e 's:@-GCONF_SCHEMA_FILE_DIR-@:${GCONF_SCHEMA_FILE_DIR}:g' diff --git a/src/bin/overrides/Makefile.am b/src/bin/overrides/Makefile.am index 9dfc5b23cf..b954c210da 100644 --- a/src/bin/overrides/Makefile.am +++ b/src/bin/overrides/Makefile.am @@ -23,7 +23,7 @@ PWD := $(shell pwd) ## from substituting the values directly into the left-hand sides of ## the sed substitutions. *sigh* -guile: guile.in ${top_builddir}/config.status +guile: guile.in ${top_builddir}/config.status Makefile rm -f $@.tmp sed < $< > $@.tmp \ -e 's:@-GUILE-@:${GUILE}:' @@ -31,7 +31,7 @@ guile: guile.in ${top_builddir}/config.status chmod u+x $@ CLEANFILES = guile -gnucash-env: gnucash-env.in ${top_builddir}/config.status +gnucash-env: gnucash-env.in ${top_builddir}/config.status Makefile rm -f $@.tmp sed < $< > $@.tmp \ -e 's:@-G_WRAP_MODULE_DIR-@:${G_WRAP_MODULE_DIR}:g' \ @@ -46,7 +46,7 @@ gnucash-env: gnucash-env.in ${top_builddir}/config.status chmod u+x $@ CLEANFILES += gnucash-env -gnucash-build-env: gnucash-build-env.in ${top_builddir}/config.status +gnucash-build-env: gnucash-build-env.in ${top_builddir}/config.status Makefile rm -f $@.tmp sed < $< > $@.tmp \ -e 's:@-GNC_TEST_SRFI_LOAD_CMD-@:@GNC_TEST_SRFI_LOAD_CMD@:g' \ diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am index be6417e837..14275d408d 100644 --- a/src/gnome-utils/Makefile.am +++ b/src/gnome-utils/Makefile.am @@ -222,7 +222,7 @@ EXTRA_DIST = \ ## brackets here, instead of the usual @...@. This prevents autoconf ## from substituting the values directly into the left-hand sides of ## the sed substitutions. -gnc-dir.h: gnc-dir.h.in ${top_builddir}/config.status +gnc-dir.h: gnc-dir.h.in ${top_builddir}/config.status Makefile rm -f $@.tmp sed < $< > $@.tmp \ -e 's:@-GNC_ACCOUNTS_DIR-@:${GNC_ACCOUNTS_DIR}:g' \ @@ -235,7 +235,7 @@ gnc-version.h: _gnc-version.h -cmp -s _gnc-version.h gnc-version.h || cp _gnc-version.h gnc-version.h -rm -f _gnc-version.h -_gnc-version.h: gnc-svninfo.h +_gnc-version.h: gnc-svninfo.h Makefile @echo "/* Autogenerated. Do not change. */" > _gnc-version.h @echo "#ifndef GNC_VERSION_H" >> _gnc-version.h @echo "#define GNC_VERSION_H" >> _gnc-version.h @@ -257,7 +257,7 @@ gnc-svninfo.h: _gnc-svninfo.h -cmp -s _gnc-svninfo.h gnc-svninfo.h || cp _gnc-svninfo.h gnc-svninfo.h -rm -f _gnc-svninfo.h -_gnc-svninfo.h: +_gnc-svninfo.h: Makefile @s=${srcdir} ; \ if [ -h ${srcdir}/Makefile.am ] ; then \ d=`readlink $(srcdir)/Makefile.am` ; \ @@ -302,7 +302,7 @@ endif touch .scm-links gw-gnome-utils.scm gw-gnome-utils.c gw-gnome-utils.h: \ - .scm-links gw-gnome-utils-spec.scm ${top_builddir}/config.status + .scm-links gw-gnome-utils-spec.scm ${top_builddir}/config.status Makefile FLAVOR=gnome $(GUILE) -c \ "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \ (set! %load-path (cons \"${PWD}\" %load-path)) \ diff --git a/src/gnome/Makefile.am b/src/gnome/Makefile.am index f2ac61cfe9..6a8c3ed0fe 100644 --- a/src/gnome/Makefile.am +++ b/src/gnome/Makefile.am @@ -162,7 +162,7 @@ AM_CFLAGS = \ ## brackets here, instead of the usual @...@. This prevents autoconf ## from substituting the values directly into the left-hand sides of ## the sed substitutions. -gnucash.keys: gnucash.keys.in ${top_builddir}/config.status +gnucash.keys: gnucash.keys.in ${top_builddir}/config.status Makefile rm -f $@.tmp sed < $< > $@.tmp \ -e 's:@-icondir-@:${appicondir}:g' @@ -188,7 +188,7 @@ endif touch .scm-links gw-gnc.scm gw-gnc.h gw-gnc.c gw-gnc.html: \ - gw-gnc-spec.scm .scm-links ${top_builddir}/config.status + gw-gnc-spec.scm .scm-links ${top_builddir}/config.status Makefile FLAVOR=gnome $(GUILE) -c \ "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \ (set! %load-path (cons \"../engine\" %load-path)) \ diff --git a/src/quotes/Makefile.am b/src/quotes/Makefile.am index 3e0ba0ac36..9839495f2a 100644 --- a/src/quotes/Makefile.am +++ b/src/quotes/Makefile.am @@ -17,7 +17,7 @@ EXTRA_DIST = \ ## brackets here, instead of the usual @...@. This prevents autoconf ## from substituting the values directly into the left-hand sides of ## the sed substitutions. -finance-quote-helper: finance-quote-helper.in +finance-quote-helper: finance-quote-helper.in Makefile rm -f $@.tmp sed < $< > $@.tmp \ -e 's:@-PERL-@:${PERL}:g' \ @@ -25,7 +25,7 @@ finance-quote-helper: finance-quote-helper.in chmod +x $@.tmp mv $@.tmp $@ -finance-quote-check: finance-quote-check.in +finance-quote-check: finance-quote-check.in Makefile rm -f $@.tmp sed < $< > $@.tmp \ -e 's:@-PERL-@:${PERL}:g' \ @@ -33,7 +33,7 @@ finance-quote-check: finance-quote-check.in chmod +x $@.tmp mv $@.tmp $@ -update-finance-quote: update-finance-quote.in +update-finance-quote: update-finance-quote.in Makefile rm -f $@.tmp sed < $< > $@.tmp \ -e 's:@-PERL-@:${PERL}:g' \