Dissolve dialog-tax-table module by moving its only object into

gnome-utils.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21606 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens 2011-11-21 10:40:31 +00:00
parent 76d820735c
commit e52619c40b
15 changed files with 6 additions and 182 deletions

View File

@ -1337,7 +1337,6 @@ AC_CONFIG_FILES(
src/test-core/Makefile
src/business/Makefile
src/business/business-utils/Makefile
src/business/dialog-tax-table/Makefile
src/business/business-gnome/Makefile
src/business/business-gnome/glade/Makefile
src/business/business-gnome/gtkbuilder/Makefile

View File

@ -1,5 +1,4 @@
SUBDIRS = \
business-utils \
dialog-tax-table \
business-ledger \
business-gnome

View File

@ -15,7 +15,6 @@ AM_CPPFLAGS = \
-I${top_srcdir}/src/html \
-I${top_srcdir}/src/report/report-gnome \
-I${top_srcdir}/src/business/business-ledger \
-I${top_srcdir}/src/business/dialog-tax-table \
-I${top_srcdir}/src/register/register-core \
-I${top_srcdir}/src/register/register-gnome \
-I${top_srcdir}/src/register/ledger-core \
@ -69,7 +68,6 @@ libgncmod_business_gnome_la_LDFLAGS = -avoid-version
libgncmod_business_gnome_la_LIBADD = \
${top_builddir}/src/gnome/libgnc-gnome.la \
${top_builddir}/src/business/business-ledger/libgnc-business-ledger.la \
${top_builddir}/src/business/dialog-tax-table/libgncmod-dialog-tax-table.la \
${top_builddir}/src/register/register-core/libgncmod-register-core.la \
${top_builddir}/src/register/register-gnome/libgncmod-register-gnome.la \
${top_builddir}/src/report/report-gnome/libgncmod-report-gnome.la \

View File

@ -4,7 +4,6 @@
(gnc:module-load "gnucash/gnome-utils" 0)
(gnc:module-load "gnucash/business-utils" 0)
(gnc:module-load "gnucash/gnome-search" 0)
(gnc:module-load "gnucash/dialog-tax-table" 0)
(gnc:module-load "gnucash/report/report-gnome" 0)

View File

@ -19,7 +19,6 @@ noinst_HEADERS = \
libgnc_business_ledger_la_LIBADD = \
${top_builddir}/src/business/business-utils/libgncmod-business-utils.la \
${top_builddir}/src/business/dialog-tax-table/libgncmod-dialog-tax-table.la \
${top_builddir}/src/register/register-core/libgncmod-register-core.la \
${top_builddir}/src/register/register-gnome/libgncmod-register-gnome.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
@ -33,7 +32,6 @@ libgnc_business_ledger_la_LIBADD = \
AM_CPPFLAGS = \
-I${top_srcdir}/src/business/business-utils \
-I${top_srcdir}/src/business/dialog-tax-table \
-I${top_srcdir}/src \
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/core-utils \

View File

@ -1,82 +0,0 @@
pkglib_LTLIBRARIES = libgncmod-dialog-tax-table.la
AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/core-utils \
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/app-utils \
-I${top_srcdir}/src/libqof/qof \
${GNOME_CFLAGS} \
${GLADE_CFLAGS} \
${GLIB_CFLAGS} \
${GUILE_INCS}
libgncmod_dialog_tax_table_la_SOURCES = \
swig-dialog-tax-table.c \
gncmod-dialog-tax-table.c \
dialog-tax-table.c
noinst_HEADERS = \
dialog-tax-table.h
libgncmod_dialog_tax_table_la_LDFLAGS = -avoid-version
libgncmod_dialog_tax_table_la_LIBADD = \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-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 \
${GLADE_LIBS} \
${GUILE_LIBS} \
${GNOME_LIBS} \
${GLIB_LIBS} \
${EFENCE_LIBS}
if BUILDING_FROM_SVN
swig-dialog-tax-table.c: dialog-tax-table.i ${top_srcdir}/src/base-typemaps.i
$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-I${top_srcdir}/src -o $@ $<
endif
gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
gncmod_DATA = dialog-tax-table.scm
gladedir = $(GNC_GLADE_DIR)
glade_DATA = tax-tables.glade
EXTRA_DIST = \
dialog-tax-table.i \
${glade_DATA} \
${gncmod_DATA}
if GNUCASH_SEPARATE_BUILDDIR
#Only needed when srcdir and builddir are different
# for running
SCM_FILE_LINKS = ${gncmod_DATA}
endif
.scm-links:
$(RM) -rf gnucash
mkdir -p gnucash
if GNUCASH_SEPARATE_BUILDDIR
for X in ${SCM_FILE_LINKS} ; do \
$(LN_S) -f ${srcdir}/$$X . ; \
done
endif
( cd gnucash; for A in $(gncmod_DATA) ; do $(LN_S) -f ../$$A . ; done )
if ! OS_WIN32
# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
touch .scm-links
endif
noinst_DATA = .scm-links
clean-local:
rm -rf gnucash
CLEANFILES = .scm-links ${SCM_FILE_LINKS}
MAINTAINERCLEANFILES = swig-dialog-tax-table.c
INCLUDES = -DG_LOG_DOMAIN=\"gnc.business.tax\"

View File

@ -1,12 +0,0 @@
%module sw_dialog_tax_table
%{
/* Includes the header in the wrapper code */
#include <config.h>
#include <dialog-tax-table.h>
SCM scm_init_sw_dialog_tax_table_module (void);
%}
%import "base-typemaps.i"
TaxTableWindow * gnc_ui_tax_table_window_new (QofBook *book);

View File

@ -1 +0,0 @@
(define-module (gnucash dialog-tax-table))

View File

@ -1,80 +0,0 @@
/*********************************************************************
* gncmod-dialog-tax-table.c
* module definition/initialization for the Business Tax Table Dialog module
*
* Copyright (c) 2002 Derek Atkins <warlord@MIT.EDU>
*
* 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 <gmodule.h>
#include <libguile.h>
#include "gnc-module.h"
#include "gnc-module-api.h"
GNC_MODULE_API_DECL(libgncmod_dialog_tax_table)
extern SCM scm_init_sw_dialog_tax_table_module(void);
/* version of the gnc module system interface we require */
int libgncmod_dialog_tax_table_gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
int libgncmod_dialog_tax_table_gnc_module_current = 0;
int libgncmod_dialog_tax_table_gnc_module_revision = 0;
int libgncmod_dialog_tax_table_gnc_module_age = 0;
char *
libgncmod_dialog_tax_table_gnc_module_path(void)
{
return g_strdup("gnucash/dialog-tax-table");
}
char *
libgncmod_dialog_tax_table_gnc_module_description(void)
{
return g_strdup("The GnuCash tax-table GNOME UI module");
}
int
libgncmod_dialog_tax_table_gnc_module_init(int refcount)
{
/* load app-utils: we depend on it -- and it depends on the engine */
if (!gnc_module_load ("gnucash/app-utils", 0))
{
return FALSE;
}
/* We also depend on the gnome-utils module */
if (!gnc_module_load ("gnucash/gnome-utils", 0))
{
return FALSE;
}
scm_init_sw_dialog_tax_table_module();
scm_c_eval_string("(use-modules (sw_dialog_tax_table))");
return TRUE;
}
int
libgncmod_dialog_tax_table_gnc_module_end(int refcount)
{
return TRUE;
}

View File

@ -38,6 +38,7 @@ libgncmod_gnome_utils_la_SOURCES = \
dialog-preferences.c \
dialog-query-list.c \
dialog-reset-warnings.c \
dialog-tax-table.c \
dialog-totd.c \
dialog-transfer.c \
dialog-userpass.c \
@ -177,6 +178,7 @@ gncinclude_HEADERS = \
window-main-summarybar.h
noinst_HEADERS = \
dialog-tax-table.h \
gnc-autosave.h \
gnc-druid-gnome.h \
gnc-druid-provider-edge-gnome.h \

View File

@ -1,5 +1,6 @@
gladedir = $(GNC_GLADE_DIR)
glade_DATA = \
tax-tables.glade \
druid-provider-multifile.glade \
druid-gnc-xml-import.glade

View File

@ -18,6 +18,7 @@
#include <gnc-plugin-file-history.h>
#include <gnc-ui.h>
#include <gnc-splash.h>
#include <dialog-tax-table.h>
SCM scm_init_sw_gnome_utils_module (void);
%}
@ -52,3 +53,5 @@ void gnc_unset_busy_cursor (GtkWidget *w);
void gnc_window_show_progress (const char *message, double percentage);
gboolean gnucash_ui_is_running(void);
TaxTableWindow * gnc_ui_tax_table_window_new (QofBook *book);