From 4724a70e4a8f0d4ca2d58844f5f65ac83fda28b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=C3=B6hler?= Date: Wed, 18 Oct 2006 18:15:32 +0000 Subject: [PATCH] Make win32 compile again. * Add a few GUILE_LIBS * Remove platform specific .so from a load-extension parameter git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15039 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/core-utils/Makefile.am | 1 + src/gnc-module/Makefile.am | 3 ++- src/gnc-module/test/mod-bar/Makefile.am | 1 + src/gnc-module/test/mod-baz/Makefile.am | 1 + src/gnc-module/test/mod-foo/Makefile.am | 1 + src/import-export/qif-import/qif-import.scm | 2 +- 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/core-utils/Makefile.am b/src/core-utils/Makefile.am index 1ae85edd42..581355c0ae 100644 --- a/src/core-utils/Makefile.am +++ b/src/core-utils/Makefile.am @@ -11,6 +11,7 @@ libcore_utils_la_SOURCES = \ gnc-gtk-utils.c libcore_utils_la_LIBADD = \ + ${GUILE_LIBS} \ ${GLIB_LIBS} \ ${GCONF_LIBS} \ ${GTK_LIBS} diff --git a/src/gnc-module/Makefile.am b/src/gnc-module/Makefile.am index f03127ae51..a82a0378b3 100644 --- a/src/gnc-module/Makefile.am +++ b/src/gnc-module/Makefile.am @@ -12,7 +12,8 @@ libgncmodule_la_SOURCES = gnc-module.c swig-gnc-module.c 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 diff --git a/src/gnc-module/test/mod-bar/Makefile.am b/src/gnc-module/test/mod-bar/Makefile.am index 4a8e457b33..8108f18c9e 100644 --- a/src/gnc-module/test/mod-bar/Makefile.am +++ b/src/gnc-module/test/mod-bar/Makefile.am @@ -19,6 +19,7 @@ noinst_HEADERS = \ libgncmodbar_la_SOURCES=gnc-mod-bar.c libgncmodbar_la_LIBADD=libbar.la \ + $(GUILE_LIBS) \ $(GLIB_LIBS) if BUILDING_FROM_SVN diff --git a/src/gnc-module/test/mod-baz/Makefile.am b/src/gnc-module/test/mod-baz/Makefile.am index 015166cd13..13d249ee09 100644 --- a/src/gnc-module/test/mod-baz/Makefile.am +++ b/src/gnc-module/test/mod-baz/Makefile.am @@ -23,6 +23,7 @@ libgncmodbaz_la_SOURCES = gnc-mod-baz.c libgncmodbaz_la_LIBADD = \ libbaz.la \ ../../libgncmodule.la \ + $(GUILE_LIBS) \ $(GLIB_LIBS) if BUILDING_FROM_SVN diff --git a/src/gnc-module/test/mod-foo/Makefile.am b/src/gnc-module/test/mod-foo/Makefile.am index f9b1df2573..be06601d5a 100644 --- a/src/gnc-module/test/mod-foo/Makefile.am +++ b/src/gnc-module/test/mod-foo/Makefile.am @@ -20,6 +20,7 @@ libgncmodfoo_la_SOURCES = gnc-mod-foo.c libgncmodfoo_la_LIBADD = \ libfoo.la \ + $(GUILE_LIBS) \ $(GLIB_LIBS) EXTRA_DIST = \ diff --git a/src/import-export/qif-import/qif-import.scm b/src/import-export/qif-import/qif-import.scm index d400581562..5835384a7a 100644 --- a/src/import-export/qif-import/qif-import.scm +++ b/src/import-export/qif-import/qif-import.scm @@ -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))