AUDIT: r14555 - gnucash/trunk - Allow proper compile/install from tarball using separate builddir.
Derek Atkins
warlord at cvs.gnucash.org
Tue Jul 25 09:25:29 EDT 2006
Author: warlord
Date: 2006-07-25 09:25:26 -0400 (Tue, 25 Jul 2006)
New Revision: 14555
Trac: http://svn.gnucash.org/trac/changeset/14555
Modified:
gnucash/trunk/
gnucash/trunk/ChangeLog
gnucash/trunk/lib/goffice-0.0.4/goffice/Makefile.am
gnucash/trunk/lib/libqof/backend/file/Makefile.am
gnucash/trunk/lib/libqof/qof/Makefile.am
gnucash/trunk/src/app-utils/Makefile.am
gnucash/trunk/src/bin/Makefile.am
gnucash/trunk/src/business/business-core/Makefile.am
gnucash/trunk/src/business/business-gnome/Makefile.am
gnucash/trunk/src/business/dialog-tax-table/Makefile.am
gnucash/trunk/src/core-utils/Makefile.am
gnucash/trunk/src/engine/Makefile.am
gnucash/trunk/src/gnc-module/Makefile.am
gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am
gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am
gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am
gnucash/trunk/src/gnome-utils/Makefile.am
gnucash/trunk/src/gnome/Makefile.am
gnucash/trunk/src/register/register-core/Makefile.am
gnucash/trunk/src/report/report-gnome/Makefile.am
gnucash/trunk/src/report/report-system/Makefile.am
Log:
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
Property changes on: gnucash/trunk
___________________________________________________________________
Name: svk:merge
- d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:12922
+ d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:12923
Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog 2006-07-25 13:25:16 UTC (rev 14554)
+++ gnucash/trunk/ChangeLog 2006-07-25 13:25:26 UTC (rev 14555)
@@ -1,5 +1,10 @@
2006-07-24 Derek Atkins <derek at 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.
Modified: gnucash/trunk/lib/goffice-0.0.4/goffice/Makefile.am
===================================================================
--- gnucash/trunk/lib/goffice-0.0.4/goffice/Makefile.am 2006-07-25 13:25:16 UTC (rev 14554)
+++ gnucash/trunk/lib/goffice-0.0.4/goffice/Makefile.am 2006-07-25 13:25:26 UTC (rev 14555)
@@ -24,7 +24,6 @@
CLEANFILES = $(BUILT_SOURCES)
libgoffice_1_la_SOURCES = \
- $(BUILT_SOURCES) \
goffice.c \
goffice-priv.h
if !HAVE_GLIB26
Modified: gnucash/trunk/lib/libqof/backend/file/Makefile.am
===================================================================
--- gnucash/trunk/lib/libqof/backend/file/Makefile.am 2006-07-25 13:25:16 UTC (rev 14554)
+++ gnucash/trunk/lib/libqof/backend/file/Makefile.am 2006-07-25 13:25:26 UTC (rev 14555)
@@ -40,6 +40,4 @@
mv $@.tmp $@
BUILT_SOURCES = qsf-dir.h
-
-CONFIG_CLEAN_FILES = qsf-dir.h
-
+CLEANFILES = qsf-dir.h
Modified: gnucash/trunk/lib/libqof/qof/Makefile.am
===================================================================
--- gnucash/trunk/lib/libqof/qof/Makefile.am 2006-07-25 13:25:16 UTC (rev 14554)
+++ gnucash/trunk/lib/libqof/qof/Makefile.am 2006-07-25 13:25:26 UTC (rev 14555)
@@ -94,4 +94,4 @@
mv $@.tmp $@
BUILT_SOURCES = qofla-dir.h
-DISTCLEANFILES = qofla-dir.h
+CLEANFILES = $(BUILT_SOURCES)
Modified: gnucash/trunk/src/app-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/Makefile.am 2006-07-25 13:25:16 UTC (rev 14554)
+++ gnucash/trunk/src/app-utils/Makefile.am 2006-07-25 13:25:26 UTC (rev 14555)
@@ -64,9 +64,6 @@
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 @@
${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 @@
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: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
Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am 2006-07-25 13:25:16 UTC (rev 14554)
+++ gnucash/trunk/src/bin/Makefile.am 2006-07-25 13:25:26 UTC (rev 14555)
@@ -67,7 +67,7 @@
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 @@
${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 @... at . This prevents autoconf
Modified: gnucash/trunk/src/business/business-core/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-core/Makefile.am 2006-07-25 13:25:16 UTC (rev 14554)
+++ gnucash/trunk/src/business/business-core/Makefile.am 2006-07-25 13:25:26 UTC (rev 14555)
@@ -52,8 +52,7 @@
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 @@
# 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 @@
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: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}
Modified: gnucash/trunk/src/business/business-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-gnome/Makefile.am 2006-07-25 13:25:16 UTC (rev 14554)
+++ gnucash/trunk/src/business/business-gnome/Makefile.am 2006-07-25 13:25:26 UTC (rev 14555)
@@ -64,8 +64,7 @@
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 @@
${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 @@
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: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
Modified: gnucash/trunk/src/business/dialog-tax-table/Makefile.am
===================================================================
--- gnucash/trunk/src/business/dialog-tax-table/Makefile.am 2006-07-25 13:25:16 UTC (rev 14554)
+++ gnucash/trunk/src/business/dialog-tax-table/Makefile.am 2006-07-25 13:25:26 UTC (rev 14555)
@@ -25,8 +25,7 @@
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 @@
${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 @@
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 @@
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
Modified: gnucash/trunk/src/core-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/core-utils/Makefile.am 2006-07-25 13:25:16 UTC (rev 14554)
+++ gnucash/trunk/src/core-utils/Makefile.am 2006-07-25 13:25:26 UTC (rev 14555)
@@ -13,7 +13,7 @@
${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 @@
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 @@
${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: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
Modified: gnucash/trunk/src/engine/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/Makefile.am 2006-07-25 13:25:16 UTC (rev 14554)
+++ gnucash/trunk/src/engine/Makefile.am 2006-07-25 13:25:26 UTC (rev 14555)
@@ -100,8 +100,6 @@
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 @@
${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 @@
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 @@
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 @@
(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
Modified: gnucash/trunk/src/gnc-module/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/Makefile.am 2006-07-25 13:25:16 UTC (rev 14554)
+++ gnucash/trunk/src/gnc-module/Makefile.am 2006-07-25 13:25:26 UTC (rev 14555)
@@ -18,7 +18,7 @@
${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 @@
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 @@
noinst_DATA = .scm-links
-noinst_HEADERS = \
- gw-gnc-module.h
-
EXTRA_DIST = \
${gncmod_DATA} \
${gwmod_DATA}
@@ -71,5 +69,5 @@
(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
Modified: gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am 2006-07-25 13:25:16 UTC (rev 14554)
+++ gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am 2006-07-25 13:25:26 UTC (rev 14555)
@@ -12,10 +12,10 @@
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,9 +32,8 @@
(gw:generate-wrapset \"bar-gwrap\")"
BUILT_SOURCES = bar-gwrap.c bar-gwrap.h
+CLEANFILES = $(BUILT_SOURCES) bar-gwrap.html
-DISTCLEANFILES = bar-gwrap.html
-
# Keep automake from generating install targets for test libs
install-checklibLTLIBRARIES:
uninstall-checklibLTLIBRARIES:
Modified: gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am 2006-07-25 13:25:16 UTC (rev 14554)
+++ gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am 2006-07-25 13:25:26 UTC (rev 14555)
@@ -14,10 +14,10 @@
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,9 +36,8 @@
(gw:generate-wrapset \"baz-gwrap\")"
BUILT_SOURCES = baz-gwrap.c baz-gwrap.h
+CLEANFILES = $(BUILT_SOURCES) baz-gwrap.html
-DISTCLEANFILES = baz-gwrap.html
-
# Keep automake from generating install targets for test libs
install-checklibLTLIBRARIES:
uninstall-checklibLTLIBRARIES:
Modified: gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am 2006-07-25 13:25:16 UTC (rev 14554)
+++ gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am 2006-07-25 13:25:26 UTC (rev 14555)
@@ -12,10 +12,10 @@
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,9 +33,8 @@
(gw:generate-wrapset \"foo-gwrap\")"
BUILT_SOURCES = foo-gwrap.c foo-gwrap.h
+CLEANFILES = $(BUILT_SOURCES) foo-gwrap.html
-DISTCLEANFILES = foo-gwrap.html
-
# Keep automake from generating install targets for test libs
install-checklibLTLIBRARIES:
uninstall-checklibLTLIBRARIES:
Modified: gnucash/trunk/src/gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/Makefile.am 2006-07-25 13:25:16 UTC (rev 14554)
+++ gnucash/trunk/src/gnome/Makefile.am 2006-07-25 13:25:26 UTC (rev 14555)
@@ -3,8 +3,8 @@
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 @@
${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 @@
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 @@
(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
Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am 2006-07-25 13:25:16 UTC (rev 14554)
+++ gnucash/trunk/src/gnome-utils/Makefile.am 2006-07-25 13:25:26 UTC (rev 14555)
@@ -165,13 +165,10 @@
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 @@
${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 @@
${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: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
Modified: gnucash/trunk/src/register/register-core/Makefile.am
===================================================================
--- gnucash/trunk/src/register/register-core/Makefile.am 2006-07-25 13:25:16 UTC (rev 14554)
+++ gnucash/trunk/src/register/register-core/Makefile.am 2006-07-25 13:25:26 UTC (rev 14555)
@@ -50,17 +50,15 @@
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
+gwmod_DATA = gw-register-core-spec.scm
+nodist_gwmod_DATA = gw-register-core.scm
-noinst_HEADERS = \
- gw-register-core.h
-
EXTRA_DIST = \
${gwmod_DATA}
@@ -105,5 +103,5 @@
(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
Modified: gnucash/trunk/src/report/report-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-gnome/Makefile.am 2006-07-25 13:25:16 UTC (rev 14554)
+++ gnucash/trunk/src/report/report-gnome/Makefile.am 2006-07-25 13:25:26 UTC (rev 14555)
@@ -51,13 +51,14 @@
${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 @@
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: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
Modified: gnucash/trunk/src/report/report-system/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-system/Makefile.am 2006-07-25 13:25:16 UTC (rev 14554)
+++ gnucash/trunk/src/report/report-system/Makefile.am 2006-07-25 13:25:26 UTC (rev 14555)
@@ -68,15 +68,15 @@
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: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
More information about the gnucash-changes
mailing list