[Gnucash-changes] r12992 - gnucash/trunk - Get "make distcheck" to
work....
Derek Atkins
warlord at cvs.gnucash.org
Fri Jan 27 16:49:04 EST 2006
Author: warlord
Date: 2006-01-27 16:49:03 -0500 (Fri, 27 Jan 2006)
New Revision: 12992
Trac: http://svn.gnucash.org/trac/changeset/12992
Modified:
gnucash/trunk/ChangeLog
gnucash/trunk/Makefile.am
gnucash/trunk/configure.in
gnucash/trunk/lib/Makefile.am
gnucash/trunk/lib/goffice-0.0.4/Makefile.am
gnucash/trunk/lib/libgsf-1.12.3/Makefile.am
gnucash/trunk/lib/libgsf-1.12.3/tests/Makefile.am
gnucash/trunk/src/bin/Makefile.am
gnucash/trunk/src/import-export/test/Makefile.am
gnucash/trunk/src/report/report-system/Makefile.am
Log:
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
Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog 2006-01-27 18:09:33 UTC (rev 12991)
+++ gnucash/trunk/ChangeLog 2006-01-27 21:49:03 UTC (rev 12992)
@@ -1,3 +1,26 @@
+2006-01-27 Derek Atkins <derek at ihtfp.com>
+
+ 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 <hampton at employees.org>
* configure.in: Default the --enable-compile-warnings argument to
Modified: gnucash/trunk/Makefile.am
===================================================================
--- gnucash/trunk/Makefile.am 2006-01-27 18:09:33 UTC (rev 12991)
+++ gnucash/trunk/Makefile.am 2006-01-27 21:49:03 UTC (rev 12992)
@@ -47,6 +47,7 @@
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 @@
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 @@
dist-hook: po/POTFILES.in
-distcheck-hook:
+distcheck-hook: po/POTFILES.in
distclean-local:
Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in 2006-01-27 18:09:33 UTC (rev 12991)
+++ gnucash/trunk/configure.in 2006-01-27 21:49:03 UTC (rev 12992)
@@ -454,7 +454,7 @@
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'
Modified: gnucash/trunk/lib/Makefile.am
===================================================================
--- gnucash/trunk/lib/Makefile.am 2006-01-27 18:09:33 UTC (rev 12991)
+++ gnucash/trunk/lib/Makefile.am 2006-01-27 21:49:03 UTC (rev 12992)
@@ -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
Modified: gnucash/trunk/lib/goffice-0.0.4/Makefile.am
===================================================================
--- gnucash/trunk/lib/goffice-0.0.4/Makefile.am 2006-01-27 18:09:33 UTC (rev 12991)
+++ gnucash/trunk/lib/goffice-0.0.4/Makefile.am 2006-01-27 21:49:03 UTC (rev 12992)
@@ -8,10 +8,11 @@
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
Modified: gnucash/trunk/lib/libgsf-1.12.3/Makefile.am
===================================================================
--- gnucash/trunk/lib/libgsf-1.12.3/Makefile.am 2006-01-27 18:09:33 UTC (rev 12991)
+++ gnucash/trunk/lib/libgsf-1.12.3/Makefile.am 2006-01-27 21:49:03 UTC (rev 12992)
@@ -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
Modified: gnucash/trunk/lib/libgsf-1.12.3/tests/Makefile.am
===================================================================
--- gnucash/trunk/lib/libgsf-1.12.3/tests/Makefile.am 2006-01-27 18:09:33 UTC (rev 12991)
+++ gnucash/trunk/lib/libgsf-1.12.3/tests/Makefile.am 2006-01-27 21:49:03 UTC (rev 12992)
@@ -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 \
Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am 2006-01-27 18:09:33 UTC (rev 12991)
+++ gnucash/trunk/src/bin/Makefile.am 2006-01-27 21:49:03 UTC (rev 12992)
@@ -99,6 +99,7 @@
${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/import-export/test/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/test/Makefile.am 2006-01-27 18:09:33 UTC (rev 12991)
+++ gnucash/trunk/src/import-export/test/Makefile.am 2006-01-27 21:49:03 UTC (rev 12992)
@@ -36,6 +36,7 @@
--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
Modified: gnucash/trunk/src/report/report-system/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-system/Makefile.am 2006-01-27 18:09:33 UTC (rev 12991)
+++ gnucash/trunk/src/report/report-system/Makefile.am 2006-01-27 21:49:03 UTC (rev 12992)
@@ -48,7 +48,7 @@
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
More information about the gnucash-changes
mailing list