2003-01-19 John Pierce <XXXXXXXXXXX>

* doc/Makefile.am * src/doc/Makefile.am * src/doc/design/Makefile.am * src/experimental/cgi-bin/Makefile.am Added docs that were missing from dist. Moved doxygen clean rules to maintainer-clean. Moved texinfos to maintainer-clean. * lib/libc/Makefile.am Added sources needed for OS X to dist. * src/app-utils/Makefile.am * src/backend/postgres/Makefile.am * src/business/business-core/Makefile.am * src/business/business-gnome/Makefile.am * src/business/dialog-tax-table/Makefile.am * src/core-utils/Makefile.am * src/engine/Makefile.am * src/gnc-module/Makefile.am * src/gnc-module/test/mod-bar/Makefile.am * src/gnc-module/test/mod-baz/Makefile.am * src/gnc-module/test/mod-foo/Makefile.am * src/gnome/Makefile.am * src/gnome-search/Makefile.am * src/import-export/Makefile.am * src/import-export/binary-import/Makefile.am * src/import-export/qif-io-core/Makefile.am * src/register/register-core/Makefile.am * src/report/report-gnome/Makefile.am * src/scm/Makefile.am * src/app-file/Makefile.am * src/gnome-utils/Makefile.am Put generated headers into dist. Moved symlinks to distclean. Moved generated files to maintainer-clean. Put generated gw-.*.scm files in dist for parity. Put generated sources into dist. Moved generated source to maintainer-clean. * src/bin/overrides/Makefile Made built scripts depend on config.status to ensure they're rebuilt when paths change. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@7859 57a11ea4-9604-0410-9ed3-97b8803252fd
2025-02-25 18:55:30 -06:00 · 2003-01-20 17:11:50 +00:00
parent 430d97e8cd
commit 6b85475af0
28 changed files with 176 additions and 82 deletions
--- a/45
+++ b/45
@@ -1,3 +1,48 @@
+2003-01-19  John Pierce <john@killterm.org>
+
+	* doc/Makefile.am
+	* src/doc/Makefile.am
+	* src/doc/design/Makefile.am
+	* src/experimental/cgi-bin/Makefile.am
+	  Added docs that were missing from dist.
+	  Moved doxygen clean rules to maintainer-clean.
+	  Moved texinfos to maintainer-clean.
+
+	* lib/libc/Makefile.am
+	  Added sources needed for OS X to dist.
+
+	* src/app-utils/Makefile.am
+	* src/backend/postgres/Makefile.am
+	* src/business/business-core/Makefile.am
+	* src/business/business-gnome/Makefile.am
+	* src/business/dialog-tax-table/Makefile.am
+	* src/core-utils/Makefile.am
+	* src/engine/Makefile.am
+	* src/gnc-module/Makefile.am
+	* src/gnc-module/test/mod-bar/Makefile.am
+	* src/gnc-module/test/mod-baz/Makefile.am
+	* src/gnc-module/test/mod-foo/Makefile.am
+	* src/gnome/Makefile.am
+	* src/gnome-search/Makefile.am
+	* src/import-export/Makefile.am
+	* src/import-export/binary-import/Makefile.am
+	* src/import-export/qif-io-core/Makefile.am
+	* src/register/register-core/Makefile.am
+	* src/report/report-gnome/Makefile.am
+	* src/scm/Makefile.am
+	* src/app-file/Makefile.am
+	* src/gnome-utils/Makefile.am
+	  Put generated headers into dist.
+	  Moved symlinks to distclean.
+	  Moved generated files to maintainer-clean.
+	  Put generated gw-.*.scm files in dist for parity.
+	  Put generated sources into dist.
+	  Moved generated source to maintainer-clean.
+
+	* src/bin/overrides/Makefile
+	  Made built scripts depend on config.status to ensure
+	  they're rebuilt when paths change.
+
 2003-01-19  John Pierce <john@killterm.org>

 	* macros/autogen.sh
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -25,6 +25,7 @@ EXTRA_DIST = \
  build-aix.txt \
  build-solaris.txt \
  build-suse.txt \
