From 3ad22b5eb52c07fba14645f09596d26245ef06e1 Mon Sep 17 00:00:00 2001
From: Derek Atkins <derek@ihtfp.com>
Date: Tue, 25 Jul 2006 13:25:26 +0000
Subject: [PATCH]   Allow proper compile/install from tarball using separate
 builddir.   - Don't distribute (most) generated files.   - Be (more)
 consistent about when generated files are cleaned. BP

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14555 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 ChangeLog                                 |  5 +++++
 lib/goffice-0.0.4/goffice/Makefile.am     |  1 -
 lib/libqof/backend/file/Makefile.am       |  4 +---
 lib/libqof/qof/Makefile.am                |  2 +-
 src/app-utils/Makefile.am                 | 12 +++++------
 src/bin/Makefile.am                       |  3 +--
 src/business/business-core/Makefile.am    | 14 ++++++------
 src/business/business-gnome/Makefile.am   | 12 +++++------
 src/business/dialog-tax-table/Makefile.am | 12 +++++------
 src/core-utils/Makefile.am                | 12 +++++------
 src/engine/Makefile.am                    | 26 +++++++++++------------
 src/gnc-module/Makefile.am                | 12 +++++------
 src/gnc-module/test/mod-bar/Makefile.am   |  9 ++++----
 src/gnc-module/test/mod-baz/Makefile.am   |  9 ++++----
 src/gnc-module/test/mod-foo/Makefile.am   |  9 ++++----
 src/gnome-utils/Makefile.am               | 12 +++++------
 src/gnome/Makefile.am                     | 14 ++++++------
 src/register/register-core/Makefile.am    | 12 +++++------
 src/report/report-gnome/Makefile.am       | 12 +++++------
 src/report/report-system/Makefile.am      | 10 ++++-----
 20 files changed, 95 insertions(+), 107 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9720654755..da81623726 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-07-24  Derek Atkins  <derek@ihtfp.com>
 
+	* [lots of Makefile.am files]:
+	  Allow proper compile/install from tarball using separate builddir.
+	  - Don't distribute (most) generated files.
+	  - Be (more) consistent about when generated files are cleaned.
+
 	* po/POTFILES.skip:
 	  - Now that we distribute the SX schema properly, don't skip it
 	    in the POTFILES.skip file.
diff --git a/lib/goffice-0.0.4/goffice/Makefile.am b/lib/goffice-0.0.4/goffice/Makefile.am
index f7780ed033..fb717ff022 100644
--- a/lib/goffice-0.0.4/goffice/Makefile.am
+++ b/lib/goffice-0.0.4/goffice/Makefile.am
@@ -24,7 +24,6 @@ BUILT_SOURCES =	goffice-paths.h
 CLEANFILES = $(BUILT_SOURCES)
 
 libgoffice_1_la_SOURCES = 	\
-	$(BUILT_SOURCES)	\
 	goffice.c		\
 	goffice-priv.h
 if !HAVE_GLIB26
diff --git a/lib/libqof/backend/file/Makefile.am b/lib/libqof/backend/file/Makefile.am
index d9a3bdd105..4b8dc44a7e 100644
--- a/lib/libqof/backend/file/Makefile.am
+++ b/lib/libqof/backend/file/Makefile.am
@@ -40,6 +40,4 @@ qsf-dir.h: qsf-dir.h.in Makefile
 	mv $@.tmp $@
 
 BUILT_SOURCES = qsf-dir.h
-
-CONFIG_CLEAN_FILES = qsf-dir.h
-
+CLEANFILES = qsf-dir.h
diff --git a/lib/libqof/qof/Makefile.am b/lib/libqof/qof/Makefile.am
index 93e24bce6f..1e876737d7 100644
--- a/lib/libqof/qof/Makefile.am
+++ b/lib/libqof/qof/Makefile.am
@@ -94,4 +94,4 @@ qofla-dir.h: $(srcdir)/qofla-dir.h.in Makefile
 	 mv $@.tmp $@
 
 BUILT_SOURCES = qofla-dir.h
