From 0f17917433cbfbc1f3553b6260dbf754ee075e2d Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Tue, 13 Jul 2010 09:56:24 +0000 Subject: [PATCH] Completely remove the business-core/xml module as it is no longer needed. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19363 57a11ea4-9604-0410-9ed3-97b8803252fd --- configure.ac | 1 - src/business/business-core/Makefile.am | 2 +- src/business/business-core/xml/Makefile.am | 29 ---- .../xml/gncmod-business-backend-xml.c | 125 ------------------ .../xml/gncmod-business-backend-xml.h | 32 ----- .../business-gnome/business-gnome.scm | 1 - 6 files changed, 1 insertion(+), 189 deletions(-) delete mode 100644 src/business/business-core/xml/Makefile.am delete mode 100644 src/business/business-core/xml/gncmod-business-backend-xml.c delete mode 100644 src/business/business-core/xml/gncmod-business-backend-xml.h diff --git a/configure.ac b/configure.ac index 04c8215186..b7867799a2 100644 --- a/configure.ac +++ b/configure.ac @@ -1488,7 +1488,6 @@ AC_CONFIG_FILES(po/Makefile.in src/business/business-core/sql/Makefile src/business/business-core/sql/test/Makefile src/business/business-core/test/Makefile - src/business/business-core/xml/Makefile src/business/business-utils/Makefile src/business/dialog-tax-table/Makefile src/business/business-gnome/Makefile diff --git a/src/business/business-core/Makefile.am b/src/business/business-core/Makefile.am index f85e501f4d..7e00a659d2 100644 --- a/src/business/business-core/Makefile.am +++ b/src/business/business-core/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = . sql test xml +SUBDIRS = . sql test pkglib_LTLIBRARIES = libgncmod-business-core.la diff --git a/src/business/business-core/xml/Makefile.am b/src/business/business-core/xml/Makefile.am deleted file mode 100644 index 3b29657de8..0000000000 --- a/src/business/business-core/xml/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -SUBDIRS = . - -pkglib_LTLIBRARIES = libgncmod-business-backend-xml.la - -AM_CPPFLAGS = \ - -I${top_srcdir}/src \ - -I${top_srcdir}/src/backend \ - -I${top_srcdir}/src/backend/xml \ - -I${top_srcdir}/src/engine \ - -I${top_srcdir}/src/gnc-module \ - -I${top_srcdir}/src/business/business-core \ - -I${top_srcdir}/src/libqof/qof \ - ${LIBXML2_CFLAGS} \ - ${GLIB_CFLAGS} - -libgncmod_business_backend_xml_la_SOURCES = - -noinst_HEADERS = - -libgncmod_business_backend_xml_la_LDFLAGS = -module -avoid-version - -libgncmod_business_backend_xml_la_LIBADD = \ - ${top_builddir}/src/business/business-core/libgncmod-business-core.la \ - ${top_builddir}/src/backend/xml/libgnc-backend-xml-utils.la \ - ${top_builddir}/src/engine/libgncmod-engine.la \ - ${top_builddir}/src/gnc-module/libgnc-module.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ - ${LIBXML2_LIBS} \ - ${GLIB_LIBS} diff --git a/src/business/business-core/xml/gncmod-business-backend-xml.c b/src/business/business-core/xml/gncmod-business-backend-xml.c deleted file mode 100644 index 01cff50c8f..0000000000 --- a/src/business/business-core/xml/gncmod-business-backend-xml.c +++ /dev/null @@ -1,125 +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 "gncmod-business-backend-xml.h" - -#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_xml) - -/* version of the gnc module system interface we require */ -int libgncmod_business_backend_xml_gnc_module_system_interface = 0; - -/* module versioning uses libtool semantics. */ -int libgncmod_business_backend_xml_gnc_module_current = 0; -int libgncmod_business_backend_xml_gnc_module_revision = 0; -int libgncmod_business_backend_xml_gnc_module_age = 0; - -static GNCModule bus_core; -static GNCModule file; - - -char * -libgncmod_business_backend_xml_gnc_module_path(void) -{ - return g_strdup("gnucash/business-core-xml"); -} - -char * -libgncmod_business_backend_xml_gnc_module_description(void) -{ - return g_strdup("The XML (v2) parsers for GnuCash business objects"); -} - -void -gnc_module_init_business_core_xml_init(void) -{ - /* 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 (); -} - -int -libgncmod_business_backend_xml_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) - { - gnc_module_init_business_core_xml_init(); - } - - return TRUE; -} - -int -libgncmod_business_backend_xml_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/business/business-core/xml/gncmod-business-backend-xml.h b/src/business/business-core/xml/gncmod-business-backend-xml.h deleted file mode 100644 index cf72944cbc..0000000000 --- a/src/business/business-core/xml/gncmod-business-backend-xml.h +++ /dev/null @@ -1,32 +0,0 @@ -/********************************************************************* - * gncmod-business-backend-file.h - * 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 - * - *********************************************************************/ - -#ifndef GNCMOD_BUSINESS_BACKEND_XML_H -#define GNCMOD_BUSINESS_BACKEND_XML_H - -void -gnc_module_init_business_core_xml_init(void); - -#endif diff --git a/src/business/business-gnome/business-gnome.scm b/src/business/business-gnome/business-gnome.scm index ad48a177c6..cb1d481288 100644 --- a/src/business/business-gnome/business-gnome.scm +++ b/src/business/business-gnome/business-gnome.scm @@ -5,7 +5,6 @@ (gnc:module-load "gnucash/business-core" 0) (gnc:module-load "gnucash/business-utils" 0) (gnc:module-load "gnucash/gnome-search" 0) -(gnc:module-load "gnucash/business-core-xml" 0) (gnc:module-load "gnucash/business-core-sql" 0) (gnc:module-load "gnucash/dialog-tax-table" 0)