+  generic_objects.txt \
  gnome-hackers.txt \
  gnc-prices.1.in \
  gnucash.1.in
--- a/lib/libc/Makefile.am
+++ b/lib/libc/Makefile.am
@@ -7,6 +7,8 @@ noinst_HEADERS = \
 # No sources should be listed.
 libc_missing_la_SOURCES = libc-missing-noop.c

+EXTRA_libc_missing_la_SOURCES = localtime_r.c strptime.c
+
 # This will automatically be filled in with the necessary object file
 # names.  Configure does this based upon the AC_REPLACE_FUNCS macros.
 LIBOBJS = @LIBOBJS@
--- a/src/app-file/Makefile.am
+++ b/src/app-file/Makefile.am
@@ -23,7 +23,9 @@ gncinclude_HEADERS = \
  gnc-file-dialog.h \
  gnc-file-history.h

-noinst_HEADERS = gnc-file-p.h
+noinst_HEADERS = \
+  gnc-file-p.h \
+  gw-app-file.h

 libgncmod_app_file_la_LDFLAGS = -module

@@ -31,7 +33,7 @@ libgncmod_app_file_la_LIBADD = \
  ../gnc-module/libgncmodule.la \
  ../engine/libgncmod-engine.la \
  ../gnome-utils/libgncmod-gnome-utils.la \
-  ./gnome/libgnc-app-file-gnome.la \
+  gnome/libgnc-app-file-gnome.la \
  ../app-utils/libgncmod-app-utils.la \
  ${GUILE_LIBS} \
  ${GLIB_LIBS}
