move QOF files to lib/libqof/

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@11917 57a11ea4-9604-0410-9ed3-97b8803252fd
zzzoldfeatures/register-rewrite
Neil Williams 21 years ago
parent 27e56cf337
commit 466781acef

@ -1,3 +1,96 @@
2005-11-13 Neil Williams <linux@codehelp.co.uk>
* configure.in : New locations of QOF files and
postgres fix to clean up CFLAGS
* lib/Makefile.am : New directory.
* src/engine/Makefile.am : Remove QOF build
* src/backend/Makefile.am : Remove QSF directory.
* src/backend/postgres/test/Makefile.am : Build tests
without linking against the GModule to retain portability.
* src/import-export/qif-import/test/Makefile.am : Adjusted
linkage due to library changes.
* src/gnome-utils/test/Makefile.am : Adjusted linkage
due to library changes.
Moving QSF to lib/libqof/backend/file
* src/backend/qsf/qsf-backend.c
* src/backend/qsf/pilot-qsf-GnuCashInvoice.xml
* src/backend/qsf/qsf-dir.h.in
* src/backend/qsf/qsf-map.xsd.xml
* src/backend/qsf/qsf-xml-map.c
* src/backend/qsf/qof-backend-qsf.h
* src/backend/qsf/qsf-xml.c
* src/backend/qsf/Makefile.am
* src/backend/qsf/qsf-object.xsd.xml
* src/backend/qsf/qsf-xml.h :
Moving QOF to lib/libqof/qof/
* src/engine/qofbook-p.h
* src/engine/gnc-trace.c
* src/engine/qofquery-deserial.h
* src/engine/gnc-trace.h
* src/engine/gnc-date.c
* src/engine/qofquerycore-p.h
* src/engine/gnc-date.h
* src/engine/qofquery-serialize.c
* src/engine/qofid.c
* src/engine/qofquery-serialize.h
* src/engine/qofid.h
* src/engine/gnc-engine-util.c
* src/engine/gnc-event.c
* src/engine/qofgobj.c
* src/engine/gnc-engine-util.h
* src/engine/gnc-event.h
* src/engine/qofgobj.h
* src/engine/qofbook.c
* src/engine/qofchoice.c
* src/engine/qofbook.h
* src/engine/qofchoice.h
* src/engine/kvp_frame.c
* src/engine/qofquery.c
* src/engine/kvp_frame.h
* src/engine/qofquery.h
* src/engine/qofquerycore.c
* src/engine/qofquerycore.h
* src/engine/qofsession.c
* src/engine/qofsession-p.h
* src/engine/qofsession.h
* src/engine/qofid-p.h
* src/engine/qofsql.c
* src/engine/gnc-numeric.c
* src/engine/qofsql.h
* src/engine/gnc-numeric.h
* src/engine/kvp-util-p.h
* src/engine/qofclass-p.h
* src/engine/qof_book_merge.c
* src/engine/qof_book_merge.h
* src/engine/gnc-event-p.h
* src/engine/qofla-dir.h.in
* src/engine/qof.h
* src/engine/qofinstance.c
* src/engine/qofinstance.h
* src/engine/qofmath128.c
* src/engine/qofmath128.h
* src/engine/qofobject-p.h
* src/engine/Makefile.am
* src/engine/qofbackend.c
* src/engine/qofbackend-p.h
* src/engine/qofbackend.h
* src/engine/qofinstance-p.h
* src/engine/qofquery-p.h
* src/engine/md5.c
* src/engine/md5.h
* src/engine/kvp-util.c
* src/engine/qofclass.c
* src/engine/qof-be-utils.h
* src/engine/qofobject.c
* src/engine/kvp-util.h
* src/engine/qofclass.h
* src/engine/qofobject.h
* src/engine/guid.c
* src/engine/guid.h
* src/engine/qofquery-deserial.c :
2005-11-12 Christian Stimming <stimming@tuhh.de>
* src/*/*.glade: String improvements: Fix typos, remove

@ -415,11 +415,13 @@ else
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)
@ -437,6 +439,7 @@ AC_SUBST(QOF_LIBS)
AS_SCRUB_INCLUDE(QOF_PREFIX)
AC_SUBST(QOF_PREFIX)
AC_SUBST(QOF_LIB_DIR)
AC_SUBST(QOF_XML_DIR)
### --------------------------------------------------------------------------
### for GOG/goffice...
@ -545,7 +548,6 @@ fi
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}'
@ -555,7 +557,6 @@ AC_SUBST(GNC_ACCOUNTS_DIR)
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)
@ -609,8 +610,9 @@ AC_ARG_ENABLE( sql,
fi
AS_SCRUB_INCLUDE(PGSQL_CFLAGS)
# XXX Fixme: CPPFLAGS are saved but CFLAGS are altered later on and not restored.
saved_CPPFLAGS="${CPPFLAGS}"
saved_CFLAGS="${CFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PGSQL_CFLAGS}"
AC_CHECK_HEADERS(pgsql/libpq-fe.h postgresql/libpq-fe.h libpq-fe.h)
if test "x$ac_cv_header_pgsql_libpq_fe_h$ac_cv_header_postgresql_libpq_fe_h$ac_cv_header_libpq_fe_h" = xnonono; then
@ -661,6 +663,7 @@ AC_ARG_ENABLE( sql,
LIBS="$saved_LIBS"
fi
CPPFLAGS="$saved_CPPFLAGS"
CFLAGS="$saved_CFLAGS"
fi
]
)
@ -1284,6 +1287,10 @@ AC_CONFIG_FILES(po/Makefile.in
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
@ -1294,7 +1301,6 @@ AC_CONFIG_FILES(po/Makefile.in
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

@ -1,7 +1,16 @@
if USE_LIBGOFFICE
SUBDIRS = libc glib26 guile-www srfi
if USE_LIBGOFFICE
SUBDIRS +=
else
SUBDIRS = libc glib26 guile-www srfi goffice
SUBDIRS += goffice
endif
if USE_LIBQOF
SUBDIRS += libqof
else
SUBDIRS +=
endif
EXTRA_DIST = README guppi-legend.patch

@ -0,0 +1,2 @@
SUBDIRS = . qof backend

@ -0,0 +1,2 @@
SUBDIRS = file

@ -0,0 +1,43 @@
SUBDIRS = .
lib_LTLIBRARIES = libqof-backend-qsf.la
AM_CFLAGS = \
-I.. -I../.. \
-DLOCALE_DIR=\""$(datadir)/locale"\" \
${QOF_CFLAGS} \
${LIBXML2_CFLAGS} \
${GLIB_CFLAGS}
libqof_backend_qsf_la_SOURCES = \
qsf-backend.c \
qsf-xml-map.c \
qsf-xml.c
LIBADD = \
${QOF_LIBS} \
${GLIB_LIBS} \
${LIBXML2_LIBS}
qsfschemadir = $(QOF_XML_DIR)
qsfschema_DATA = \
qsf-object.xsd.xml \
qsf-map.xsd.xml \
pilot-qsf-GnuCashInvoice.xml
EXTRA_DIST = \
$(qsfschema_DATA) \
qsf-dir.h.in \
qof-backend-qsf.h \
qsf-xml.h
qsf-dir.h: qsf-dir.h.in
rm -f $@.tmp
sed < $< > $@.tmp \
-e 's:@-QSF_SCHEMA_DIR-@:${QOF_XML_DIR}:g'
mv $@.tmp $@
BUILT_SOURCES = qsf-dir.h
CONFIG_CLEAN_FILES = qsf-dir.h

@ -0,0 +1,89 @@
lib_LTLIBRARIES = libqof.la
libqof_la_LDFLAGS= -version-info $(LIBQOF_LIBRARY_VERSION)
AM_CFLAGS = \
-I. \
${GLIB_CFLAGS}
libqof_la_SOURCES = \
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
qofincludedir = ${pkgincludedir}
qofinclude_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 \
qofgobj.h \
qofid.h \
qofid-p.h \
qofinstance-p.h \
qofinstance.h \
qofquery.h \
qofbook.h \
qofobject.h \
qofquerycore.h \
qofsession.h \
qofla-dir.h \
qof_book_merge.h
noinst_HEADERS = \
gnc-event-p.h \
md5.h \
qofclass-p.h \
qofmath128.h \
qofquery-p.h \
qofquery-deserial.h \
qofquery-serialize.h \
qofbook-p.h \
qofobject-p.h \
qofquerycore-p.h \
qofsession-p.h
QOFLIBdir = $(libdir)
EXTRA_DIST = \
qofla-dir.h.in \
qofmath128.c
qofla-dir.h: qofla-dir.h.in
rm -f $@.tmp
sed < $< > $@.tmp \
-e 's:@-libdir-@:${QOFLIBdir}:g'
mv $@.tmp $@
BUILT_SOURCES = qofla-dir.h

@ -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

@ -29,8 +29,42 @@ LDADD = ${top_builddir}/src/test-core/libgncmod-test.la \
${top_builddir}/src/engine/libgw-engine.la \
${top_builddir}/src/engine/libgw-kvp.la \
${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
${top_builddir}/src/backend/postgres/libgnc-backend-postgres.la \
-lltdl
-lltdl \
-lpq
test_db_SOURCES = \
${top_srcdir}/src/backend/postgres/PostgresBackend.c \
${top_srcdir}/src/backend/postgres/account.c \
${top_srcdir}/src/backend/postgres/book.c \
${top_srcdir}/src/backend/postgres/builder.c \
${top_srcdir}/src/backend/postgres/checkpoint.c \
${top_srcdir}/src/backend/postgres/escape.c \
${top_srcdir}/src/backend/postgres/events.c \
${top_srcdir}/src/backend/postgres/gncquery.c \
${top_srcdir}/src/backend/postgres/kvp-sql.c \
${top_srcdir}/src/backend/postgres/price.c \
${top_srcdir}/src/backend/postgres/txn.c \
${top_srcdir}/src/backend/postgres/txnmass.c \
${top_srcdir}/src/backend/postgres/upgrade.c \
${top_srcdir}/src/backend/postgres/putil.c \
test-db.c
test_escape_SOURCES = \
${top_srcdir}/src/backend/postgres/PostgresBackend.c \
${top_srcdir}/src/backend/postgres/account.c \
${top_srcdir}/src/backend/postgres/book.c \
${top_srcdir}/src/backend/postgres/builder.c \
${top_srcdir}/src/backend/postgres/checkpoint.c \
${top_srcdir}/src/backend/postgres/escape.c \
${top_srcdir}/src/backend/postgres/events.c \
${top_srcdir}/src/backend/postgres/gncquery.c \
${top_srcdir}/src/backend/postgres/kvp-sql.c \
${top_srcdir}/src/backend/postgres/price.c \
${top_srcdir}/src/backend/postgres/txn.c \
${top_srcdir}/src/backend/postgres/txnmass.c \
${top_srcdir}/src/backend/postgres/upgrade.c \
${top_srcdir}/src/backend/postgres/putil.c \
test-escape.c
AM_CFLAGS = \
-I${top_srcdir}/src \

@ -35,8 +35,10 @@ int main (int argc, char ** argv)
{
qof_init();
cashobjects_register();
/* the test needs to run locally in case make install
* has not yet been run. Use GNC_LIBDIR usually. */
do_test(
qof_load_backend_library (QOF_LIB_DIR, PG_LIB_NAME, PG_LIB_INIT),
qof_load_backend_library ("../", PG_LIB_NAME, PG_LIB_INIT),
" loading gnc-backend-postgres GModule failed");
print_test_results();
qof_close();

