On 17-12-11 20:32, John Ralls wrote:
Author: jralls
Date: 2011-12-17 14:32:27 -0500 (Sat, 17 Dec 2011)
New Revision: 21736
Trac: http://svn.gnucash.org/trac/changeset/21736
Modified:
gnucash/trunk/src/Makefile.am
gnucash/trunk/src/libqof/qof/test/Makefile.am
Log:
Fix circular dependency between test-core and qof-test.
Compile test-core/test-stuff.c into test-qof, then recompile test-core as a
module for dealing with noise from Guile and Python tests.
Hmm, while this may work, it strikes me as quite an ugly hack. Is there
really no way to do this and avoid bidirectional dependencies between
libqof and test-core ?
Geert
Modified: gnucash/trunk/src/Makefile.am
===================================================================
--- gnucash/trunk/src/Makefile.am 2011-12-17 11:02:55 UTC (rev 21735)
+++ gnucash/trunk/src/Makefile.am 2011-12-17 19:32:27 UTC (rev 21736)
@@ -1,7 +1,7 @@
# These directories do not contain any gtk dependencies
NONGUI_SUBDIRS = \
+ libqof \
test-core \
- libqof \
debug \
doc \
pixmaps \
Modified: gnucash/trunk/src/libqof/qof/test/Makefile.am
===================================================================
--- gnucash/trunk/src/libqof/qof/test/Makefile.am 2011-12-17 11:02:55 UTC
(rev 21735)
+++ gnucash/trunk/src/libqof/qof/test/Makefile.am 2011-12-17 19:32:27 UTC
(rev 21736)
@@ -15,14 +15,16 @@
test-qofinstance.c \
test-kvp_frame.c \
test-qofobject.c \
- test-qofsession.c
+ test-qofsession.c \
+ ${top_srcdir}/src/test-core/test-stuff.c
test_qof_HEADERS = \
$(top_srcdir)/${MODULEPATH}/qofbook.h \
$(top_srcdir)/${MODULEPATH}/qofinstance.h \
$(top_srcdir)/${MODULEPATH}/kvp_frame.h \
$(top_srcdir)/${MODULEPATH}/qofobject.h \
- $(top_srcdir)/${MODULEPATH}/qofsession.h
+ $(top_srcdir)/${MODULEPATH}/qofsession.h \
+ $(top_srcdir)/src/test-core/test-stuff.h
TEST_PROGS += test-qof
@@ -33,12 +35,11 @@
#as independent as possible.
test_qof_LDADD = \
${top_builddir}/${MODULEPATH}/libgnc-qof.la \
- ${top_builddir}/src/test-core/.libs/libtest-core.la \
$(GLIB_LIBS)
test_qof_CFLAGS = \
${DEFAULT_INCLUDES} \
- -I$(top_srcdir)/${MODULEPATH}/ \
+ -I$(top_srcdir)/${MODULEPATH} \
-I$(top_srcdir)/src/test-core \
-DTESTPROG=test_qof \
${GLIB_CFLAGS}
_______________________________________________
gnucash-changes mailing list
[email protected]
https://lists.gnucash.org/mailman/listinfo/gnucash-changes
_______________________________________________
gnucash-devel mailing list
[email protected]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