-DISTCLEANFILES = qofla-dir.h
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/src/app-utils/Makefile.am b/src/app-utils/Makefile.am
index 2fdbcc5c15..231d88a2b5 100644
--- a/src/app-utils/Makefile.am
+++ b/src/app-utils/Makefile.am
@@ -64,9 +64,6 @@ gncinclude_HEADERS = \
   guile-util.h \
   option-util.h
 
-noinst_HEADERS = \
-  gw-app-utils.h
-
 libgncmod_app_utils_la_LIBADD = \
   ${top_builddir}/src/gnc-module/libgncmodule.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
@@ -90,7 +87,7 @@ libgw_app_utils_la_LIBADD = \
   ${QOF_LIBS} \
   ${GLIB_LIBS}
 
-libgw_app_utils_la_SOURCES = gw-app-utils.c
+nodist_libgw_app_utils_la_SOURCES = gw-app-utils.c
 
 gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
 gncmod_DATA = app-utils.scm 
@@ -107,7 +104,8 @@ gncscm_DATA = \
   simple-obj.scm
 
 gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_DATA = gw-app-utils.scm gw-app-utils-spec.scm
+gwmod_DATA = gw-app-utils-spec.scm
+nodist_gwmod_DATA = gw-app-utils.scm
 
 noinst_DATA = .scm-links
 
@@ -146,5 +144,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
-DISTCLEANFILES = ${SCM_FILE_LINKS} gnucash g-wrapped .scm-links \
-                 gw-app-utils.html
+CLEANFILES = $(BUILT_SOURCES) ${SCM_FILE_LINKS} gnucash g-wrapped \
+	.scm-links gw-app-utils.html
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 95e6bb08b8..e40a447755 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -67,7 +67,7 @@ gnucash-valgrind: gnucash-valgrind.in ${top_builddir}/config.status Makefile
 	mv $@.tmp $@
 	chmod u+x $@
 
-CLEANFILES = gnucash gnucash-valgrind
+CLEANFILES = $(BUILT_SOURCES) gnucash gnucash-valgrind
 
 # We handle gnucash scripts in a somewhat unexpected way, but we do
 # this so that a user who doesn't necessarily have the right
@@ -99,7 +99,6 @@ ${gnc_common_scripts}: generate-gnc-script ${top_builddir}/config.status
 	${srcdir}/generate-gnc-script $@ "${gncoverridesdir}"
 
 CLEANFILES += ${gnc_common_scripts} update-gnucash-gconf
-DISTCLEANFILES = i18n.h
 
 ## We borrow guile's convention and use @-...-@ as the substitution
 ## brackets here, instead of the usual @...@.  This prevents autoconf
diff --git a/src/business/business-core/Makefile.am b/src/business/business-core/Makefile.am
index 2a73efde3c..aec93a0386 100644
--- a/src/business/business-core/Makefile.am
+++ b/src/business/business-core/Makefile.am
@@ -52,8 +52,7 @@ noinst_HEADERS = \
   gncTaxTable.h \
   gncTaxTableP.h \
   gncVendor.h \
-  gncVendorP.h \
-  gw-business-core.h
+  gncVendorP.h
 
 libgncmod_business_core_la_LIBADD = \
   ${top_builddir}/src/gnc-module/libgncmodule.la \
@@ -67,7 +66,9 @@ libgncmod_business_core_la_LIBADD = \
 # business-core-helpers.c
 
 libgw_business_core_la_SOURCES = \
-  gncBusGuile.c \
+  gncBusGuile.c
+
+nodist_libgw_business_core_la_SOURCES = \
   gw-business-core.c
 
 libgw_business_core_la_LDFLAGS = ${G_WRAP_LINK_ARGS}
@@ -83,8 +84,9 @@ gncmod_DATA = business-core.scm
 
 gwmoddir = ${GNC_GWRAP_LIBDIR}
 gwmod_DATA = \