@ -1,43 +0,0 @@
SUBDIRS = .
lib_LTLIBRARIES = libqof-backend-qsf.la
AM_CFLAGS = \
-I.. -I../.. \
-I${top_srcdir}/src/backend \
-I${top_srcdir}/src/engine \
-DLOCALE_DIR=\""$(datadir)/locale"\" \
-I${top_srcdir}/src/gnc-module \
${LIBXML2_CFLAGS} \
${GLIB_CFLAGS}
libqof_backend_qsf_la_SOURCES = \
qsf-backend.c \
qsf-xml-map.c \
qsf-xml.c
LIBADD = \
${GLIB_LIBS} \
${LIBXML2_LIBS}
qsfschemadir = $(QSF_SCHEMA_DIR)
qsfschema_DATA = \
qsf-object.xsd.xml \
qsf-map.xsd.xml \
pilot-qsf-GnuCashInvoice.xml
EXTRA_DIST = \
$(qsfschema_DATA) \
qsf-dir.h.in \
qof-backend-qsf.h \
qsf-xml.h
qsf-dir.h: qsf-dir.h.in
rm -f $@.tmp
sed < $< > $@.tmp \
-e 's:@-QSF_SCHEMA_DIR-@:${QSF_SCHEMA_DIR}:g'
mv $@.tmp $@
BUILT_SOURCES = qsf-dir.h
CONFIG_CLEAN_FILES = qsf-dir.h

@ -12,103 +12,6 @@ AM_CFLAGS = \
${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 @@ noinst_HEADERS = \
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 @@ EXTRA_DIST = \
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-kvp.scm gw-kvp.c gw-kvp.h: \
(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

@ -45,6 +45,7 @@ INCLUDES= \
test_gnc_recurrence_SOURCES=test-gnc-recurrence.c
test_gnc_recurrence_LDADD = ${GNOME_LIBS} \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la
test_gnc_dialog_LDADD = ${GNOME_LIBS} \

@ -7,6 +7,7 @@ test_link_SOURCES = \
test_link_LDADD=../libgncmod-qif-import.la \
${top_builddir}/src/gnome/libgncgnome.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${LIBXML2_LIBS}

Loading…
Cancel
Save