r14960 - gnucash/branches/swig-redo/src/register/register-core - Un-gwrap the register-core module.

Chris Shoemaker chris at cvs.gnucash.org
Mon Oct 9 19:54:42 EDT 2006


Author: chris
Date: 2006-10-09 19:54:41 -0400 (Mon, 09 Oct 2006)
New Revision: 14960
Trac: http://svn.gnucash.org/trac/changeset/14960

Modified:
   gnucash/branches/swig-redo/src/register/register-core/Makefile.am
   gnucash/branches/swig-redo/src/register/register-core/gncmod-register-core.c
Log:
Un-gwrap the register-core module.
We don't actually use it, so there's no point in swigifying it.



Modified: gnucash/branches/swig-redo/src/register/register-core/Makefile.am
===================================================================
--- gnucash/branches/swig-redo/src/register/register-core/Makefile.am	2006-10-09 23:54:11 UTC (rev 14959)
+++ gnucash/branches/swig-redo/src/register/register-core/Makefile.am	2006-10-09 23:54:41 UTC (rev 14960)
@@ -1,7 +1,7 @@
 SUBDIRS = . test
 PWD := $(shell pwd)
 
-pkglib_LTLIBRARIES = libgncmod-register-core.la libgw-register-core.la
+pkglib_LTLIBRARIES = libgncmod-register-core.la
 
 libgncmod_register_core_la_LIBADD = \
   ${top_builddir}/src/gnc-module/libgncmodule.la \
@@ -50,18 +50,6 @@
   table-layout.h \
   table-model.h
 
-nodist_libgw_register_core_la_SOURCES = gw-register-core.c
-libgw_register_core_la_LIBADD = \
-  libgncmod-register-core.la \
-  ${G_WRAP_LINK_ARGS}
-
-gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_DATA = gw-register-core-spec.scm
-nodist_gwmod_DATA = gw-register-core.scm
-
-EXTRA_DIST = \
-  ${gwmod_DATA}
-
 AM_CFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/engine \
@@ -76,15 +64,9 @@
   ${GLIB_CFLAGS}
 
 
-if GNUCASH_SEPARATE_BUILDDIR
-#Only needed when srcdir and builddir are different
-SCM_FILE_LINKS = gw-register-core-spec.scm
-endif
-
 .scm-links: 
-	rm -f gnucash g-wrapped
+	rm -f gnucash
 	$(LN_S) -f . gnucash 
-	$(LN_S) -f . g-wrapped 
 	$(LN_S) -f . register
 if GNUCASH_SEPARATE_BUILDDIR
 	for X in ${SCM_FILE_LINKS} ; do \
@@ -93,15 +75,5 @@
 endif
 	touch .scm-links
 
-gw-register-core.scm gw-register-core.c gw-register-core.h: \
-  .scm-links gw-register-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 \"${top_srcdir}/src/engine\" %load-path)) \
-	  (primitive-load \"./gw-register-core-spec.scm\") \
-	  (gw:generate-wrapset \"gw-register-core\")"
-
-BUILT_SOURCES = gw-register-core.scm gw-register-core.c gw-register-core.h
-CLEANFILES = $(BUILT_SOURCES) gnucash g-wrapped register .scm-links \
-	${SCM_FILE_LINKS} gw-register-core.html
+BUILT_SOURCES =
+CLEANFILES = $(BUILT_SOURCES) gnucash register .scm-links ${SCM_FILE_LINKS}

Modified: gnucash/branches/swig-redo/src/register/register-core/gncmod-register-core.c
===================================================================
--- gnucash/branches/swig-redo/src/register/register-core/gncmod-register-core.c	2006-10-09 23:54:11 UTC (rev 14959)
+++ gnucash/branches/swig-redo/src/register/register-core/gncmod-register-core.c	2006-10-09 23:54:41 UTC (rev 14960)
@@ -59,7 +59,5 @@
     return FALSE;
   }
 
-  lmod("(g-wrapped gw-register-core)");
-
   return TRUE;
 }



More information about the gnucash-changes mailing list