r14631 - gnucash/branches/swigify/src/business/business-core - Switch Makefiles from g-wrap to swig.

Chris Shoemaker chris at cvs.gnucash.org
Fri Aug 11 01:15:44 EDT 2006


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

Modified:
   gnucash/branches/swigify/src/business/business-core/Makefile.am
   gnucash/branches/swigify/src/business/business-core/test/Makefile.am
Log:
   Switch Makefiles from g-wrap to swig.


Modified: gnucash/branches/swigify/src/business/business-core/Makefile.am
===================================================================
--- gnucash/branches/swigify/src/business/business-core/Makefile.am	2006-08-11 05:12:14 UTC (rev 14630)
+++ gnucash/branches/swigify/src/business/business-core/Makefile.am	2006-08-11 05:15:43 UTC (rev 14631)
@@ -1,7 +1,7 @@
 SUBDIRS = . test file
 PWD := $(shell pwd)
 
-pkglib_LTLIBRARIES = libgncmod-business-core.la libgw-business-core.la
+pkglib_LTLIBRARIES = libgncmod-business-core.la
 
 AM_CFLAGS = \
   -I${top_srcdir}/src \
@@ -13,6 +13,8 @@
   ${GLIB_CFLAGS} 
 
 libgncmod_business_core_la_SOURCES = \
+  swig-business-core.c \
+  gncBusGuile.c \
   businessmod-core.c \
   gncAddress.c \
   gncBillTerm.c \
@@ -65,29 +67,12 @@
 
 # business-core-helpers.c
 
-libgw_business_core_la_SOURCES = \
-  gncBusGuile.c
+swig-business-core.c: business-core.i
+	swig -guile $(SWIG_ARGS) -Linkage module -o $@ $<
 
-nodist_libgw_business_core_la_SOURCES = \
-  gw-business-core.c
-
-libgw_business_core_la_LDFLAGS = ${G_WRAP_LINK_ARGS}
-libgw_business_core_la_LIBADD  = \
-  libgncmod-business-core.la \
-  ${top_builddir}/src/engine/libgw-engine.la \
-  ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${QOF_LIBS} \
-  ${GLIB_LIBS}
-
 gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
 gncmod_DATA = business-core.scm
 
-gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_DATA = \
-  gw-business-core-spec.scm
-nodist_gwmod_DATA = \
-  gw-business-core.scm
-
 EXTRA_DIST = \
   ${gncmod_DATA} \
   ${gwmod_DATA}
@@ -110,15 +95,7 @@
 endif
 	touch .scm-links
 
-gw-business-core.scm gw-business-core.c gw-business-core.h: \
- .scm-links gw-business-core-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 \"../../engine\" %load-path)) \
-	 (primitive-load \"./gw-business-core-spec.scm\") \
-	 (gw:generate-wrapset \"gw-business-core\")"
 
-BUILT_SOURCES = gw-business-core.scm gw-business-core.c gw-business-core.h
+#BUILT_SOURCES = gw-business-core.scm gw-business-core.c gw-business-core.h
 CLEANFILES = $(BUILT_SOURCES) gw-business-core.html \
 	g-wrapped gnucash .scm-links ${SCM_FILE_LINKS}

Modified: gnucash/branches/swigify/src/business/business-core/test/Makefile.am
===================================================================
--- gnucash/branches/swigify/src/business/business-core/test/Makefile.am	2006-08-11 05:12:14 UTC (rev 14630)
+++ gnucash/branches/swigify/src/business/business-core/test/Makefile.am	2006-08-11 05:15:43 UTC (rev 14631)
@@ -15,7 +15,6 @@
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${top_builddir}/src/engine/libgw-engine.la \
   ../libgncmod-business-core.la \
-  ../libgw-business-core.la \
   ${GLIB_LIBS} \
   ${QOF_LIBS} \
   -lltdl



More information about the gnucash-changes mailing list