r15039 - gnucash/trunk/src - Make win32 compile again.

Andreas Köhler andi5 at cvs.gnucash.org
Wed Oct 18 14:15:33 EDT 2006


Author: andi5
Date: 2006-10-18 14:15:32 -0400 (Wed, 18 Oct 2006)
New Revision: 15039
Trac: http://svn.gnucash.org/trac/changeset/15039

Modified:
   gnucash/trunk/src/core-utils/Makefile.am
   gnucash/trunk/src/gnc-module/Makefile.am
   gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am
   gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am
   gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am
   gnucash/trunk/src/import-export/qif-import/qif-import.scm
Log:
Make win32 compile again.
* Add a few GUILE_LIBS
* Remove platform specific .so from a load-extension parameter


Modified: gnucash/trunk/src/core-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/core-utils/Makefile.am	2006-10-18 18:03:09 UTC (rev 15038)
+++ gnucash/trunk/src/core-utils/Makefile.am	2006-10-18 18:15:32 UTC (rev 15039)
@@ -11,6 +11,7 @@
   gnc-gtk-utils.c
 
 libcore_utils_la_LIBADD = \
+  ${GUILE_LIBS} \
   ${GLIB_LIBS} \
   ${GCONF_LIBS} \
   ${GTK_LIBS}

Modified: gnucash/trunk/src/gnc-module/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/Makefile.am	2006-10-18 18:03:09 UTC (rev 15038)
+++ gnucash/trunk/src/gnc-module/Makefile.am	2006-10-18 18:15:32 UTC (rev 15039)
@@ -12,7 +12,8 @@
 
 libgncmodule_la_LIBADD = \
   ../core-utils/libcore-utils.la \
- ${top_builddir}/lib/libc/libc-missing.la \
+  ${top_builddir}/lib/libc/libc-missing.la \
+  ${GUILE_LIBS} \
   ${GLIB_LIBS} \
   -lltdl
 

Modified: gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am	2006-10-18 18:03:09 UTC (rev 15038)
+++ gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am	2006-10-18 18:15:32 UTC (rev 15039)
@@ -19,6 +19,7 @@
 libgncmodbar_la_SOURCES=gnc-mod-bar.c
 
 libgncmodbar_la_LIBADD=libbar.la \
+  $(GUILE_LIBS) \
   $(GLIB_LIBS)
 
 if BUILDING_FROM_SVN

Modified: gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am	2006-10-18 18:03:09 UTC (rev 15038)
+++ gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am	2006-10-18 18:15:32 UTC (rev 15039)
@@ -23,6 +23,7 @@
 libgncmodbaz_la_LIBADD = \
   libbaz.la \
   ../../libgncmodule.la \
+  $(GUILE_LIBS) \
   $(GLIB_LIBS)
 
 if BUILDING_FROM_SVN

Modified: gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am	2006-10-18 18:03:09 UTC (rev 15038)
+++ gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am	2006-10-18 18:15:32 UTC (rev 15039)
@@ -20,6 +20,7 @@
 
 libgncmodfoo_la_LIBADD = \
   libfoo.la \
+  $(GUILE_LIBS) \
   $(GLIB_LIBS)
 
 EXTRA_DIST = \

Modified: gnucash/trunk/src/import-export/qif-import/qif-import.scm
===================================================================
--- gnucash/trunk/src/import-export/qif-import/qif-import.scm	2006-10-18 18:03:09 UTC (rev 15038)
+++ gnucash/trunk/src/import-export/qif-import/qif-import.scm	2006-10-18 18:15:32 UTC (rev 15039)
@@ -9,7 +9,7 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 
 ;; We do this initialization here because src/gnome isn't a real module.
-(load-extension "libgncgnome.so" "scm_init_sw_gnome_module")
+(load-extension "libgncgnome" "scm_init_sw_gnome_module")
 (use-modules (sw_gnome))
 
 (use-modules (gnucash gnc-module))



More information about the gnucash-changes mailing list