[Gnucash-changes] r11885 - gnucash/trunk - reverting lib/libqof
changes to prepare for svn move
Neil Williams
codehelp at cvs.gnucash.org
Mon Nov 7 13:23:48 EST 2005
Author: codehelp
Date: 2005-11-07 13:23:46 -0500 (Mon, 07 Nov 2005)
New Revision: 11885
Added:
gnucash/trunk/src/backend/qsf/
gnucash/trunk/src/engine/gnc-date.c
gnucash/trunk/src/engine/gnc-date.h
gnucash/trunk/src/engine/gnc-engine-util.c
gnucash/trunk/src/engine/gnc-engine-util.h
gnucash/trunk/src/engine/gnc-event-p.h
gnucash/trunk/src/engine/gnc-event.c
gnucash/trunk/src/engine/gnc-event.h
gnucash/trunk/src/engine/gnc-trace.c
gnucash/trunk/src/engine/gnc-trace.h
gnucash/trunk/src/engine/guid.c
gnucash/trunk/src/engine/guid.h
gnucash/trunk/src/engine/kvp-util-p.h
gnucash/trunk/src/engine/kvp-util.c
gnucash/trunk/src/engine/kvp-util.h
gnucash/trunk/src/engine/kvp_frame.c
gnucash/trunk/src/engine/kvp_frame.h
gnucash/trunk/src/engine/md5.c
gnucash/trunk/src/engine/md5.h
gnucash/trunk/src/engine/qof-be-utils.h
gnucash/trunk/src/engine/qof.h
gnucash/trunk/src/engine/qof_book_merge.c
gnucash/trunk/src/engine/qof_book_merge.h
gnucash/trunk/src/engine/qofbackend-p.h
gnucash/trunk/src/engine/qofbackend.c
gnucash/trunk/src/engine/qofbackend.h
gnucash/trunk/src/engine/qofbook-p.h
gnucash/trunk/src/engine/qofbook.c
gnucash/trunk/src/engine/qofbook.h
gnucash/trunk/src/engine/qofchoice.c
gnucash/trunk/src/engine/qofchoice.h
gnucash/trunk/src/engine/qofclass-p.h
gnucash/trunk/src/engine/qofclass.c
gnucash/trunk/src/engine/qofclass.h
gnucash/trunk/src/engine/qofgobj.c
gnucash/trunk/src/engine/qofgobj.h
gnucash/trunk/src/engine/qofid-p.h
gnucash/trunk/src/engine/qofid.c
gnucash/trunk/src/engine/qofid.h
gnucash/trunk/src/engine/qofinstance-p.h
gnucash/trunk/src/engine/qofinstance.c
gnucash/trunk/src/engine/qofinstance.h
gnucash/trunk/src/engine/qofla-dir.h.in
gnucash/trunk/src/engine/qofmath128.c
gnucash/trunk/src/engine/qofmath128.h
gnucash/trunk/src/engine/qofobject-p.h
gnucash/trunk/src/engine/qofobject.c
gnucash/trunk/src/engine/qofobject.h
gnucash/trunk/src/engine/qofquery-deserial.c
gnucash/trunk/src/engine/qofquery-deserial.h
gnucash/trunk/src/engine/qofquery-p.h
gnucash/trunk/src/engine/qofquery-serialize.c
gnucash/trunk/src/engine/qofquery-serialize.h
gnucash/trunk/src/engine/qofquery.c
gnucash/trunk/src/engine/qofquery.h
gnucash/trunk/src/engine/qofquerycore-p.h
gnucash/trunk/src/engine/qofquerycore.c
gnucash/trunk/src/engine/qofquerycore.h
gnucash/trunk/src/engine/qofsession-p.h
gnucash/trunk/src/engine/qofsession.c
gnucash/trunk/src/engine/qofsession.h
gnucash/trunk/src/engine/qofsql.c
gnucash/trunk/src/engine/qofsql.h
Removed:
gnucash/trunk/lib/libqof/
Modified:
gnucash/trunk/ChangeLog
gnucash/trunk/configure.in
gnucash/trunk/lib/Makefile.am
gnucash/trunk/src/backend/Makefile.am
gnucash/trunk/src/engine/Makefile.am
Log:
reverting lib/libqof changes to prepare for svn move
Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog 2005-11-07 16:06:19 UTC (rev 11884)
+++ gnucash/trunk/ChangeLog 2005-11-07 18:23:46 UTC (rev 11885)
@@ -1,13 +1,5 @@
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 16:06:19 UTC (rev 11884)
+++ gnucash/trunk/configure.in 2005-11-07 18:23:46 UTC (rev 11885)
@@ -417,13 +417,11 @@
fi
if test x$QOF_XML_DIR = x; then
AC_MSG_RESULT([no, will use internal QOF code])
- 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_CFLAGS="-I\${top_srcdir}/src/engine"
+ QOF_LIBS="\${top_srcdir}/src/engine/libqof.la"
+ QOF_LIB_DIR="${libdir}"
QOF_PREFIX="internal"
- QOF_XML_DIR=`eval echo ${datadir}/xml/qsf`
+ QOF_XML_DIR="$QSF_SCHEMA_DIR"
LIBQOF_LIBRARY_VERSION=1:1:0
LIBQOF_BACKEND_QSF_LIBRARY_VERSION=0:0:0
AC_SUBST(LIBQOF_LIBRARY_VERSION)
@@ -441,7 +439,6 @@
AS_SCRUB_INCLUDE(QOF_PREFIX)
AC_SUBST(QOF_PREFIX)
AC_SUBST(QOF_LIB_DIR)
-AC_SUBST(QOF_XML_DIR)
### --------------------------------------------------------------------------
### for GOG/goffice...
@@ -550,6 +547,7 @@
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}'
@@ -559,6 +557,7 @@
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)
@@ -1287,10 +1286,6 @@
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
@@ -1301,6 +1296,7 @@
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/lib/Makefile.am
===================================================================
--- gnucash/trunk/lib/Makefile.am 2005-11-07 16:06:19 UTC (rev 11884)
+++ gnucash/trunk/lib/Makefile.am 2005-11-07 18:23:46 UTC (rev 11885)
@@ -1,15 +1,7 @@
-SUBDIRS = libc glib26 guile-www srfi
-
if USE_LIBGOFFICE
-SUBDIRS +=
+SUBDIRS = libc glib26 guile-www srfi
else
-SUBDIRS += goffice
+SUBDIRS = libc glib26 guile-www srfi goffice
endif
-if USE_LIBQOF
-SUBDIRS += libqof
-else
-SUBDIRS +=
-endif
-
EXTRA_DIST = README guppi-legend.patch
Modified: gnucash/trunk/src/backend/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/Makefile.am 2005-11-07 16:06:19 UTC (rev 11884)
+++ gnucash/trunk/src/backend/Makefile.am 2005-11-07 18:23:46 UTC (rev 11885)
@@ -1,5 +1,10 @@
+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 = file net postgres rpc
+DIST_SUBDIRS = qsf file net postgres rpc
+endif
noinst_HEADERS = gnc-backend-api.h
Copied: gnucash/trunk/src/backend/qsf (from rev 11877, gnucash/trunk/src/backend/qsf)
Property changes on: gnucash/trunk/src/backend/qsf
___________________________________________________________________
Name: svn:ignore
+ Makefile
.deps
.libs
Makefile.in
*.lo
*.la
qsf-dir.h
.DS_Store
Modified: gnucash/trunk/src/engine/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/Makefile.am 2005-11-07 16:06:19 UTC (rev 11884)
+++ gnucash/trunk/src/engine/Makefile.am 2005-11-07 18:23:46 UTC (rev 11885)
@@ -12,6 +12,103 @@
${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 \
@@ -99,7 +196,8 @@
gnc-pricedb-p.h \
gw-engine.h \
gw-kvp.h \
- policy-p.h
+ policy-p.h \
+ ${qof_noinst_headers}
noinst_SCRIPTS = iso-currencies-to-c
@@ -141,9 +239,12 @@
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}
@@ -187,12 +288,13 @@
(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 gncla-dir.h
+ gw-engine.html gw-kvp.html qofla-dir.h gncla-dir.h
gncla-dir.h: gncla-dir.h.in
rm -f $@.tmp
Copied: gnucash/trunk/src/engine/gnc-date.c (from rev 11877, gnucash/trunk/src/engine/gnc-date.c)
Copied: gnucash/trunk/src/engine/gnc-date.h (from rev 11877, gnucash/trunk/src/engine/gnc-date.h)
Copied: gnucash/trunk/src/engine/gnc-engine-util.c (from rev 11877, gnucash/trunk/src/engine/gnc-engine-util.c)
Copied: gnucash/trunk/src/engine/gnc-engine-util.h (from rev 11877, gnucash/trunk/src/engine/gnc-engine-util.h)
Copied: gnucash/trunk/src/engine/gnc-event-p.h (from rev 11877, gnucash/trunk/src/engine/gnc-event-p.h)
Copied: gnucash/trunk/src/engine/gnc-event.c (from rev 11877, gnucash/trunk/src/engine/gnc-event.c)
Copied: gnucash/trunk/src/engine/gnc-event.h (from rev 11877, gnucash/trunk/src/engine/gnc-event.h)
Copied: gnucash/trunk/src/engine/gnc-trace.c (from rev 11877, gnucash/trunk/src/engine/gnc-trace.c)
Copied: gnucash/trunk/src/engine/gnc-trace.h (from rev 11877, gnucash/trunk/src/engine/gnc-trace.h)
Copied: gnucash/trunk/src/engine/guid.c (from rev 11877, gnucash/trunk/src/engine/guid.c)
Copied: gnucash/trunk/src/engine/guid.h (from rev 11877, gnucash/trunk/src/engine/guid.h)
Copied: gnucash/trunk/src/engine/kvp-util-p.h (from rev 11877, gnucash/trunk/src/engine/kvp-util-p.h)
Copied: gnucash/trunk/src/engine/kvp-util.c (from rev 11877, gnucash/trunk/src/engine/kvp-util.c)
Copied: gnucash/trunk/src/engine/kvp-util.h (from rev 11877, gnucash/trunk/src/engine/kvp-util.h)
Copied: gnucash/trunk/src/engine/kvp_frame.c (from rev 11877, gnucash/trunk/src/engine/kvp_frame.c)
Copied: gnucash/trunk/src/engine/kvp_frame.h (from rev 11877, gnucash/trunk/src/engine/kvp_frame.h)
Copied: gnucash/trunk/src/engine/md5.c (from rev 11877, gnucash/trunk/src/engine/md5.c)
Copied: gnucash/trunk/src/engine/md5.h (from rev 11877, gnucash/trunk/src/engine/md5.h)
Copied: gnucash/trunk/src/engine/qof-be-utils.h (from rev 11877, gnucash/trunk/src/engine/qof-be-utils.h)
Copied: gnucash/trunk/src/engine/qof.h (from rev 11877, gnucash/trunk/src/engine/qof.h)
Copied: gnucash/trunk/src/engine/qof_book_merge.c (from rev 11877, gnucash/trunk/src/engine/qof_book_merge.c)
Copied: gnucash/trunk/src/engine/qof_book_merge.h (from rev 11877, gnucash/trunk/src/engine/qof_book_merge.h)
Copied: gnucash/trunk/src/engine/qofbackend-p.h (from rev 11877, gnucash/trunk/src/engine/qofbackend-p.h)
Copied: gnucash/trunk/src/engine/qofbackend.c (from rev 11877, gnucash/trunk/src/engine/qofbackend.c)
Copied: gnucash/trunk/src/engine/qofbackend.h (from rev 11877, gnucash/trunk/src/engine/qofbackend.h)
Copied: gnucash/trunk/src/engine/qofbook-p.h (from rev 11877, gnucash/trunk/src/engine/qofbook-p.h)
Copied: gnucash/trunk/src/engine/qofbook.c (from rev 11877, gnucash/trunk/src/engine/qofbook.c)
Copied: gnucash/trunk/src/engine/qofbook.h (from rev 11877, gnucash/trunk/src/engine/qofbook.h)
Copied: gnucash/trunk/src/engine/qofchoice.c (from rev 11877, gnucash/trunk/src/engine/qofchoice.c)
Copied: gnucash/trunk/src/engine/qofchoice.h (from rev 11877, gnucash/trunk/src/engine/qofchoice.h)
Copied: gnucash/trunk/src/engine/qofclass-p.h (from rev 11877, gnucash/trunk/src/engine/qofclass-p.h)
Copied: gnucash/trunk/src/engine/qofclass.c (from rev 11877, gnucash/trunk/src/engine/qofclass.c)
Copied: gnucash/trunk/src/engine/qofclass.h (from rev 11877, gnucash/trunk/src/engine/qofclass.h)
Copied: gnucash/trunk/src/engine/qofgobj.c (from rev 11877, gnucash/trunk/src/engine/qofgobj.c)
Copied: gnucash/trunk/src/engine/qofgobj.h (from rev 11877, gnucash/trunk/src/engine/qofgobj.h)
Copied: gnucash/trunk/src/engine/qofid-p.h (from rev 11877, gnucash/trunk/src/engine/qofid-p.h)
Copied: gnucash/trunk/src/engine/qofid.c (from rev 11877, gnucash/trunk/src/engine/qofid.c)
Copied: gnucash/trunk/src/engine/qofid.h (from rev 11877, gnucash/trunk/src/engine/qofid.h)
Copied: gnucash/trunk/src/engine/qofinstance-p.h (from rev 11877, gnucash/trunk/src/engine/qofinstance-p.h)
Copied: gnucash/trunk/src/engine/qofinstance.c (from rev 11877, gnucash/trunk/src/engine/qofinstance.c)
Copied: gnucash/trunk/src/engine/qofinstance.h (from rev 11877, gnucash/trunk/src/engine/qofinstance.h)
Copied: gnucash/trunk/src/engine/qofla-dir.h.in (from rev 11877, gnucash/trunk/src/engine/qofla-dir.h.in)
Copied: gnucash/trunk/src/engine/qofmath128.c (from rev 11877, gnucash/trunk/src/engine/qofmath128.c)
Copied: gnucash/trunk/src/engine/qofmath128.h (from rev 11877, gnucash/trunk/src/engine/qofmath128.h)
Copied: gnucash/trunk/src/engine/qofobject-p.h (from rev 11877, gnucash/trunk/src/engine/qofobject-p.h)
Copied: gnucash/trunk/src/engine/qofobject.c (from rev 11877, gnucash/trunk/src/engine/qofobject.c)
Copied: gnucash/trunk/src/engine/qofobject.h (from rev 11877, gnucash/trunk/src/engine/qofobject.h)
Copied: gnucash/trunk/src/engine/qofquery-deserial.c (from rev 11877, gnucash/trunk/src/engine/qofquery-deserial.c)
Copied: gnucash/trunk/src/engine/qofquery-deserial.h (from rev 11877, gnucash/trunk/src/engine/qofquery-deserial.h)
Copied: gnucash/trunk/src/engine/qofquery-p.h (from rev 11877, gnucash/trunk/src/engine/qofquery-p.h)
Copied: gnucash/trunk/src/engine/qofquery-serialize.c (from rev 11877, gnucash/trunk/src/engine/qofquery-serialize.c)
Copied: gnucash/trunk/src/engine/qofquery-serialize.h (from rev 11877, gnucash/trunk/src/engine/qofquery-serialize.h)
Copied: gnucash/trunk/src/engine/qofquery.c (from rev 11877, gnucash/trunk/src/engine/qofquery.c)
Copied: gnucash/trunk/src/engine/qofquery.h (from rev 11877, gnucash/trunk/src/engine/qofquery.h)
Copied: gnucash/trunk/src/engine/qofquerycore-p.h (from rev 11877, gnucash/trunk/src/engine/qofquerycore-p.h)
Copied: gnucash/trunk/src/engine/qofquerycore.c (from rev 11877, gnucash/trunk/src/engine/qofquerycore.c)
Copied: gnucash/trunk/src/engine/qofquerycore.h (from rev 11877, gnucash/trunk/src/engine/qofquerycore.h)
Copied: gnucash/trunk/src/engine/qofsession-p.h (from rev 11877, gnucash/trunk/src/engine/qofsession-p.h)
Copied: gnucash/trunk/src/engine/qofsession.c (from rev 11877, gnucash/trunk/src/engine/qofsession.c)
Copied: gnucash/trunk/src/engine/qofsession.h (from rev 11877, gnucash/trunk/src/engine/qofsession.h)
Copied: gnucash/trunk/src/engine/qofsql.c (from rev 11877, gnucash/trunk/src/engine/qofsql.c)
Copied: gnucash/trunk/src/engine/qofsql.h (from rev 11877, gnucash/trunk/src/engine/qofsql.h)
More information about the gnucash-changes
mailing list