r14634 - gnucash/branches/swigify/src/business - Convert two more Makefiles from g-wrap to swig.

[Chris Shoemaker]

Author: chris
Date: 2006-08-11 01:24:44 -0400 (Fri, 11 Aug 2006)
New Revision: 14634
Trac: http://svn.gnucash.org/trac/changeset/14634

Modified:
   gnucash/branches/swigify/src/business/business-gnome/Makefile.am
   gnucash/branches/swigify/src/business/dialog-tax-table/Makefile.am
Log:
   Convert two more Makefiles from g-wrap to swig.


Modified: gnucash/branches/swigify/src/business/business-gnome/Makefile.am
===================================================================
--- gnucash/branches/swigify/src/business/business-gnome/Makefile.am	2006-08-11 05:20:14 UTC (rev 14633)
+++ gnucash/branches/swigify/src/business/business-gnome/Makefile.am	2006-08-11 05:24:44 UTC (rev 14634)
@@ -1,7 +1,7 @@
 SUBDIRS = . glade schemas ui
 PWD := $(shell pwd)
 
-pkglib_LTLIBRARIES = libgncmod-business-gnome.la libgw-business-gnome.la
+pkglib_LTLIBRARIES = libgncmod-business-gnome.la
 
 AM_CFLAGS = \
   -I${top_srcdir}/src \
@@ -30,6 +30,7 @@
   -I${top_srcdir}/src/register/ledger-core
 
 libgncmod_business_gnome_la_SOURCES = \
+  swig-business-gnome.c \
   businessmod-gnome.c \
   business-options-gnome.c \
   business-urls.c \
@@ -88,14 +89,9 @@
   ${EFENCE_LIBS}
 
 
-nodist_libgw_business_gnome_la_SOURCES = gw-business-gnome.c
+swig-business-gnome.c: business-gnome.i
+	swig -guile $(SWIG_ARGS) -Linkage module -o $@ $<
 
-libgw_business_gnome_la_LDFLAGS = ${G_WRAP_LINK_ARGS}
-libgw_business_gnome_la_LIBADD  = \
-  libgncmod-business-gnome.la \
-  ${G_WRAP_LINK_ARGS} \
-  ${GUILE_LIBS}
-
 # For Business Reports
 gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
 gncscmmod_DATA =
@@ -103,15 +99,8 @@
 gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
 gncmod_DATA = business-gnome.scm
 
-gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_DATA = \
-  gw-business-gnome-spec.scm
-nodist_gwmod_DATA = \
-  gw-business-gnome.scm
-
 EXTRA_DIST = \
   ${gncmod_DATA} \
-  ${gwmod_DATA} \
   ${gncscmmod_DATA}
 
 if GNUCASH_SEPARATE_BUILDDIR
@@ -133,19 +122,6 @@
 endif
 	touch .scm-links
 
-gw-business-gnome.scm gw-business-gnome.c gw-business-gnome.h: \
-  .scm-links gw-business-gnome-spec.scm ${top_builddir}/config.status
-	FLAVOR=gnome $(GUILE) -c \
-	 "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
-	 (set! %load-path (cons \"${PWD}\" %load-path)) \
-	 (set! %load-path (cons \"../business-core\" %load-path)) \
-	 (set! %load-path (cons \"${srcdir}/../business-core\" %load-path)) \
-	 (set! %load-path (cons \"../../engine\" %load-path)) \
-	 (set! %load-path (cons \"../../app-utils\" %load-path)) \
-	 (set! %load-path (cons \"../../gnome-utils\" %load-path)) \
-	 (primitive-load \"./gw-business-gnome-spec.scm\") \
-	 (gw:generate-wrapset \"gw-business-gnome\")"
-
-BUILT_SOURCES = gw-business-gnome.scm gw-business-gnome.c gw-business-gnome.h
+#BUILT_SOURCES = gw-business-gnome.scm gw-business-gnome.c gw-business-gnome.h
 CLEANFILES = $(BUILT_SOURCES) g-wrapped gnucash .scm-links \
 	${SCM_FILE_LINKS} gw-business-gnome.html

Modified: gnucash/branches/swigify/src/business/dialog-tax-table/Makefile.am
===================================================================
--- gnucash/branches/swigify/src/business/dialog-tax-table/Makefile.am	2006-08-11 05:20:14 UTC (rev 14633)
+++ gnucash/branches/swigify/src/business/dialog-tax-table/Makefile.am	2006-08-11 05:24:44 UTC (rev 14634)
@@ -1,6 +1,6 @@
 PWD := $(shell pwd)
 
-pkglib_LTLIBRARIES = libgncmod-dialog-tax-table.la libgw-dialog-tax-table.la
+pkglib_LTLIBRARIES = libgncmod-dialog-tax-table.la
 
 AM_CFLAGS = \
   -I${top_srcdir}/src \
@@ -21,6 +21,7 @@
   ${GUILE_INCS}
 
 libgncmod_dialog_tax_table_la_SOURCES = \
+  swig-dialog-tax-table.c \
   gncmod-dialog-tax-table.c \
   dialog-tax-table.c
 
@@ -41,18 +42,9 @@
   ${QOF_LIBS} \
   ${EFENCE_LIBS}
 
-nodist_libgw_dialog_tax_table_la_SOURCES = gw-dialog-tax-table.c
+swig-dialog-tax-table.c: dialog-tax-table.i
+	swig -guile $(SWIG_ARGS) -Linkage module -o $@ $<
 
-libgw_dialog_tax_table_la_LIBADD = \
-  libgncmod-dialog-tax-table.la \
-  ${G_WRAP_LINK_ARGS}
-
-gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_DATA = \
-  gw-dialog-tax-table-spec.scm
-nodist_gwmod_DATA = \
-  gw-dialog-tax-table.scm
-
 gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
 gncmod_DATA = dialog-tax-table.scm
 
@@ -83,19 +75,7 @@
 endif
 	touch .scm-links
 
-gw-dialog-tax-table.scm gw-dialog-tax-table.c gw-dialog-tax-table.h: \
-  .scm-links gw-dialog-tax-table-spec.scm ${top_builddir}/config.status
-	FLAVOR=gnome $(GUILE) -c \
-	 "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
-	 (set! %load-path (cons \"${PWD}\" %load-path)) \
-	 (set! %load-path (cons \"../business-core\" %load-path)) \
-	 (set! %load-path (cons \"../../engine\" %load-path)) \
-	 (set! %load-path (cons \"../../app-utils\" %load-path)) \
-	 (set! %load-path (cons \"../../gnome-utils\" %load-path)) \
-	 (primitive-load \"./gw-dialog-tax-table-spec.scm\") \
-	 (gw:generate-wrapset \"gw-dialog-tax-table\")"
-
-BUILT_SOURCES = gw-dialog-tax-table.scm gw-dialog-tax-table.c \
-	gw-dialog-tax-table.h
+#BUILT_SOURCES = gw-dialog-tax-table.scm gw-dialog-tax-table.c \
+#	gw-dialog-tax-table.h
 CLEANFILES = $(BUILT_SOURCES) g-wrapped gnucash .scm-links \
 	${SCM_FILE_LINKS} gw-dialog-tax-table.html