From ed2263acdb11df90b61de9a926c4227060085dbc Mon Sep 17 00:00:00 2001 From: Derek Atkins Date: Fri, 27 Jan 2006 21:49:03 +0000 Subject: [PATCH] Get "make distcheck" to work.... * src/import-export/test/Makefile.am: Added src/scm directory to test environment * lib/goffice-0.0.4/Makefile.am: Don't install libgoffice-1.pc, but distribute it * lib/libgsf-1.12.3/tests/Makefile.am: Link to the proper location of libgsf-1.la * lib/libgsf-1.12.3/Makefile.am: Don't install the gsf .pc files, but distribute them. * lib/Makefile.am: Use DIST_SUBDIRS to distribute qof, gsf, and goffice * configure.in: fix QOF_LIBS to use builddir, not srcdir * Makefile.am: add po/POTFILES.in to the dist link gsf into the srcdir, not the builddir * src/report/report-system/Makefile.am: make sure we distribute gw-report-system.h * src/bin/Makefile.am: clean i18n.h in distclean git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@12992 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 23 +++++++++++++++++++++++ Makefile.am | 5 +++-- configure.in | 2 +- lib/Makefile.am | 1 + lib/goffice-0.0.4/Makefile.am | 5 +++-- lib/libgsf-1.12.3/Makefile.am | 7 ++++--- lib/libgsf-1.12.3/tests/Makefile.am | 2 +- src/bin/Makefile.am | 1 + src/import-export/test/Makefile.am | 1 + src/report/report-system/Makefile.am | 2 +- 10 files changed, 39 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 94c35ba2fb..26cb4567ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2006-01-27 Derek Atkins + + Get "make distcheck" to work.... + * src/import-export/test/Makefile.am: + Added src/scm directory to test environment + * lib/goffice-0.0.4/Makefile.am: + Don't install libgoffice-1.pc, but distribute it + * lib/libgsf-1.12.3/tests/Makefile.am: + Link to the proper location of libgsf-1.la + * lib/libgsf-1.12.3/Makefile.am: + Don't install the gsf .pc files, but distribute them. + * lib/Makefile.am: + Use DIST_SUBDIRS to distribute qof, gsf, and goffice + * configure.in: + fix QOF_LIBS to use builddir, not srcdir + * Makefile.am: + add po/POTFILES.in to the dist + link gsf into the srcdir, not the builddir + * src/report/report-system/Makefile.am: + make sure we distribute gw-report-system.h + * src/bin/Makefile.am: + clean i18n.h in distclean + 2006-01-26 David Hampton * configure.in: Default the --enable-compile-warnings argument to diff --git a/Makefile.am b/Makefile.am index 71fc54241c..d08abb5169 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,6 +47,7 @@ EXTRA_DIST = ChangeLog.1 \ macros/g-wrap.m4 \ macros/gnome-guile-checks.m4 \ macros/legacy_macros.m4 \ + po/POTFILES.in \ po/README \ po/glossary/da.po \ po/glossary/de.po \ @@ -98,7 +99,7 @@ if !HAVE_GOFFICE ln -sf . goffice endif if !HAVE_LIBGSF - ln -sf lib/libgsf-1.12.3/gsf gsf + ln -sf $(srcdir)/lib/libgsf-1.12.3/gsf gsf endif touch .links @@ -149,7 +150,7 @@ distcleancheck_listfiles = \ dist-hook: po/POTFILES.in -distcheck-hook: +distcheck-hook: po/POTFILES.in distclean-local: diff --git a/configure.in b/configure.in index 4ce141a5bc..b2fc4cf448 100644 --- a/configure.in +++ b/configure.in @@ -454,7 +454,7 @@ fi if test x$QOF_XML_DIR = x; then QOF_LIB_DIR='${libdir}' QOF_CFLAGS='-I${top_srcdir}/lib/libqof/qof' - QOF_LIBS='${top_srcdir}/lib/libqof/qof/libqof.la' + QOF_LIBS='${top_builddir}/lib/libqof/qof/libqof.la' QOF_VERSION="internal" QOF_PREFIX="internal" QOF_XML_DIR='${datadir}/xml/qsf' diff --git a/lib/Makefile.am b/lib/Makefile.am index 9c5a7381d4..9e8f6aaacb 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,5 @@ SUBDIRS = libc glib26 guile-www srfi +DIST_SUBDIRS = libc glib26 guile-www srfi libgsf-1.12.3 goffice-0.0.4 libqof if !HAVE_GOFFICE if !HAVE_LIBGSF diff --git a/lib/goffice-0.0.4/Makefile.am b/lib/goffice-0.0.4/Makefile.am index 8753dea752..6b26a0f8c4 100644 --- a/lib/goffice-0.0.4/Makefile.am +++ b/lib/goffice-0.0.4/Makefile.am @@ -8,10 +8,11 @@ EXTRA_DIST = README NEWS BUGS MAINTAINERS AUTHORS \ goffice-plugins.mk \ intltool-extract.in \ intltool-update.in \ - intltool-merge.in + intltool-merge.in \ + libgoffice-1.pc DISTCLEANFILES = intltool-extract intltool-merge intltool-update pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libgoffice-1.pc +#pkgconfig_DATA = libgoffice-1.pc include $(top_srcdir)/lib/goffice-0.0.4/goffice.mk diff --git a/lib/libgsf-1.12.3/Makefile.am b/lib/libgsf-1.12.3/Makefile.am index ed8339f225..ec0a0338ca 100644 --- a/lib/libgsf-1.12.3/Makefile.am +++ b/lib/libgsf-1.12.3/Makefile.am @@ -1,13 +1,14 @@ pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libgsf-1.pc +#pkgconfig_DATA = libgsf-1.pc if WITH_LIBGSF_GNOME - pkgconfig_DATA += libgsf-gnome-1.pc +# pkgconfig_DATA += libgsf-gnome-1.pc endif if PLATFORM_WIN32 - pkgconfig_DATA += libgsf-win32-1.pc +# pkgconfig_DATA += libgsf-win32-1.pc endif +DIST_SUBDIRS = gsf gsf-gnome gsf-win32 tests python SUBDIRS = gsf gsf-gnome gsf-win32 tests # doc (before tests) # po diff --git a/lib/libgsf-1.12.3/tests/Makefile.am b/lib/libgsf-1.12.3/tests/Makefile.am index 56e7d9a38a..4cfd5816ba 100644 --- a/lib/libgsf-1.12.3/tests/Makefile.am +++ b/lib/libgsf-1.12.3/tests/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS) $(LIBXML_CFLAGS) -LDADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS) +LDADD = ../gsf/libgsf-1.la $(LIBGSF_LIBS) check_PROGRAMS = test-msole1 test-msole2 test-cp-msole test-msvba \ test-zip1 test-input1 test-cp \ diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 2dc40f5dcf..95e6bb08b8 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -99,6 +99,7 @@ ${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/import-export/test/Makefile.am b/src/import-export/test/Makefile.am index 63a85e90f5..8a33e55ace 100644 --- a/src/import-export/test/Makefile.am +++ b/src/import-export/test/Makefile.am @@ -36,6 +36,7 @@ GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \ --gnc-module-dir ${top_builddir}/src/gnome \ --library-dir ${G_WRAP_LIB_DIR} \ --guile-load-dir ${G_WRAP_MODULE_DIR} \ + --guile-load-dir ${top_builddir}/src/scm \ --guile-load-dir ${top_srcdir}/src/scm \ --guile-load-dir ${top_srcdir}/src/import-export diff --git a/src/report/report-system/Makefile.am b/src/report/report-system/Makefile.am index 3a0183ea7d..79510b0d92 100644 --- a/src/report/report-system/Makefile.am +++ b/src/report/report-system/Makefile.am @@ -48,7 +48,7 @@ libgw_report_system_la_SOURCES = gw-report-system.c gwmoddir = ${GNC_GWRAP_LIBDIR} gwmod_DATA = gw-report-system.scm gw-report-system-spec.scm - +noinst_HEADERS = gw-report-system.h noinst_DATA = .scm-links gw-report-system.h gncscmdir = ${GNC_SHAREDIR}/scm