From dcdc943f3adb8134b86476eb7f9d7342c7d6b761 Mon Sep 17 00:00:00 2001 From: Phil Longstaff Date: Sun, 12 Apr 2009 17:14:21 +0000 Subject: [PATCH] 1) Remove obsolete xxx-backend-file files (now are backend-xml) 2) Fix 'make check', 'make dist' and 'make distcheck' problems Make distcheck now passes git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18045 57a11ea4-9604-0410-9ed3-97b8803252fd --- configure.in | 4 - make-gnucash-potfiles.in | 4 +- po/POTFILES.in | 105 +++++++++------- po/POTFILES.skip | 23 +++- src/backend/Makefile.am | 2 +- src/backend/dbi/Makefile.am | 4 +- src/backend/xml/Makefile.am | 7 +- .../{gnc-backend-file.c => gnc-backend-xml.c} | 6 +- .../{gnc-backend-file.h => gnc-backend-xml.h} | 4 +- src/backend/xml/gncmod-backend-file.c | 65 ---------- src/backend/xml/gncmod-backend-xml.c | 2 +- src/backend/xml/io-gncxml-v2.h | 2 +- src/backend/xml/test/test-load-xml2.c | 2 +- .../xml/gncmod-business-backend-file.c | 112 ------------------ src/gnome-utils/druid-gnc-xml-import.c | 2 +- src/html/Makefile.am | 12 +- 16 files changed, 109 insertions(+), 247 deletions(-) rename src/backend/xml/{gnc-backend-file.c => gnc-backend-xml.c} (99%) rename src/backend/xml/{gnc-backend-file.h => gnc-backend-xml.h} (96%) delete mode 100644 src/backend/xml/gncmod-backend-file.c delete mode 100644 src/business/business-core/xml/gncmod-business-backend-file.c diff --git a/configure.in b/configure.in index e0f4d3e8cc..2cb829250c 100644 --- a/configure.in +++ b/configure.in @@ -1498,8 +1498,6 @@ AC_CONFIG_FILES(po/Makefile.in src/backend/xml/test/Makefile src/backend/xml/test/test-files/Makefile src/backend/xml/test/test-files/xml2/Makefile - src/backend/postgres/Makefile - src/backend/postgres/test/Makefile src/backend/sql/Makefile src/backend/sql/test/Makefile src/bin/Makefile @@ -1557,8 +1555,6 @@ AC_CONFIG_FILES(po/Makefile.in src/libqof/backend/Makefile src/libqof/backend/file/Makefile src/optional/Makefile - src/optional/python-bindings/Makefile - src/optional/python-bindings/tests/Makefile src/optional/xsl/Makefile src/pixmaps/Makefile src/quotes/Makefile diff --git a/make-gnucash-potfiles.in b/make-gnucash-potfiles.in index ae6161f94e..8a9995a3fa 100644 --- a/make-gnucash-potfiles.in +++ b/make-gnucash-potfiles.in @@ -50,7 +50,7 @@ foreach my $file (@possible_files) { } # These are also added, even though they are outside of src/ -print "lib/libqof/backend/file/qsf-backend.c\n"; -print "lib/libqof/qof/gnc-date.c\n"; +print "src/libqof/backend/file/qsf-backend.c\n"; +print "src/libqof/qof/gnc-date.c\n"; print "intl-scm/guile-strings.c\n"; print "doc/tip_of_the_day.list.in\n" diff --git a/po/POTFILES.in b/po/POTFILES.in index 87fc6f4e06..61f5326c2a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -24,15 +24,24 @@ src/app-utils/gnc-ui-util.c src/app-utils/guile-util.c src/app-utils/option-util.c src/backend/dbi/gnc-backend-dbi.c -src/backend/dbi/gncmod-backend-dbi.c +src/backend/sql/gnc-account-sql.c +src/backend/sql/gnc-backend-sql.c +src/backend/sql/gnc-book-sql.c +src/backend/sql/gnc-budget-sql.c +src/backend/sql/gnc-commodity-sql.c +src/backend/sql/gnc-lots-sql.c +src/backend/sql/gnc-price-sql.c +src/backend/sql/gnc-recurrence-sql.c +src/backend/sql/gnc-schedxaction-sql.c +src/backend/sql/gnc-slots-sql.c +src/backend/sql/gnc-transaction-sql.c src/backend/xml/gnc-account-xml-v2.c -src/backend/xml/gnc-backend-file.c +src/backend/xml/gnc-backend-xml.c src/backend/xml/gnc-book-xml-v2.c src/backend/xml/gnc-budget-xml-v2.c src/backend/xml/gnc-commodity-xml-v2.c src/backend/xml/gnc-freqspec-xml-v2.c src/backend/xml/gnc-lot-xml-v2.c -src/backend/xml/gncmod-backend-xml.c src/backend/xml/gnc-pricedb-xml-v2.c src/backend/xml/gnc-recurrence-xml-v2.c src/backend/xml/gnc-schedxaction-xml-v2.c @@ -48,46 +57,7 @@ src/backend/xml/sixtp-dom-parsers.c src/backend/xml/sixtp-stack.c src/backend/xml/sixtp-to-dom-parser.c src/backend/xml/sixtp-utils.c -src/backend/postgres/account.c -src/backend/postgres/book.c -src/backend/postgres/builder.c -src/backend/postgres/checkpoint.c -src/backend/postgres/demo.c -src/backend/postgres/escape.c -src/backend/postgres/events.c -src/backend/postgres/gncquery.c -src/backend/postgres/kvp-sql.c -src/backend/postgres/PostgresBackend.c -src/backend/postgres/price.c -src/backend/postgres/putil.c -src/backend/postgres/txn.c -src/backend/postgres/txnmass.c -src/backend/postgres/upgrade.c -src/backend/sql/gnc-account-sql.c -src/backend/sql/gnc-backend-sql.c -src/backend/sql/gnc-book-sql.c -src/backend/sql/gnc-budget-sql.c -src/backend/sql/gnc-commodity-sql.c -src/backend/sql/gnc-lots-sql.c -src/backend/sql/gnc-price-sql.c -src/backend/sql/gnc-recurrence-sql.c -src/backend/sql/gnc-schedxaction-sql.c -src/backend/sql/gnc-slots-sql.c -src/backend/sql/gnc-transaction-sql.c src/bin/gnucash-bin.c -src/business/business-core/xml/gnc-address-xml-v2.c -src/business/business-core/xml/gnc-bill-term-xml-v2.c -src/business/business-core/xml/gnc-customer-xml-v2.c -src/business/business-core/xml/gnc-employee-xml-v2.c -src/business/business-core/xml/gnc-entry-xml-v2.c -src/business/business-core/xml/gnc-invoice-xml-v2.c -src/business/business-core/xml/gnc-job-xml-v2.c -src/business/business-core/xml/gncmod-business-backend-file.c -src/business/business-core/xml/gncmod-business-backend-xml.c -src/business/business-core/xml/gnc-order-xml-v2.c -src/business/business-core/xml/gnc-owner-xml-v2.c -src/business/business-core/xml/gnc-tax-table-xml-v2.c -src/business/business-core/xml/gnc-vendor-xml-v2.c src/business/business-core/gncAddress.c src/business/business-core/gncBillTerm.c src/business/business-core/gncBusGuile.c @@ -114,6 +84,18 @@ src/business/business-core/sql/gnc-order-sql.c src/business/business-core/sql/gnc-owner-sql.c src/business/business-core/sql/gnc-tax-table-sql.c src/business/business-core/sql/gnc-vendor-sql.c +src/business/business-core/xml/gnc-address-xml-v2.c +src/business/business-core/xml/gnc-bill-term-xml-v2.c +src/business/business-core/xml/gnc-customer-xml-v2.c +src/business/business-core/xml/gnc-employee-xml-v2.c +src/business/business-core/xml/gnc-entry-xml-v2.c +src/business/business-core/xml/gnc-invoice-xml-v2.c +src/business/business-core/xml/gnc-job-xml-v2.c +src/business/business-core/xml/gncmod-business-backend-xml.c +src/business/business-core/xml/gnc-order-xml-v2.c +src/business/business-core/xml/gnc-owner-xml-v2.c +src/business/business-core/xml/gnc-tax-table-xml-v2.c +src/business/business-core/xml/gnc-vendor-xml-v2.c src/business/business-gnome/business-gnome-utils.c src/business/business-gnome/business-options-gnome.c src/business/business-gnome/business-urls.c @@ -295,7 +277,6 @@ src/gnome-utils/druid-gnc-xml-import.c src/gnome-utils/druid-utils.c src/gnome-utils/glade/commodity.glade src/gnome-utils/glade/dialog-book-close.glade -src/gnome-utils/glade/dialog-database-connection.glade src/gnome-utils/glade/dialog-file-access.glade src/gnome-utils/glade/dialog-query-list.glade src/gnome-utils/glade/dialog-reset-warnings.glade @@ -330,9 +311,6 @@ src/gnome-utils/gnc-frequency.c src/gnome-utils/gnc-general-select.c src/gnome-utils/gnc-gnome-utils.c src/gnome-utils/gnc-gui-query.c -src/gnome-utils/gnc-html.c -src/gnome-utils/gnc-html-graph-gog.c -src/gnome-utils/gnc-html-history.c src/gnome-utils/gnc-icons.c src/gnome-utils/gnc-main-window.c src/gnome-utils/gnc-menu-extensions.c @@ -367,6 +345,15 @@ src/gnome-utils/schemas/apps_gnucash_history.schemas.in src/gnome-utils/search-param.c src/gnome-utils/window-main-summarybar.c src/gnome/window-reconcile.c +src/html/gnc-html.c +src/html/gnc-html-factory.c +src/html/gnc-html-graph-gog.c +src/html/gnc-html-graph-gog-gtkhtml.c +src/html/gnc-html-graph-gog-webkit.c +src/html/gnc-html-gtkhtml.c +src/html/gnc-html-history.c +src/html/gnc-html-webkit.c +src/html/gncmod-html.c src/import-export/aqbanking/aqbanking.glade src/import-export/aqbanking/dialog-ab-trans.c src/import-export/aqbanking/dialog-daterange.c @@ -441,6 +428,32 @@ src/import-export/qif/qif-context.c src/import-export/qif/qif-file.c src/import-export/qif/qif-objects.c src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in +src/libqof/backend/file/qsf-backend.c +src/libqof/backend/file/qsf-xml.c +src/libqof/backend/file/qsf-xml-map.c +src/libqof/qof/gnc-date.c +src/libqof/qof/gnc-numeric.c +src/libqof/qof/guid.c +src/libqof/qof/kvp_frame.c +src/libqof/qof/kvp-util.c +src/libqof/qof/md5.c +src/libqof/qof/qofbackend.c +src/libqof/qof/qofbook.c +src/libqof/qof/qofbookmerge.c +src/libqof/qof/qofchoice.c +src/libqof/qof/qofclass.c +src/libqof/qof/qofevent.c +src/libqof/qof/qofid.c +src/libqof/qof/qofinstance.c +src/libqof/qof/qoflog.c +src/libqof/qof/qofmath128.c +src/libqof/qof/qofobject.c +src/libqof/qof/qofquery.c +src/libqof/qof/qofquerycore.c +src/libqof/qof/qofreference.c +src/libqof/qof/qofsession.c +src/libqof/qof/qofutil.c +src/libqof/qof/qof-win32.c src/register/ledger-core/dialog-dup-trans.c src/register/ledger-core/gnc-ledger-display.c src/register/ledger-core/gncmod-ledger-core.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip index d65f52179a..e318592ae5 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -7,8 +7,29 @@ src/backend/dwi/qofmap.c src/gnome-utils/gnctreemodelsort.c src/gnome-utils/gtktreedatalist.c src/gnome-utils/gnc-tree-model-selection.c -src/backend/file/gncmod-backend-file.c +src/backend/dbi/gncmod-backend-dbi.c src/backend/file/io-gncbin-r.c +src/backend/xml/gncmod-backend-xml.c src/import-export/binary-import/binary-import.glade src/import-export/binary-import/druid-commodity.c src/import-export/binary-import/gncmod-binary-import.c +src/backend/postgres/PostgresBackend.c +src/backend/postgres/account.c +src/backend/postgres/book.c +src/backend/postgres/builder.c +src/backend/postgres/checkpoint.c +src/backend/postgres/demo.c +src/backend/postgres/escape.c +src/backend/postgres/events.c +src/backend/postgres/gncquery.c +src/backend/postgres/kvp-sql.c +src/backend/postgres/price.c +src/backend/postgres/putil.c +src/backend/postgres/txn.c +src/backend/postgres/txnmass.c +src/backend/postgres/upgrade.c +src/gnome-utils/glade/dialog-database-connection.glade +src/libqof/qof/qofgobj.c +src/libqof/qof/qofquery-deserial.c +src/libqof/qof/qofquery-serialize.c +src/libqof/qof/qofsql.c diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am index b0d9db6119..1a6ff313c4 100644 --- a/src/backend/Makefile.am +++ b/src/backend/Makefile.am @@ -1,3 +1,3 @@ SUBDIRS = xml sql ${DBI_DIR} -DIST_SUBDIRS = xml sql ${DBI_DIR} +DIST_SUBDIRS = xml sql dbi diff --git a/src/backend/dbi/Makefile.am b/src/backend/dbi/Makefile.am index 52e06ad1fb..6be8390d8a 100644 --- a/src/backend/dbi/Makefile.am +++ b/src/backend/dbi/Makefile.am @@ -10,8 +10,8 @@ AM_CFLAGS = \ -I${top_srcdir}/src/backend \ -I${top_srcdir}/src/backend/sql \ -I${top_srcdir}/src/engine \ - -I${top_srcdir}/src/core-utils\ - -I${top_srcdir}/lib/libc\ + -I${top_srcdir}/src/core-utils \ + -I${top_srcdir}/lib/libc \ -I${top_srcdir}/src/libqof/qof \ ${GLIB_CFLAGS} \ ${GCONF_CFLAGS} \ diff --git a/src/backend/xml/Makefile.am b/src/backend/xml/Makefile.am index 4680cf10fe..524464aff8 100644 --- a/src/backend/xml/Makefile.am +++ b/src/backend/xml/Makefile.am @@ -9,7 +9,8 @@ AM_CPPFLAGS = \ -DLOCALE_DIR=\""$(datadir)/locale"\" \ -I${top_srcdir}/src/backend \ -I${top_srcdir}/src/engine \ - -I${top_srcdir}/src/core-utils\ + -I${top_srcdir}/src/core-utils \ + -I${top_srcdir}/src/gnc-module \ -I${top_srcdir}/lib/libc\ -I${top_srcdir}/src/libqof/qof \ ${LIBXML2_CFLAGS} \ @@ -40,10 +41,10 @@ libgnc_backend_xml_utils_la_SOURCES = \ sixtp.c libgncmod_backend_xml_la_SOURCES = \ - gnc-backend-file.c + gnc-backend-xml.c noinst_HEADERS = \ - gnc-backend-file.h \ + gnc-backend-xml.h \ gnc-xml.h \ gnc-xml-helper.h \ io-example-account.h \ diff --git a/src/backend/xml/gnc-backend-file.c b/src/backend/xml/gnc-backend-xml.c similarity index 99% rename from src/backend/xml/gnc-backend-file.c rename to src/backend/xml/gnc-backend-xml.c index 6d516afd40..850de38eb6 100644 --- a/src/backend/xml/gnc-backend-file.c +++ b/src/backend/xml/gnc-backend-xml.c @@ -1,5 +1,5 @@ /******************************************************************** - * gnc-backend-file.c: load and save data to XML files * + * gnc-backend-xml.c: load and save data to XML files * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License as * @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 * * Boston, MA 02110-1301, USA gnu@gnu.org * \********************************************************************/ -/** @file gnc-backend-file.c +/** @file gnc-backend-xml.c * @brief load and save data to XML files * @author Copyright (c) 2000 Gnumatic Inc. * @author Copyright (c) 2002 Derek Atkins @@ -56,7 +56,7 @@ #include "io-gncxml.h" #include "io-gncxml-v2.h" -#include "gnc-backend-file.h" +#include "gnc-backend-xml.h" #include "gnc-gconf-utils.h" #ifndef HAVE_STRPTIME diff --git a/src/backend/xml/gnc-backend-file.h b/src/backend/xml/gnc-backend-xml.h similarity index 96% rename from src/backend/xml/gnc-backend-file.h rename to src/backend/xml/gnc-backend-xml.h index 2888c9ef32..f6e3393062 100644 --- a/src/backend/xml/gnc-backend-file.h +++ b/src/backend/xml/gnc-backend-xml.h @@ -1,5 +1,5 @@ /******************************************************************** - * gnc-backend-file.h: load and save data to XML files * + * gnc-backend-xml.h: load and save data to XML files * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License as * @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 * * Boston, MA 02110-1301, USA gnu@gnu.org * \********************************************************************/ -/** @file gnc-backend-file.h +/** @file gnc-backend-xml.h * @brief load and save data to files * @author Copyright (c) 2000 Gnumatic Inc. * @author Copyright (c) 2002 Derek Atkins diff --git a/src/backend/xml/gncmod-backend-file.c b/src/backend/xml/gncmod-backend-file.c deleted file mode 100644 index 57e592eaa7..0000000000 --- a/src/backend/xml/gncmod-backend-file.c +++ /dev/null @@ -1,65 +0,0 @@ -/********************************************************************* - * gncmod-file-backend.c - * module definition/initialization for the file backend module - * - * Copyright (c) 2001 Linux Developers Group, Inc. - *********************************************************************/ - -#include -#include -/* #include */ - -#include "gnc-module.h" -#include "gnc-module-api.h" - -GNC_MODULE_API_DECL(libgncmod_backend_file) - -/* version of the gnc module system interface we require */ -int libgnc_backend_file_utils_gnc_module_system_interface = 0; - -/* module versioning uses libtool semantics. */ -int libgncmod_backend_file_gnc_module_current = 0; -int libgncmod_backend_file_gnc_module_revision = 0; -int libgncmod_backend_file_gnc_module_age = 0; - -static GNCModule engine; - - -char * -libgncmod_backend_file_gnc_module_path(void) -{ - return g_strdup("gnucash/backend/file"); -} - -char * -libgncmod_backend_file_gnc_module_description(void) -{ - return g_strdup("The binary and XML (v1 and v2) backends for GnuCash"); -} - -int -libgncmod_backend_file_gnc_module_init(int refcount) -{ - engine = gnc_module_load("gnucash/engine", 0); - if(!engine) return FALSE; - - /* Need to initialize g-type engine for gconf */ - if (refcount == 0) - g_type_init(); - - return TRUE; -} - -int -libgncmod_backend_file_gnc_module_end(int refcount) -{ - int unload = TRUE; - - if (engine) - unload = libgnc_backend_file_utils_gnc_module_unload(engine); - - if (refcount == 0) - engine = NULL; - - return unload; -} diff --git a/src/backend/xml/gncmod-backend-xml.c b/src/backend/xml/gncmod-backend-xml.c index 57e592eaa7..fc684b3b72 100644 --- a/src/backend/xml/gncmod-backend-xml.c +++ b/src/backend/xml/gncmod-backend-xml.c @@ -1,5 +1,5 @@ /********************************************************************* - * gncmod-file-backend.c + * gncmod-backend-xml.c * module definition/initialization for the file backend module * * Copyright (c) 2001 Linux Developers Group, Inc. diff --git a/src/backend/xml/io-gncxml-v2.h b/src/backend/xml/io-gncxml-v2.h index 6eab8355fe..566a60244d 100644 --- a/src/backend/xml/io-gncxml-v2.h +++ b/src/backend/xml/io-gncxml-v2.h @@ -34,7 +34,7 @@ #include #include "gnc-engine.h" -#include "gnc-backend-file.h" +#include "gnc-backend-xml.h" #include "sixtp.h" diff --git a/src/backend/xml/test/test-load-xml2.c b/src/backend/xml/test/test-load-xml2.c index 1d8ce89a0e..c61f1a757a 100644 --- a/src/backend/xml/test/test-load-xml2.c +++ b/src/backend/xml/test/test-load-xml2.c @@ -40,7 +40,7 @@ #include "cashobjects.h" #include "TransLog.h" #include "gnc-engine.h" -#include "gnc-backend-file.h" +#include "gnc-backend-xml.h" #include "io-gncxml-v2.h" #include "test-stuff.h" diff --git a/src/business/business-core/xml/gncmod-business-backend-file.c b/src/business/business-core/xml/gncmod-business-backend-file.c deleted file mode 100644 index 765cb0b58f..0000000000 --- a/src/business/business-core/xml/gncmod-business-backend-file.c +++ /dev/null @@ -1,112 +0,0 @@ -/********************************************************************* - * gncmod-business-backend-file.c - * module definition/initialization for the file backend module - * - * Copyright (c) 2002 Derek Atkins - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, contact: - * - * Free Software Foundation Voice: +1-617-542-5942 - * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 - * Boston, MA 02110-1301, USA gnu@gnu.org - * - *********************************************************************/ - -#include "config.h" -#include - -#include "gnc-module.h" -#include "gnc-module-api.h" -#include "gnc-engine.h" -#include "io-gncxml-v2.h" - -#include "gnc-address-xml-v2.h" -#include "gnc-bill-term-xml-v2.h" -#include "gnc-customer-xml-v2.h" -#include "gnc-employee-xml-v2.h" -#include "gnc-entry-xml-v2.h" -#include "gnc-invoice-xml-v2.h" -#include "gnc-job-xml-v2.h" -#include "gnc-order-xml-v2.h" -#include "gnc-owner-xml-v2.h" -#include "gnc-tax-table-xml-v2.h" -#include "gnc-vendor-xml-v2.h" - -GNC_MODULE_API_DECL(libgncmod_business_backend_file) - -/* version of the gnc module system interface we require */ -int libgncmod_business_backend_file_gnc_module_system_interface = 0; - -/* module versioning uses libtool semantics. */ -int libgncmod_business_backend_file_gnc_module_current = 0; -int libgncmod_business_backend_file_gnc_module_revision = 0; -int libgncmod_business_backend_file_gnc_module_age = 0; - -static GNCModule bus_core; -static GNCModule file; - - -char * -libgncmod_business_backend_file_gnc_module_path(void) -{ - return g_strdup("gnucash/business-core-file"); -} - -char * -libgncmod_business_backend_file_gnc_module_description(void) -{ - return g_strdup("The XML (v2) parsers for GnuCash business objects"); -} - -int -libgncmod_business_backend_file_gnc_module_init(int refcount) -{ - if(!gnc_engine_is_initialized()) { return FALSE; } - - bus_core = gnc_module_load("gnucash/business-core", 0); - if(!bus_core) return FALSE; - - if (refcount == 0) { - /* Initialize our pointers into the backend subsystem */ - gnc_address_xml_initialize (); - gnc_billterm_xml_initialize (); - gnc_customer_xml_initialize (); - gnc_employee_xml_initialize (); - gnc_entry_xml_initialize (); - gnc_invoice_xml_initialize (); - gnc_job_xml_initialize (); - gnc_order_xml_initialize (); - gnc_owner_xml_initialize (); - gnc_taxtable_xml_initialize (); - gnc_vendor_xml_initialize (); - } - - return TRUE; -} - -int -libgncmod_business_backend_file_gnc_module_end(int refcount) -{ - int unload = TRUE; - - if (bus_core) - unload = gnc_module_unload(bus_core); - - if (refcount == 0) { - bus_core = NULL; - file = NULL; - } - - return unload; -} diff --git a/src/gnome-utils/druid-gnc-xml-import.c b/src/gnome-utils/druid-gnc-xml-import.c index a24792bfd0..8dc153ae1c 100644 --- a/src/gnome-utils/druid-gnc-xml-import.c +++ b/src/gnome-utils/druid-gnc-xml-import.c @@ -30,7 +30,7 @@ #include "druid-gnc-xml-import.h" #include "dialog-utils.h" #include "druid-utils.h" -#include "gnc-backend-file.h" +#include "gnc-backend-xml.h" #include "gnc-filepath-utils.h" #include "gnc-module.h" #include "gnc-ui.h" diff --git a/src/html/Makefile.am b/src/html/Makefile.am index e59ec462b3..6fa60e5544 100644 --- a/src/html/Makefile.am +++ b/src/html/Makefile.am @@ -31,7 +31,16 @@ gncinclude_HEADERS = \ gnc-html-graph-gog.h \ gnc-html-history.h \ gnc-html.h \ - gnc-html-factory.h + gnc-html-p.h \ + gnc-html-factory.h \ + gnc-html-gtkhtml.h \ + gnc-html-webkit.h \ + gnc-html-extras.h \ + gnc-html-gtkhtml-p.h \ + gnc-html-webkit-p.h \ + gnc-html-graph-gog-gtkhtml.h \ + gnc-html-graph-gog-webkit.h \ + gnc-html-graph-gog-extras.h libgncmod_html_la_LDFLAGS = -avoid-version @@ -82,7 +91,6 @@ swig-gnc-html.c: gnc-html.i gnc-html.h \ endif EXTRA_DIST = \ - gnc-svninfo.h \ gnc-html.i if !GTKHTML_USES_GTKPRINT