-  gw-business-core.scm \
   gw-business-core-spec.scm
+nodist_gwmod_DATA = \
+  gw-business-core.scm
 
 EXTRA_DIST = \
   ${gncmod_DATA} \
@@ -118,5 +120,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
-DISTCLEANFILES = g-wrapped gnucash .scm-links ${SCM_FILE_LINKS} \
-                 gw-business-core.html
+CLEANFILES = $(BUILT_SOURCES) gw-business-core.html \
+	g-wrapped gnucash .scm-links ${SCM_FILE_LINKS}
diff --git a/src/business/business-gnome/Makefile.am b/src/business/business-gnome/Makefile.am
index 872cbef1c3..0593c18e04 100644
--- a/src/business/business-gnome/Makefile.am
+++ b/src/business/business-gnome/Makefile.am
@@ -64,8 +64,7 @@ noinst_HEADERS = \
   dialog-vendor.h \
   gnc-plugin-business.h \
   gnc-plugin-page-invoice.h \
-  search-owner.h \
-  gw-business-gnome.h
+  search-owner.h
 
 libgncmod_business_gnome_la_LIBADD = \
   ${top_builddir}/src/business/business-core/libgncmod-business-core.la \
@@ -89,7 +88,7 @@ libgncmod_business_gnome_la_LIBADD = \
   ${EFENCE_LIBS}
 
 
-libgw_business_gnome_la_SOURCES = gw-business-gnome.c
+nodist_libgw_business_gnome_la_SOURCES = gw-business-gnome.c
 
 libgw_business_gnome_la_LDFLAGS = ${G_WRAP_LINK_ARGS}
 libgw_business_gnome_la_LIBADD  = \
@@ -106,8 +105,9 @@ gncmod_DATA = business-gnome.scm
 
 gwmoddir = ${GNC_GWRAP_LIBDIR}
 gwmod_DATA = \
-  gw-business-gnome.scm \
   gw-business-gnome-spec.scm
+nodist_gwmod_DATA = \
+  gw-business-gnome.scm
 
 EXTRA_DIST = \
   ${gncmod_DATA} \
@@ -147,5 +147,5 @@ 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 = g-wrapped gnucash .scm-links
-DISTCLEANFILES = ${SCM_FILE_LINKS} gw-business-gnome.html
+CLEANFILES = $(BUILT_SOURCES) g-wrapped gnucash .scm-links \
+	${SCM_FILE_LINKS} gw-business-gnome.html
diff --git a/src/business/dialog-tax-table/Makefile.am b/src/business/dialog-tax-table/Makefile.am
index cb39b1adab..6505843831 100644
--- a/src/business/dialog-tax-table/Makefile.am
+++ b/src/business/dialog-tax-table/Makefile.am
@@ -25,8 +25,7 @@ libgncmod_dialog_tax_table_la_SOURCES = \
   dialog-tax-table.c
 
 noinst_HEADERS = \
-  dialog-tax-table.h \
-  gw-dialog-tax-table.h
+  dialog-tax-table.h
 
 libgncmod_dialog_tax_table_la_LIBADD = \
   ${top_builddir}/src/business/business-core/libgncmod-business-core.la \
@@ -42,7 +41,7 @@ libgncmod_dialog_tax_table_la_LIBADD = \
   ${QOF_LIBS} \
   ${EFENCE_LIBS}
 
-libgw_dialog_tax_table_la_SOURCES = gw-dialog-tax-table.c
+nodist_libgw_dialog_tax_table_la_SOURCES = gw-dialog-tax-table.c
 
 libgw_dialog_tax_table_la_LIBADD = \
   libgncmod-dialog-tax-table.la \
@@ -50,8 +49,9 @@ libgw_dialog_tax_table_la_LIBADD = \
 
 gwmoddir = ${GNC_GWRAP_LIBDIR}
 gwmod_DATA = \
-  gw-dialog-tax-table.scm \
   gw-dialog-tax-table-spec.scm
