[Gnucash-changes] r11878 - gnucash/trunk - Moving QOF to lib/libqof/
Neil Williams
codehelp at cvs.gnucash.org
Mon Nov 7 10:34:50 EST 2005
Author: codehelp
Date: 2005-11-07 10:34:49 -0500 (Mon, 07 Nov 2005)
New Revision: 11878
Modified:
gnucash/trunk/ChangeLog
gnucash/trunk/configure.in
gnucash/trunk/src/backend/Makefile.am
gnucash/trunk/src/engine/Makefile.am
Log:
Moving QOF to lib/libqof/
Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog 2005-11-07 12:55:33 UTC (rev 11877)
+++ gnucash/trunk/ChangeLog 2005-11-07 15:34:49 UTC (rev 11878)
@@ -1,5 +1,13 @@
2005-11-07 Neil Williams <linux at codehelp.co.uk>
+ * configure.in : Adapt internal QOF build
+ variables for new locations.
+ * src/backend/Makefile.am : remove qsf/
+ * src/engine/Makefile.am : remove QOF files.
+ * lib/Makefile.am : New directory.
+
+2005-11-07 Neil Williams <linux at codehelp.co.uk>
+
* src/engine/gnc-budget.c : Remove unnecessary
private headers.
Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in 2005-11-07 12:55:33 UTC (rev 11877)
+++ gnucash/trunk/configure.in 2005-11-07 15:34:49 UTC (rev 11878)
@@ -417,11 +417,13 @@
fi
if test x$QOF_XML_DIR = x; then
AC_MSG_RESULT([no, will use internal QOF code])
- QOF_CFLAGS="-I\${top_srcdir}/src/engine"
- QOF_LIBS="\${top_srcdir}/src/engine/libqof.la"
- QOF_LIB_DIR="${libdir}"
+ QOF_LIB_DIR=`eval echo $libdir | sed "s%^NONE%$prefix%"`
+ QOF_LIB_DIR=`eval echo $QOF_LIB_DIR | sed "s%^NONE%$prefix%"`
+ QOF_CFLAGS="-I\${top_srcdir}/lib/libqof/qof"
+ QOF_LIBS="\${top_srcdir}/lib/libqof/qof/libqof.la"
+# QOF_LIB_DIR=`eval echo ${libdir}`
QOF_PREFIX="internal"
- QOF_XML_DIR="$QSF_SCHEMA_DIR"
+ QOF_XML_DIR=`eval echo ${datadir}/xml/qsf`
LIBQOF_LIBRARY_VERSION=1:1:0
LIBQOF_BACKEND_QSF_LIBRARY_VERSION=0:0:0
AC_SUBST(LIBQOF_LIBRARY_VERSION)
@@ -439,6 +441,7 @@
AS_SCRUB_INCLUDE(QOF_PREFIX)
AC_SUBST(QOF_PREFIX)
AC_SUBST(QOF_LIB_DIR)
+AC_SUBST(QOF_XML_DIR)
### --------------------------------------------------------------------------
### for GOG/goffice...
@@ -547,7 +550,6 @@
GNC_ACCOUNTS_DIR='${GNC_SHAREDIR}/accounts'
GNC_GLADE_DIR='${GNC_SHAREDIR}/glade'
-QSF_SCHEMA_DIR='${GNC_SHAREDIR}/xml/qsf'
GNC_UI_DIR='${GNC_SHAREDIR}/ui'
GNC_GWRAP_LIBDIR='${GNC_SHAREDIR}/guile-modules/g-wrapped'
GNC_MODULE_DIR='${pkglibdir}'
@@ -557,7 +559,6 @@
AC_SUBST(GNC_CONFIGDIR)
AC_SUBST(GNC_DOC_INSTALL_DIR)
AC_SUBST(GNC_GLADE_DIR)
-AC_SUBST(QSF_SCHEMA_DIR)
AC_SUBST(GNC_UI_DIR)
AC_SUBST(GNC_GWRAP_LIBDIR)
AC_SUBST(GNC_INCLUDE_DIR)
@@ -1286,6 +1287,10 @@
lib/goffice/pixmaps/Makefile
lib/goffice/cut-n-paste/Makefile
lib/goffice/cut-n-paste/pcre/Makefile
+ lib/libqof/Makefile
+ lib/libqof/qof/Makefile
+ lib/libqof/backend/Makefile
+ lib/libqof/backend/file/Makefile
rpm/Makefile
src/Makefile
src/app-utils/Makefile
@@ -1296,7 +1301,6 @@
src/backend/file/test/Makefile
src/backend/file/test/test-files/Makefile
src/backend/file/test/test-files/xml2/Makefile
- src/backend/qsf/Makefile
src/backend/postgres/Makefile
src/backend/postgres/test/Makefile
src/backend/rpc/Makefile
Modified: gnucash/trunk/src/backend/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/Makefile.am 2005-11-07 12:55:33 UTC (rev 11877)
+++ gnucash/trunk/src/backend/Makefile.am 2005-11-07 15:34:49 UTC (rev 11878)
@@ -1,10 +1,5 @@
-if USE_LIBQOF
-SUBDIRS = qsf file ${SQL_DIR} ${RPC_DIR}
-DIST_SUBDIRS = qsf file net postgres rpc
-else
SUBDIRS = file ${SQL_DIR} ${RPC_DIR}
-DIST_SUBDIRS = qsf file net postgres rpc
-endif
+DIST_SUBDIRS = file net postgres rpc
noinst_HEADERS = gnc-backend-api.h
Modified: gnucash/trunk/src/engine/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/Makefile.am 2005-11-07 12:55:33 UTC (rev 11877)
+++ gnucash/trunk/src/engine/Makefile.am 2005-11-07 15:34:49 UTC (rev 11878)
@@ -12,103 +12,6 @@
${QOF_CFLAGS} \
${GNUCASH_ENGINE_CFLAGS}
-qof_library = \
- gnc-date.c \
- gnc-engine-util.c \
- gnc-numeric.c \
- gnc-event.c \
- gnc-trace.c \
- guid.c \
- kvp_frame.c \
- kvp-util.c \
- md5.c \
- qofbackend.c \
- qofclass.c \
- qofchoice.c \
- qofid.c \
- qofinstance.c \
- qofquery.c \
- qofbook.c \
- qofobject.c \
- qofquerycore.c \
- qofsession.c \
- qof_book_merge.c
-
-qof_headers = \
- gnc-date.h \
- gnc-engine-util.h \
- gnc-numeric.h \
- gnc-event.h \
- gnc-trace.h \
- guid.h \
- kvp_frame.h \
- kvp-util.h \
- kvp-util-p.h \
- qof.h \
- qof-be-utils.h \
- qofbackend.h \
- qofbackend-p.h \
- qofclass.h \
- qofchoice.h \
- qofid.h \
- qofid-p.h \
- qofinstance-p.h \
- qofinstance.h \
- qofquery.h \
- qofbook.h \
- qofobject.h \
- qofquerycore.h \
- qofsession.h \
- qof_book_merge.h
-
-qof_noinst_headers = \
- gnc-event-p.h \
- md5.h \
- qofclass-p.h \
- qofmath128.h \
- qofquery-p.h \
- qofbook-p.h \
- qofobject-p.h \
- qofquerycore-p.h \
- qofsession-p.h \
- qofsql.h
-
-if USE_LIBQOF
-
-lib_LTLIBRARIES = libqof.la
-
-libqof_la_LDFLAGS= -version-info $(LIBQOF_LIBRARY_VERSION)
-
-libqof_la_SOURCES = ${qof_library}
-
-qofincludedir = ${pkgincludedir}
-
-qofinclude_HEADERS = ${qof_headers}
-
-nodist_qofinclude_HEADERS = qofla-dir.h
-
-QOFLIBdir = $(libdir)
-
-qofla-dir.h: qofla-dir.h.in
- rm -f $@.tmp
- sed < $< > $@.tmp \
- -e 's:@-libdir-@:${QOFLIBdir}:g'
- mv $@.tmp $@
-
-qof_builds = qofla-dir.h
-
-else
-
-libqof_la_SOURCES =
-
-qofincludedir = ${pkgincludedir}
-
-qofinclude_HEADERS =
-
-qof_builds =
-
-endif
-
libgncmod_engine_la_SOURCES = \
Account.c \
FreqSpec.c \
@@ -196,8 +99,7 @@
gnc-pricedb-p.h \
gw-engine.h \
gw-kvp.h \
- policy-p.h \
- ${qof_noinst_headers}
+ policy-p.h
noinst_SCRIPTS = iso-currencies-to-c
@@ -239,12 +141,9 @@
extensions.txt \
iso-4217-currencies.scm \
iso-currencies-to-c \
- qofla-dir.h.in \
gncla-dir.h.in \
kvp_doc.txt \
SX-book-p.h \
- ${qof_library} \
- ${qof_headers} \
${gncmod_DATA} \
${gncscm_DATA} \
${gwmod_DATA}
@@ -288,13 +187,12 @@
(gw:generate-wrapset \"gw-kvp\")"
BUILT_SOURCES = \
- ${qof_builds} \
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
DISTCLEANFILES = gnucash g-wrapped .scm-links ${SCM_FILE_LINKS} \
- gw-engine.html gw-kvp.html qofla-dir.h gncla-dir.h
+ gw-engine.html gw-kvp.html gncla-dir.h
gncla-dir.h: gncla-dir.h.in
rm -f $@.tmp
More information about the gnucash-changes
mailing list