@@ -73,5 +75,5 @@ gw-app-file.scm gw-app-file.c gw-app-file.h: \
 	  (gw:generate-wrapset \"gw-app-file\")"

 BUILT_SOURCES = gw-app-file.scm gw-app-file.c gw-app-file.h
-CLEANFILES = ${BUILT_SOURCES} gw-app-file.html \
-             ${SCM_FILE_LINKS} gnucash g-wrapped .scm-links
+DISTCLEANFILES = gnucash g-wrapped .scm-links ${SCM_FILE_LINKS} \
+	gw-app-file.html
--- a/src/app-utils/Makefile.am
+++ b/src/app-utils/Makefile.am
@@ -38,17 +38,12 @@ gncinclude_HEADERS = \
  gnc-ui-common.h \
  gnc-ui-util.h \
  guile-util.h \
-  option-util.h
-
-#
-# i18n.h wants to be installed, but we do NOT want it included
-# in the DISTFILE.  So, call it data and don't add it to
-# extra_dist..
-#
-gnci18nincludedir = ${GNC_INCLUDE_DIR}
-gnci18ninclude_DATA = \
+  option-util.h \
  i18n.h

+noinst_HEADERS = \
+  gw-app-utils.h
+
 libgncmod_app_utils_la_LDFLAGS = -module

 libgncmod_app_utils_la_LIBADD = \
@@ -130,5 +125,5 @@ gw-app-utils.scm gw-app-utils.c gw-app-utils.h: \
 	  (gw:generate-wrapset \"gw-app-utils\")"

 BUILT_SOURCES += gw-app-utils.scm gw-app-utils.c gw-app-utils.h
-CLEANFILES = ${BUILT_SOURCES} gw-app-utils.html \
-             ${SCM_FILE_LINKS} gnucash g-wrapped .scm-links
+DISTCLEANFILES = ${SCM_FILE_LINKS} gnucash g-wrapped .scm-links \
+                 gw-app-utils.html
--- a/src/backend/postgres/Makefile.am
+++ b/src/backend/postgres/Makefile.am
@@ -25,6 +25,17 @@ libgncmod_backend_postgres_la_SOURCES = \
  upgrade.c \
  putil.c

+## Distributed autogenerated and #included files
+EXTRA_libgncmod_backend_postgres_la_SOURCES = \
+  base-autogen.c \
+  check-autogen.c \
+  kvp-autogen.c \
+  table-audit.c \
+  table-drop.c \
+  table-create.c \
+  table-version.c \
+  functions.c
+
 noinst_HEADERS = \
  PostgresBackend.h \
  account.h \
@@ -101,7 +112,3 @@ $(M4_SRC): table.m4
 	cat $< >> $@
 	echo \" >> $@

-CLEANFILES = base-autogen.c base-autogen.h check-autogen.c check-autogen.h \
-             kvp-autogen.c kvp-autogen.h \
-             table-audit.c table-drop.c table-create.c table-version.c \
-			 functions.c
--- a/src/bin/overrides/Makefile.am
+++ b/src/bin/overrides/Makefile.am
@@ -25,16 +25,15 @@ PWD := $(shell pwd)
 ## from substituting the values directly into the left-hand sides of
 ## the sed substitutions.  *sigh*

-guile: guile.in
+guile: guile.in ${top_builddir}/config.status
 	rm -f $@.tmp
 	sed < $< > $@.tmp \
 	    -e 's:@-GUILE-@:${GUILE}:'
 	mv $@.tmp $@
 	chmod u+x $@
-BUILT_SOURCES = guile
 CLEANFILES = guile

-gnucash-env: gnucash-env.in
+gnucash-env: gnucash-env.in ${top_builddir}/config.status
 	rm -f $@.tmp
 	sed < $< > $@.tmp \
 	    -e 's:@-G_WRAP_MODULE_DIR-@:${G_WRAP_MODULE_DIR}:g' \
@@ -47,10 +46,9 @@ gnucash-env: gnucash-env.in
            -e 's:@-GNC_SCRIPT_OVERRIDE_DIR-@:${gncoverridedir}:g'
 	mv $@.tmp $@
 	chmod u+x $@
-BUILT_SOURCES += gnucash-env
 CLEANFILES += gnucash-env

-gnucash-build-env: gnucash-build-env.in
+gnucash-build-env: gnucash-build-env.in ${top_builddir}/config.status
 	rm -f $@.tmp
 	sed < $< > $@.tmp \
 	    -e 's:@-G_WRAP_MODULE_DIR-@:${G_WRAP_MODULE_DIR}:g' \
@@ -59,5 +57,4 @@ gnucash-build-env: gnucash-build-env.in
            -e 's:@-GNC_SRCDIR-@:${PWD}/${top_srcdir}:g'
 	mv $@.tmp $@
 	chmod u+x $@
-BUILT_SOURCES += gnucash-build-env
 CLEANFILES += gnucash-build-env
--- a/src/business/business-core/Makefile.am
+++ b/src/business/business-core/Makefile.am
@@ -51,7 +51,8 @@ noinst_HEADERS = \
  gncTaxTable.h \
  gncTaxTableP.h \
  gncVendor.h \
-  gncVendorP.h
+  gncVendorP.h \
+  gw-business-core.h

 libgncmod_business_core_la_LDFLAGS = -module

@@ -106,5 +107,5 @@ gw-business-core.scm gw-business-core.c gw-business-core.h: \
 	 (gw:generate-wrapset \"gw-business-core\")"

 BUILT_SOURCES = gw-business-core.scm gw-business-core.c gw-business-core.h
-CLEANFILES = ${BUILT_SOURCES} gw-business-core.html \
-             ${SCM_FILE_LINKS} g-wrapped gnucash .scm-links
+DISTCLEANFILES = g-wrapped gnucash .scm-links ${SCM_FILE_LINKS} \
+                 gw-business-core.html
--- a/src/business/business-gnome/Makefile.am
+++ b/src/business/business-gnome/Makefile.am
@@ -55,7 +55,8 @@ noinst_HEADERS = \
  dialog-order.h \
  dialog-payment.h \
  dialog-vendor.h \
-  search-owner.h
+  search-owner.h \
+  gw-business-gnome.h

 libgncmod_business_gnome_la_LDFLAGS = -module

@@ -121,7 +122,6 @@ gw-business-gnome.scm gw-business-gnome.c gw-business-gnome.h: \
 	 (gw:generate-wrapset \"gw-business-gnome\")"

 BUILT_SOURCES = gw-business-gnome.scm gw-business-gnome.c gw-business-gnome.h
-CLEANFILES = ${BUILT_SOURCES} gw-business-gnome.html \
-             ${SCM_FILE_LINKS} g-wrapped gnucash .scm-links
-
+DISTCLEANFILES = g-wrapped gnucash .scm-links ${SCM_FILE_LINKS} \
+                 gw-business-gnome.html

--- a/src/business/dialog-tax-table/Makefile.am
+++ b/src/business/dialog-tax-table/Makefile.am
@@ -21,7 +21,8 @@ libgncmod_dialog_tax_table_la_SOURCES = \
  dialog-tax-table.c

 noinst_HEADERS = \
-  dialog-tax-table.h
+  dialog-tax-table.h \
+  gw-dialog-tax-table.h

 libgncmod_dialog_tax_table_la_LDFLAGS = -module

@@ -84,5 +85,5 @@ gw-dialog-tax-table.scm gw-dialog-tax-table.c gw-dialog-tax-table.h: \

 BUILT_SOURCES = gw-dialog-tax-table.scm gw-dialog-tax-table.c \
 	gw-dialog-tax-table.h
-CLEANFILES = ${BUILT_SOURCES} gw-dialog-tax-table.html \
-             ${SCM_FILE_LINKS} g-wrapped gnucash .scm-links
+DISTCLEANFILES = g-wrapped gnucash .scm-links ${SCM_FILE_LINKS} \
+                 gw-dialog-tax-table.html
--- a/src/core-utils/Makefile.am
+++ b/src/core-utils/Makefile.am
@@ -12,9 +12,11 @@ libgw_core_utils_la_SOURCES = gw-core-utils.c
 libgw_core_utils_la_LDFLAGS = -module ${G_WRAP_LINK_ARGS} ${GUILE_LIBS}
 libgw_core_utils_la_LIBADD = libcore-utils.la

-noinst_HEADERS = core-utils.h
+noinst_HEADERS = \
+  core-utils.h \
+  gw-core-utils.h

-EXTRA_DIST = .cvsignore gw-core-utils-spec.scm
+EXTRA_DIST = .cvsignore ${gwmod_DATA}

 AM_CFLAGS = ${G_WRAP_COMPILE_ARGS} ${GLIB_CFLAGS} ${GUILE_INCS}

@@ -42,5 +44,5 @@ gw-core-utils.scm gw-core-utils.h gw-core-utils.c gw-core-utils.html: \
           (gw:generate-wrapset \"gw-core-utils\")"

 BUILT_SOURCES = gw-core-utils.scm gw-core-utils.h gw-core-utils.c
-CLEANFILES = ${BUILT_SOURCES} gw-core-utils.html \
-             ${SCM_FILE_LINKS} g-wrapped gnucash .scm-links
+DISTCLEANFILES = g-wrapped gnucash .scm-links ${SCM_FILE_LINKS} \
+                 gw-core-utils.html
--- a/src/doc/Makefile.am
+++ b/src/doc/Makefile.am
@@ -12,7 +12,21 @@ EXTRA_DIST = \
  plugin.txt \
  tax.txt \
  doxygen_main_page.c \
-  doxygen.cfg.in
+  doxygen.cfg.in \
+  TODO-schedxactions \
+  TODO-sixtp \
+  backend-api.txt \
+  backend-errors.txt \
+  books.txt \
+  currencies.txt \
+  gnc-commodity.txt \
+  loans.txt \
+  lots.txt \
+  multicurrency-discussion.txt \
+  netlogin.txt \
+  query-api.txt \
+  user-prefs-howto.txt
+

 docdir = ${GNC_DOC_INSTALL_DIR}

@@ -29,7 +43,7 @@ dist-hook: doc
 	echo "dist-hook: " && pwd
 	cp -rp html ${distdir}

-clean-local:
+maintainer-clean-local:
 	echo "clean-local: " && pwd
 	rm -rf html latex
 	rm -f doxygen.cfg doxygen.log refman.pdf
--- a/src/doc/design/Makefile.am
+++ b/src/doc/design/Makefile.am
@@ -13,8 +13,7 @@ gnucash_design_TEXINFOS = \
  type-index.texinfo \
  user-preferences.texinfo

-CLEANFILES = gnucash-design.info gnucash-design.info-[0-9]*
-
 # These should included as part of the automake rule set.  Perhaps I
 # have a version skew between automake and texinfo.
 DISTCLEANFILES = gnucash-design.cps gnucash-design.fns gnucash-design.tps
+MAINTAINERCLEANFILES = gnucash-design.info gnucash-design.info-[0-9]*
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -44,6 +44,8 @@ libgncmod_engine_la_SOURCES = \
  md5.c \
  messages.c

+EXTRA_libgncmod_engine_la_SOURCES = iso-4217-currencies.c
+
 gncincludedir = ${GNC_INCLUDE_DIR}
 gncinclude_HEADERS = \
  Account.h \
@@ -103,7 +105,9 @@ noinst_HEADERS = \
  gnc-session-p.h \
  gncObjectP.h \
  kvp-util-p.h \
-  md5.h
+  md5.h \
+  gw-engine.h \
+  gw-kvp.h

 noinst_SCRIPTS = iso-currencies-to-c

@@ -193,6 +197,6 @@ BUILT_SOURCES = \
  gw-engine.scm gw-engine.c gw-engine.h \
  gw-kvp.scm gw-kvp.c gw-kvp.h 

-CLEANFILES = ${BUILT_SOURCES} gw-engine.html gw-kvp.html \
-             ${SCM_FILE_LINKS} gnucash g-wrapped .scm-links
+DISTCLEANFILES = gnucash g-wrapped .scm-links ${SCM_FILE_LINKS} \
+                 gw-engine.html gw-kvp.html

--- a/src/experimental/cgi-bin/Makefile.am
+++ b/src/experimental/cgi-bin/Makefile.am
@@ -34,4 +34,5 @@ noinst_HEADERS =

 EXTRA_DIST += \
  .cvsignore \
-  README 
+  README \
+  login.html
--- a/src/gnc-module/Makefile.am
+++ b/src/gnc-module/Makefile.am
@@ -33,6 +33,9 @@ gncinclude_HEADERS = \

 noinst_DATA = .scm-links

+noinst_HEADERS = \
+ gw-gnc-module.h
+
 EXTRA_DIST = \
  ${gncmod_DATA} \
  ${gwmod_DATA}
@@ -63,6 +66,7 @@ gw-gnc-module.scm gw-gnc-module.c gw-gnc-module.h: \
 	  (gw:generate-wrapset \"gw-gnc-module\")"

 BUILT_SOURCES = gw-gnc-module.scm gw-gnc-module.h gw-gnc-module.c
-CLEANFILES = ${BUILT_SOURCES} gw-gnc-module.html \
-             ${SCM_FILE_LINKS} gnucash g-wrapped .scm-links
+DISTCLEANFILES = .scm-links g-wrapped gnucash ${SCM_FILE_LINKS} \
+                 gw-gnc-module.html
+

--- a/src/gnc-module/test/mod-bar/Makefile.am
+++ b/src/gnc-module/test/mod-bar/Makefile.am
@@ -10,7 +10,9 @@ checklib_LTLIBRARIES = libbar.la libgncmodbar.la
 libbar_la_LDFLAGS = -module
 libbar_la_SOURCES = bar.c

-noinst_HEADERS = bar.h
+noinst_HEADERS = \
+  bar.h \
+  bar-gwrap.h

 libgncmodbar_la_SOURCES=bar-gwrap.c gnc-mod-bar.c
 libgncmodbar_la_LDFLAGS=-module
@@ -27,7 +29,8 @@ bar-gwrap.c bar-gwrap.h: bar-gwrap.scm ${top_builddir}/config.status
 	  (gw:generate-wrapset \"bar-gwrap\")"

 BUILT_SOURCES = bar-gwrap.c bar-gwrap.h
-CLEANFILES = *.so* *.a bar-gwrap.c bar-gwrap.h bar-gwrap.html
+
+DISTCLEANFILES = bar-gwrap.html

 # Keep automake from generating install targets for test libs
 install-checklibLTLIBRARIES:
--- a/src/gnc-module/test/mod-baz/Makefile.am
+++ b/src/gnc-module/test/mod-baz/Makefile.am
@@ -11,7 +11,9 @@ checklib_LTLIBRARIES = libbaz.la libgncmodbaz.la
 libbaz_la_LDFLAGS = -module
 libbaz_la_SOURCES = baz.c

-noinst_HEADERS = baz.h
+noinst_HEADERS = \
+  baz.h \
+  baz-gwrap.h

 libgncmodbaz_la_SOURCES = baz-gwrap.c gnc-mod-baz.c
 libgncmodbaz_la_LDFLAGS = -module
@@ -29,7 +31,8 @@ baz-gwrap.c baz-gwrap.h: baz-gwrap.scm ${top_builddir}/config.status
 	  (gw:generate-wrapset \"baz-gwrap\")"

 BUILT_SOURCES = baz-gwrap.c baz-gwrap.h
-CLEANFILES = *.so* *.a baz-gwrap.c baz-gwrap.h baz-gwrap.html
+
+DISTCLEANFILES = baz-gwrap.html

 # Keep automake from generating install targets for test libs
 install-checklibLTLIBRARIES:
--- a/src/gnc-module/test/mod-foo/Makefile.am
+++ b/src/gnc-module/test/mod-foo/Makefile.am
@@ -10,7 +10,9 @@ checklib_LTLIBRARIES=libfoo.la libgncmodfoo.la
 libfoo_la_LDFLAGS = -module
 libfoo_la_SOURCES = foo.c

-noinst_HEADERS = foo.h
+noinst_HEADERS = \
+  foo.h \
+  foo-gwrap.h

 libgncmodfoo_la_SOURCES = foo-gwrap.c gnc-mod-foo.c
 libgncmodfoo_la_LDFLAGS = -module 
@@ -27,7 +29,8 @@ foo-gwrap.c foo-gwrap.h: foo-gwrap.scm ${top_builddir}/config.status
           (gw:generate-wrapset \"foo-gwrap\")"

 BUILT_SOURCES = foo-gwrap.c foo-gwrap.h
-CLEANFILES = *.so* *.a foo-gwrap.c foo-gwrap.h foo-gwrap.html
+
+DISTCLEANFILES = foo-gwrap.html

 # Keep automake from generating install targets for test libs
 install-checklibLTLIBRARIES:
--- a/src/gnome-search/Makefile.am
+++ b/src/gnome-search/Makefile.am
@@ -46,7 +46,8 @@ noinst_HEADERS = \
  search-numeric.h \
  search-param.h \
  search-reconciled.h \
-  search-string.h
+  search-string.h \
+  gw-gnome-search.h

 libgncmod_gnome_search_la_LDFLAGS = -module

@@ -108,5 +109,5 @@ gw-gnome-search.scm gw-gnome-search.c gw-gnome-search.h: \
 	 (gw:generate-wrapset \"gw-gnome-search\")"

 BUILT_SOURCES = gw-gnome-search.scm gw-gnome-search.c gw-gnome-search.h
-CLEANFILES = ${BUILT_SOURCES} gw-gnome-search.html \
-             ${SCM_FILE_LINKS} gnucash g-wrapped .scm-links
+DISTCLEANFILES = gnucash g-wrapped .scm-links ${SCM_FILE_LINKS} \
+                 gw-gnome-search.html
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@@ -83,7 +83,8 @@ gncinclude_HEADERS = \

 noinst_HEADERS = \
  argv-list-converters.h \
-  gnc-dir.h
+  gnc-dir.h \
+  gw-gnome-utils.h

 libgncmod_gnome_utils_la_LDFLAGS = -module

@@ -173,5 +174,5 @@ gw-gnome-utils.scm gw-gnome-utils.c gw-gnome-utils.h: \
 	  (gw:generate-wrapset \"gw-gnome-utils\")"

 BUILT_SOURCES += gw-gnome-utils.scm gw-gnome-utils.c gw-gnome-utils.h
-CLEANFILES = ${BUILT_SOURCES} gw-gnome-utils.html \
-             ${SCM_FILE_LINKS} gnucash g-wrapped .scm-links
+DISTCLEANFILES = gnucash g-wrapped .scm-links ${SCM_FILE_LINKS} \
+                 gw-gnome-utils.html
--- a/src/gnome/Makefile.am
+++ b/src/gnome/Makefile.am
@@ -78,6 +78,7 @@ noinst_HEADERS = \
  gnc-network.h \
  gnc-splash.h \
  gnc-split-reg.h \
+  gnc-version.h \
  gw-gnc.h \
  mainwindow-account-tree.h \
  reconcile-list.h \
@@ -87,7 +88,8 @@ noinst_HEADERS = \
  window-main.h \
  window-main-summarybar.h \
  window-reconcile.h \
-  window-register.h
+  window-register.h \
+  gw-gnc.h

 EXTRA_DIST = \
  .cvsignore \
@@ -95,7 +97,7 @@ EXTRA_DIST = \
  gnucash.keys.in \
  gnucash.mime \
  gnc-network.c \
-  gw-gnc-spec.scm
+  ${gwmod_DATA}


 AM_CFLAGS = \
@@ -135,7 +137,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
+gnucash.keys: gnucash.keys.in ${top_builddir}/config.status
 	rm -f $@.tmp
 	sed < $< > $@.tmp \
            -e 's:@-icondir-@:${appicondir}:g'
@@ -174,8 +176,6 @@ if GNUCASH_SEPARATE_BUILDDIR
 endif
 	touch .scm-links

-DISTCLEANFILES = .scm-links gnucash g-wrapped ${SCM_FILE_LINKS}
-
 gw-gnc.scm gw-gnc.h gw-gnc.c gw-gnc.html: \
  gw-gnc-spec.scm .scm-links ${top_builddir}/config.status
 	FLAVOR=gnome guile -c \
@@ -187,4 +187,6 @@ gw-gnc.scm gw-gnc.h gw-gnc.c gw-gnc.html: \
           (primitive-load \"./gw-gnc-spec.scm\") \
           (gw:generate-wrapset \"gw-gnc\")"
 BUILT_SOURCES = gw-gnc.scm gw-gnc.h gw-gnc.c gnc-version.h
-CLEANFILES = ${BUILT_SOURCES} gw-gnc.html gnucash.keys gnucash.desktop
+CLEANFILES = gnucash.keys gnucash.desktop
+DISTCLEANFILES = gnucash g-wrapped .scm-links ${SCM_FILE_LINKS} \
+                 gw-gnc.html
--- a/src/import-export/Makefile.am
+++ b/src/import-export/Makefile.am
@@ -67,9 +67,8 @@ AM_CFLAGS = \
 EXTRA_DIST = \
  $(glade_DATA) \
  ${gncscm_DATA} \
-  .cvsignore
-
-CLEANFILES =
+  .cvsignore \
+  generic-import-design.txt

 #noinst_DATA = .scm-links

@@ -80,7 +79,7 @@ CLEANFILES =
 #	ln -sf . gnucash
 #	ln -sf . g-wrapped
 #	touch .scm-links
-CLEANFILES += generic-import import-export gnucash g-wrapped .scm-links
+DISTCLEANFILES = gnucash g-wrapped .scm-links import-export

 # FIXME remove this when qif-io-core is finished
 DIST_SUBDIRS = binary-import qif-import qif-io-core ofx test hbci
--- a/src/import-export/binary-import/Makefile.am
+++ b/src/import-export/binary-import/Makefile.am
@@ -26,7 +26,8 @@ libgncmod_binary_import_la_SOURCES = \

 gncincludedir = ${GNC_INCLUDE_DIR}
 gncinclude_HEADERS = \
-  druid-commodity.h
+  druid-commodity.h \
+  gw-binary-import.h

 libgncmod_binary_import_la_LDFLAGS = -module

@@ -89,6 +90,6 @@ gw-binary-import.scm gw-binary-import.c gw-binary-import.h: \
 	  (gw:generate-wrapset \"gw-binary-import\")"

 BUILT_SOURCES = gw-binary-import.scm gw-binary-import.c gw-binary-import.h
-CLEANFILES = ${BUILT_SOURCES} gw-binary-import.html \
-             ${SCM_FILE_LINKS} gnucash g-wrapped import-export .scm-links
+DISTCLEANFILES = gnucash g-wrapped import-export .scm-links ${SCM_FILE_LINKS} \
+                 gw-binary-import.html

--- a/src/import-export/qif-io-core/Makefile.am
+++ b/src/import-export/qif-io-core/Makefile.am
@@ -29,4 +29,4 @@ gncscm_DATA = \
 	qif-parse.scm \
 	qif-record-xform.scm 

-CLEANFILES = gnucash import-export .scm-links
+DISTCLEANFILES = gnucash import-export .scm-links
--- a/src/register/register-core/Makefile.am
+++ b/src/register/register-core/Makefile.am
@@ -55,6 +55,9 @@ libgw_register_core_la_LDFLAGS = -module
 gwmoddir = ${GNC_GWRAP_LIBDIR}
 gwmod_DATA = gw-register-core.scm gw-register-core-spec.scm

+noinst_HEADERS = \
+  gw-register-core.h
+
 EXTRA_DIST = \
  .cvsignore \
  ${gwmod_DATA}
@@ -99,5 +102,5 @@ gw-register-core.scm gw-register-core.c gw-register-core.h: \
 	  (gw:generate-wrapset \"gw-register-core\")"

 BUILT_SOURCES = gw-register-core.scm gw-register-core.c gw-register-core.h
-CLEANFILES = ${BUILT_SOURCES} gw-register-core.html \
-             ${SCM_FILE_LINKS} gnucash g-wrapped register .scm-links
+DISTCLEANFILES = gnucash g-wrapped register .scm-links ${SCM_FILE_LINKS} \
+                 gw-register-core.html
--- a/src/report/report-gnome/Makefile.am
+++ b/src/report/report-gnome/Makefile.am
@@ -58,6 +58,9 @@ noinst_DATA = .scm-links
 gladedir = $(GNC_GLADE_DIR)
 glade_DATA = report.glade

+noinst_HEADERS = \
+ gw-report-gnome.h
+
 EXTRA_DIST = \
  .cvsignore \
  ${glade_DATA} \
@@ -93,5 +96,5 @@ gw-report-gnome.scm gw-report-gnome.c gw-report-gnome.h: \
 	  (gw:generate-wrapset \"gw-report-gnome\")"

 BUILT_SOURCES = gw-report-gnome.scm gw-report-gnome.c gw-report-gnome.h
-CLEANFILES = ${BUILT_SOURCES} gw-report-gnome.html \
-             ${SCM_FILE_LINKS} gnucash g-wrapped report .scm-links
+DISTCLEANFILES = gnucash g-wrapped report .scm-links ${SCM_FILE_LINKS} \
+                 gw-report-gnome.html
--- a/src/scm/Makefile.am
+++ b/src/scm/Makefile.am
@@ -31,8 +31,6 @@ config_DATA = config
 	ln -sf ${srcdir} gnucash
 	touch .scm-links

-CLEANFILES = .scm-links gnucash 
-
 SCM_FILES = ${gncscm_DATA} ${gncscmmod_DATA}

 EXTRA_DIST = \
@@ -54,4 +52,6 @@ build-config.scm: build-config.scm.in Makefile
            -e 's:@-GNC_SHAREDIR-@:${GNC_SHAREDIR}:' \
            -e 's:@-GNC_HELPDIR-@:${GNC_HELPDIR}:'
 	mv $@.tmp $@
-CLEANFILES += build-config.scm
+
+DISTCLEANFILES = gnucash .scm-links
+MAINTAINERCLEANFILES = build-config.scm