+nodist_gwmod_DATA = \
+  gw-dialog-tax-table.scm
 
 gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
 gncmod_DATA = dialog-tax-table.scm
@@ -97,5 +97,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 = g-wrapped gnucash .scm-links
-DISTCLEANFILES = ${SCM_FILE_LINKS} gw-dialog-tax-table.html
+CLEANFILES = $(BUILT_SOURCES) g-wrapped gnucash .scm-links \
+	${SCM_FILE_LINKS} gw-dialog-tax-table.html
diff --git a/src/core-utils/Makefile.am b/src/core-utils/Makefile.am
index 9d0fe761b4..05f87ed090 100644
--- a/src/core-utils/Makefile.am
+++ b/src/core-utils/Makefile.am
@@ -13,7 +13,7 @@ libcore_utils_la_LIBADD = \
   ${GCONF_LIBS} \
   ${GTK_LIBS}
 
-libgw_core_utils_la_SOURCES = \
+nodist_libgw_core_utils_la_SOURCES = \
   gw-core-utils.c
 
 libgw_core_utils_la_LDFLAGS = ${G_WRAP_LINK_ARGS}
@@ -28,8 +28,7 @@ noinst_HEADERS = \
   gnc-gdate-utils.h \
   gnc-gkeyfile-utils.h \
   gnc-glib-utils.h \
-  gnc-gobject-utils.h \
-  gw-core-utils.h
+  gnc-gobject-utils.h
 
 EXTRA_DIST = ${gwmod_DATA}
 
@@ -41,7 +40,8 @@ AM_CFLAGS = \
   ${GTK_CFLAGS}
 
 gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_DATA = gw-core-utils-spec.scm gw-core-utils.scm
+gwmod_DATA = gw-core-utils-spec.scm
+nodist_gwmod_DATA = gw-core-utils.scm
 
 if GNUCASH_SEPARATE_BUILDDIR
 #Only needed when srcdir and builddir are different
@@ -67,5 +67,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 = g-wrapped gnucash .scm-links
-DISTCLEANFILES = ${SCM_FILE_LINKS} gw-core-utils.html
+CLEANFILES = $(BUILT_SOURCES) g-wrapped gnucash .scm-links \
+	${SCM_FILE_LINKS} gw-core-utils.html
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
index 6a3e753e91..5d4b30b98f 100644
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -100,8 +100,6 @@ noinst_HEADERS = \
   gnc-lot.h \
   gnc-lot-p.h \
   gnc-pricedb-p.h \
-  gw-engine.h \
-  gw-kvp.h \
   policy-p.h
 
 noinst_SCRIPTS = iso-currencies-to-c
@@ -114,7 +112,8 @@ libgncmod_engine_la_LIBADD = \
   ${GNUCASH_ENGINE_BASE_LIBS} \
   ${top_builddir}/lib/libc/libc-missing.la
 
-libgw_kvp_la_SOURCES = gw-kvp.c kvp-scm.c
+libgw_kvp_la_SOURCES = kvp-scm.c
+nodist_libgw_kvp_la_SOURCES = gw-kvp.c
 libgw_kvp_la_LDFLAGS = \
   ${G_WRAP_LINK_ARGS} \
   ${QOF_LIBS} \
@@ -123,7 +122,8 @@ libgw_kvp_la_LIBADD = \
   libgncmod-engine.la \
   libgw-engine.la
 
-libgw_engine_la_SOURCES = gw-engine.c engine-helpers.c glib-helpers.c
+libgw_engine_la_SOURCES = engine-helpers.c glib-helpers.c
+nodist_libgw_engine_la_SOURCES = gw-engine.c
 libgw_engine_la_LDFLAGS = \
   ${G_WRAP_LINK_ARGS} \
   ${QOF_LIBS} \
@@ -144,8 +144,9 @@ gncscm_DATA = \
 gwmoddir = ${GNC_GWRAP_LIBDIR}
 gwmod_DATA = \
   gw-engine-spec.scm \
+  gw-kvp-spec.scm
+nodist_gwmod_DATA = \
   gw-engine.scm \
-  gw-kvp-spec.scm \
   gw-kvp.scm
 
 EXTRA_DIST = \
@@ -201,16 +202,15 @@ gw-kvp.scm gw-kvp.c gw-kvp.h: \
 	 (primitive-load \"./gw-kvp-spec.scm\") \
 	 (gw:generate-wrapset \"gw-kvp\")"
 
-BUILT_SOURCES = \
-  iso-4217-currencies.c \
-  gw-engine.scm gw-engine.c gw-engine.h \
-  gw-kvp.scm gw-kvp.c gw-kvp.h gncla-dir.h
-
-CLEANFILES = gnucash g-wrapped .scm-links gncla-dir.h
-DISTCLEANFILES = ${SCM_FILE_LINKS} gw-engine.html gw-kvp.html
-
 gncla-dir.h: gncla-dir.h.in ${top_builddir}/config.status
 	rm -f $@.tmp
 	sed < $< > $@.tmp \
                 -e 's:@-libdir-@:${libdir}:g'
 	mv $@.tmp $@
+
+BUILT_SOURCES = iso-4217-currencies.c \
+  gw-engine.scm gw-engine.c gw-engine.h \
+  gw-kvp.scm gw-kvp.c gw-kvp.h gncla-dir.h
+
+CLEANFILES = $(BUILT_SOURCES) gnucash g-wrapped .scm-links gncla-dir.h \
+	${SCM_FILE_LINKS} gw-engine.html gw-kvp.html
diff --git a/src/gnc-module/Makefile.am b/src/gnc-module/Makefile.am
index 1a87c0eca4..06783f7362 100644
--- a/src/gnc-module/Makefile.am
+++ b/src/gnc-module/Makefile.am
@@ -18,7 +18,7 @@ libgncmodule_la_LIBADD = \
   ${GLIB_LIBS} \
   -lltdl
 
-libgw_gnc_module_la_SOURCES = gw-gnc-module.c
+nodist_libgw_gnc_module_la_SOURCES = gw-gnc-module.c
 
 libgw_gnc_module_la_LIBADD = libgncmodule.la \
   ${G_WRAP_LINK_ARGS} \
@@ -29,7 +29,8 @@ gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
 gncmod_DATA = gnc-module.scm
 
 gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_DATA = gw-gnc-module.scm gw-gnc-module-spec.scm 
+gwmod_DATA = gw-gnc-module-spec.scm 
+nodist_gwmod_DATA = gw-gnc-module.scm
 
 gncincludedir = ${GNC_INCLUDE_DIR}
 gncinclude_HEADERS = \
@@ -38,9 +39,6 @@ gncinclude_HEADERS = \
 
 noinst_DATA = .scm-links
 
-noinst_HEADERS = \
- gw-gnc-module.h
-
 EXTRA_DIST = \
   ${gncmod_DATA} \
   ${gwmod_DATA}
@@ -71,5 +69,5 @@ 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 = .scm-links g-wrapped gnucash
-DISTCLEANFILES = ${SCM_FILE_LINKS} gw-gnc-module.html
+CLEANFILES = $(BUILT_SOURCES) .scm-links g-wrapped gnucash \
+	${SCM_FILE_LINKS} gw-gnc-module.html
diff --git a/src/gnc-module/test/mod-bar/Makefile.am b/src/gnc-module/test/mod-bar/Makefile.am
index 0e310dfd7c..7f5ab678e1 100644
--- a/src/gnc-module/test/mod-bar/Makefile.am
+++ b/src/gnc-module/test/mod-bar/Makefile.am
@@ -12,10 +12,10 @@ checklib_LTLIBRARIES = libbar.la libgncmodbar.la
 libbar_la_SOURCES = bar.c
 
 noinst_HEADERS = \
-  bar.h \
-  bar-gwrap.h
+  bar.h
 
-libgncmodbar_la_SOURCES=bar-gwrap.c gnc-mod-bar.c
+libgncmodbar_la_SOURCES=gnc-mod-bar.c
+nodist_libgncmodbar_la_SOURCES=bar-gwrap.c
 
 libgncmodbar_la_LIBADD=libbar.la \
   $(G_WRAP_LINK_ARGS) \
@@ -32,8 +32,7 @@ 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
-
-DISTCLEANFILES = bar-gwrap.html
+CLEANFILES = $(BUILT_SOURCES) bar-gwrap.html
 
 # Keep automake from generating install targets for test libs
 install-checklibLTLIBRARIES:
diff --git a/src/gnc-module/test/mod-baz/Makefile.am b/src/gnc-module/test/mod-baz/Makefile.am
index b9960ec084..15897f965f 100644
--- a/src/gnc-module/test/mod-baz/Makefile.am
+++ b/src/gnc-module/test/mod-baz/Makefile.am
@@ -14,10 +14,10 @@ libbaz_la_SOURCES = baz.c
 libbaz_la_LIBADD = ../mod-foo/libfoo.la
 
 noinst_HEADERS = \
-  baz.h \
-  baz-gwrap.h
+  baz.h
 
-libgncmodbaz_la_SOURCES = baz-gwrap.c gnc-mod-baz.c
+libgncmodbaz_la_SOURCES = gnc-mod-baz.c
+nodist_libgncmodbaz_la_SOURCES = baz-gwrap.c
 
 libgncmodbaz_la_LIBADD = \
   libbaz.la \
@@ -36,8 +36,7 @@ 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
-
-DISTCLEANFILES = baz-gwrap.html
+CLEANFILES = $(BUILT_SOURCES) baz-gwrap.html
 
 # Keep automake from generating install targets for test libs
 install-checklibLTLIBRARIES:
diff --git a/src/gnc-module/test/mod-foo/Makefile.am b/src/gnc-module/test/mod-foo/Makefile.am
index 85a2e12eb0..69017c31ed 100644
--- a/src/gnc-module/test/mod-foo/Makefile.am
+++ b/src/gnc-module/test/mod-foo/Makefile.am
@@ -12,10 +12,10 @@ checklib_LTLIBRARIES=libfoo.la libgncmodfoo.la
 libfoo_la_SOURCES = foo.c
 
 noinst_HEADERS = \
-  foo.h \
-  foo-gwrap.h
+  foo.h
 
-libgncmodfoo_la_SOURCES = foo-gwrap.c gnc-mod-foo.c
+libgncmodfoo_la_SOURCES = gnc-mod-foo.c
+nodist_libgncmodfoo_la_SOURCES = foo-gwrap.c
 
 libgncmodfoo_la_LIBADD = \
   libfoo.la \
@@ -33,8 +33,7 @@ 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
-
-DISTCLEANFILES = foo-gwrap.html
+CLEANFILES = $(BUILT_SOURCES) foo-gwrap.html
 
 # Keep automake from generating install targets for test libs
 install-checklibLTLIBRARIES:
diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
index 790bdccc75..be8d3d1bcb 100644
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@@ -165,13 +165,10 @@ gncinclude_HEADERS = \
 
 noinst_HEADERS = \
   argv-list-converters.h \
-  gnc-dir.h \
   gnc-druid-gnome.h \
   gnc-druid-provider-edge-gnome.h \
   gnc-druid-provider-file-gnome.h \
   gnc-druid-provider-multifile-gnome.h \
-  gnc-version.h \
-  gw-gnome-utils.h \
   search-param.h
 
 libgncmod_gnome_utils_la_LIBADD = \
@@ -198,7 +195,7 @@ libgncmod_gnome_utils_la_LIBADD = \
   ${GOFFICE_LIBS} \
   ${LIBXML2_LIBS}
 
-libgw_gnome_utils_la_SOURCES = gw-gnome-utils.c
+nodist_libgw_gnome_utils_la_SOURCES = gw-gnome-utils.c
 libgw_gnome_utils_la_LIBADD = \
   libgncmod-gnome-utils.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
@@ -209,7 +206,8 @@ libgw_gnome_utils_la_LIBADD = \
   ${GLIB_LIBS}
 
 gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_DATA = gw-gnome-utils.scm gw-gnome-utils-spec.scm
+gwmod_DATA = gw-gnome-utils-spec.scm
+nodist_gwmod_DATA = gw-gnome-utils.scm
 
 gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
 gncmod_DATA = gnome-utils.scm 
@@ -312,8 +310,8 @@ 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 = gnucash g-wrapped .scm-links
-DISTCLEANFILES = ${SCM_FILE_LINKS} gw-gnome-utils.html
+CLEANFILES = $(BUILT_SOURCES) gnucash g-wrapped .scm-links \
+	${SCM_FILE_LINKS} gw-gnome-utils.html
 
 #
 # I hate inconsistent standards. Autotools puts help files into
diff --git a/src/gnome/Makefile.am b/src/gnome/Makefile.am
index cbb5374b70..d3bed9c15f 100644
--- a/src/gnome/Makefile.am
+++ b/src/gnome/Makefile.am
@@ -3,8 +3,8 @@ SUBDIRS = glade schemas ui
 lib_LTLIBRARIES = libgncgnome.la libgw-gnc.la 
 
 gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_DATA = gw-gnc-spec.scm gw-gnc.scm
-#nodist_gwmod_DATA = gw-gnc.scm
+gwmod_DATA = gw-gnc-spec.scm
+nodist_gwmod_DATA = gw-gnc.scm
 
 libgncgnome_la_LIBADD = \
   ${top_builddir}/src/register/ledger-core/libgncmod-ledger-core.la \
@@ -24,7 +24,7 @@ libgncgnome_la_LIBADD = \
   ${G_WRAP_LINK_ARGS} \
   ${GUILE_LIBS} ${GNOME_LIBS} ${GLIB_LIBS} ${QOF_LIBS}
 
-libgw_gnc_la_SOURCES = gw-gnc.c
+nodist_libgw_gnc_la_SOURCES = gw-gnc.c
 
 libgw_gnc_la_LDFLAGS =  \
   ${G_WRAP_LINK_ARGS} ${GLIB_LIBS}
@@ -94,12 +94,10 @@ noinst_HEADERS = \
   gnc-plugin-page-budget.h \
   gnc-plugin-page-register.h \
   gnc-split-reg.h \
-  gw-gnc.h \
   lot-viewer.h \
   reconcile-list.h \
   top-level.h \
-  window-reconcile.h \
-  gw-gnc.h
+  window-reconcile.h
 
 EXTRA_DIST = \
   gnucash.desktop.in \
@@ -167,5 +165,5 @@ 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
-CLEANFILES = gnucash.desktop gnucash g-wrapped .scm-links
-DISTCLEANFILES = ${SCM_FILE_LINKS} gw-gnc.html
+CLEANFILES = $(BUILT_SOURCES) gnucash.desktop \
+	gnucash g-wrapped .scm-links ${SCM_FILE_LINKS} gw-gnc.html
diff --git a/src/register/register-core/Makefile.am b/src/register/register-core/Makefile.am
index 1afb7efb97..0dd7e520d5 100644
--- a/src/register/register-core/Makefile.am
+++ b/src/register/register-core/Makefile.am
@@ -50,16 +50,14 @@ gncinclude_HEADERS = \
   table-layout.h \
   table-model.h
 
-libgw_register_core_la_SOURCES = gw-register-core.c
+nodist_libgw_register_core_la_SOURCES = gw-register-core.c
 libgw_register_core_la_LIBADD = \
   libgncmod-register-core.la \
   ${G_WRAP_LINK_ARGS}
 
 gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_DATA = gw-register-core.scm gw-register-core-spec.scm
-
-noinst_HEADERS = \
-  gw-register-core.h
+gwmod_DATA = gw-register-core-spec.scm
+nodist_gwmod_DATA = gw-register-core.scm
 
 EXTRA_DIST = \
   ${gwmod_DATA}
@@ -105,5 +103,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 = gnucash g-wrapped register .scm-links
-DISTCLEANFILES = ${SCM_FILE_LINKS} gw-register-core.html
+CLEANFILES = $(BUILT_SOURCES) gnucash g-wrapped register .scm-links \
+	${SCM_FILE_LINKS} gw-register-core.html
diff --git a/src/report/report-gnome/Makefile.am b/src/report/report-gnome/Makefile.am
index 81665f89e0..bce7082929 100644
--- a/src/report/report-gnome/Makefile.am
+++ b/src/report/report-gnome/Makefile.am
@@ -51,13 +51,14 @@ libgncmod_report_gnome_la_LIBADD = \
   ${QOF_LIBS} \
   ${GLIB_LIBS}
 
-libgw_report_gnome_la_SOURCES = gw-report-gnome.c
+nodist_libgw_report_gnome_la_SOURCES = gw-report-gnome.c
 libgw_report_gnome_la_LIBADD = \
   libgncmod-report-gnome.la \
   ${G_WRAP_LINK_ARGS}
 
 gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_DATA = gw-report-gnome.scm gw-report-gnome-spec.scm
+gwmod_DATA = gw-report-gnome-spec.scm
+nodist_gwmod_DATA = gw-report-gnome.scm
 
 gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report
 gncmod_DATA = report-gnome.scm
@@ -72,9 +73,6 @@ uidir = $(GNC_UI_DIR)
 ui_DATA = \
 	gnc-plugin-page-report-ui.xml
 
-noinst_HEADERS = \
- gw-report-gnome.h
-
 EXTRA_DIST = \
   ${glade_DATA} \
   ${gwmod_DATA} \
@@ -114,5 +112,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 = gnucash g-wrapped report .scm-links
-DISTCLEANFILES = ${SCM_FILE_LINKS} gw-report-gnome.html
+CLEANFILES = $(BUILT_SOURCES) gnucash g-wrapped report .scm-links \
+	${SCM_FILE_LINKS} gw-report-gnome.html
diff --git a/src/report/report-system/Makefile.am b/src/report/report-system/Makefile.am
index bbdc720511..df49a58d09 100644
--- a/src/report/report-system/Makefile.am
+++ b/src/report/report-system/Makefile.am
@@ -68,15 +68,15 @@ if GNUCASH_SEPARATE_BUILDDIR
 endif
 	touch .scm-links
 
-libgw_report_system_la_SOURCES = gw-report-system.c
+nodist_libgw_report_system_la_SOURCES = gw-report-system.c
 libgw_report_system_la_LIBADD = \
   libgncmod-report-system.la \
   ${G_WRAP_LINK_ARGS}
 
 gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_DATA = gw-report-system.scm gw-report-system-spec.scm
+gwmod_DATA = gw-report-system-spec.scm
+nodist_gwmod_DATA = gw-report-system.scm
 
-noinst_HEADERS = gw-report-system.h
 noinst_DATA = .scm-links gw-report-system.h
 
 EXTRA_DIST = ${gncscmmod_DATA} ${gncscm_DATA} ${gwmod_DATA}
@@ -93,5 +93,5 @@ gw-report-system.scm gw-report-system.c gw-report-system.h: \
 	  (gw:generate-wrapset \"gw-report-system\")"
 
 BUILT_SOURCES = gw-report-system.scm gw-report-system.c gw-report-system.h
-CLEANFILES = gnucash g-wrapped report .scm-links
-DISTCLEANFILES = ${SCM_FILE_LINKS} gw-report-system.html
+CLEANFILES = $(BUILT_SOURCES) gnucash g-wrapped report .scm-links \
+	${SCM_FILE_LINKS} gw-report-system.html