minor hack to cause SUBDIRS (gmodule) to be build last. we do this by

Mon Aug 10 02:17:19 1998  Tim Janik  <timj@gtk.org>

        * Makefile.am: minor hack to cause SUBDIRS (gmodule) to be build
        last. we do this by making all-recursive-am depend on all-am.

Mon Aug 10 02:18:31 1998  Tim Janik  <timj@gtk.org>

        * Makefile.am (lib_LTLIBRARIES): for now, skip the dependency on
        -lglib for libgmodule-1.1.la, libgplugin_a.la and libgplugin_b.la
        since this clashes with inter-library-dependencies for not installed
        libraries. glib-config takes care of this for the usuall case, but
        there needs to be a better way...

diff --git a/ChangeLog b/ChangeLog
index 65e1c56dd995598e6c62111f0e938c4389a1ee03..6d9e6080ae7cdc29c2d6998ed5c2fb1a36730a24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 10 02:17:19 1998  Tim Janik  <timj@gtk.org>
+
+       * Makefile.am: minor hack to cause SUBDIRS (gmodule) to be build
+       last. we do this by making all-recursive-am depend on all-am.
+
 Sun Aug  9 15:56:11 1998  Tim Janik  <timj@gtk.org>
 
        * configure.in: added GModule checks. generate files in gmodule/.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 65e1c56dd995598e6c62111f0e938c4389a1ee03..6d9e6080ae7cdc29c2d6998ed5c2fb1a36730a24 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Mon Aug 10 02:17:19 1998  Tim Janik  <timj@gtk.org>
+
+       * Makefile.am: minor hack to cause SUBDIRS (gmodule) to be build
+       last. we do this by making all-recursive-am depend on all-am.
+
 Sun Aug  9 15:56:11 1998  Tim Janik  <timj@gtk.org>
 
        * configure.in: added GModule checks. generate files in gmodule/.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 65e1c56dd995598e6c62111f0e938c4389a1ee03..6d9e6080ae7cdc29c2d6998ed5c2fb1a36730a24 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Aug 10 02:17:19 1998  Tim Janik  <timj@gtk.org>
+
+       * Makefile.am: minor hack to cause SUBDIRS (gmodule) to be build
+       last. we do this by making all-recursive-am depend on all-am.
+
 Sun Aug  9 15:56:11 1998  Tim Janik  <timj@gtk.org>
 
        * configure.in: added GModule checks. generate files in gmodule/.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 65e1c56dd995598e6c62111f0e938c4389a1ee03..6d9e6080ae7cdc29c2d6998ed5c2fb1a36730a24 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Mon Aug 10 02:17:19 1998  Tim Janik  <timj@gtk.org>
+
+       * Makefile.am: minor hack to cause SUBDIRS (gmodule) to be build
+       last. we do this by making all-recursive-am depend on all-am.
+
 Sun Aug  9 15:56:11 1998  Tim Janik  <timj@gtk.org>
 
        * configure.in: added GModule checks. generate files in gmodule/.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 65e1c56dd995598e6c62111f0e938c4389a1ee03..6d9e6080ae7cdc29c2d6998ed5c2fb1a36730a24 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Mon Aug 10 02:17:19 1998  Tim Janik  <timj@gtk.org>
+
+       * Makefile.am: minor hack to cause SUBDIRS (gmodule) to be build
+       last. we do this by making all-recursive-am depend on all-am.
+
 Sun Aug  9 15:56:11 1998  Tim Janik  <timj@gtk.org>
 
        * configure.in: added GModule checks. generate files in gmodule/.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 65e1c56dd995598e6c62111f0e938c4389a1ee03..6d9e6080ae7cdc29c2d6998ed5c2fb1a36730a24 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Aug 10 02:17:19 1998  Tim Janik  <timj@gtk.org>
+
+       * Makefile.am: minor hack to cause SUBDIRS (gmodule) to be build
+       last. we do this by making all-recursive-am depend on all-am.
+
 Sun Aug  9 15:56:11 1998  Tim Janik  <timj@gtk.org>
 
        * configure.in: added GModule checks. generate files in gmodule/.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 65e1c56dd995598e6c62111f0e938c4389a1ee03..6d9e6080ae7cdc29c2d6998ed5c2fb1a36730a24 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Aug 10 02:17:19 1998  Tim Janik  <timj@gtk.org>
+
+       * Makefile.am: minor hack to cause SUBDIRS (gmodule) to be build
+       last. we do this by making all-recursive-am depend on all-am.
+
 Sun Aug  9 15:56:11 1998  Tim Janik  <timj@gtk.org>
 
        * configure.in: added GModule checks. generate files in gmodule/.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 65e1c56dd995598e6c62111f0e938c4389a1ee03..6d9e6080ae7cdc29c2d6998ed5c2fb1a36730a24 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Aug 10 02:17:19 1998  Tim Janik  <timj@gtk.org>
+
+       * Makefile.am: minor hack to cause SUBDIRS (gmodule) to be build
+       last. we do this by making all-recursive-am depend on all-am.
+
 Sun Aug  9 15:56:11 1998  Tim Janik  <timj@gtk.org>
 
        * configure.in: added GModule checks. generate files in gmodule/.

diff --git a/Makefile.am b/Makefile.am
index 5316cae0afb8c6467076258241fb463826fd9f8c..5835caa9c7e9f52149c58dc4d3f23e11d87d155a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,9 @@ EXTRA_DIST =  \
                glib.m4 \
                glib.spec
 
+# build . first, then SUBDIRS
+all-recursive-am: all-am
+
 lib_LTLIBRARIES = libglib-1.1.la
 
 libglib_1_1_la_SOURCES = \

diff --git a/glib/Makefile.am b/glib/Makefile.am
index 5316cae0afb8c6467076258241fb463826fd9f8c..5835caa9c7e9f52149c58dc4d3f23e11d87d155a 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -12,6 +12,9 @@ EXTRA_DIST =  \
                glib.m4 \
                glib.spec
 
+# build . first, then SUBDIRS
+all-recursive-am: all-am
+
 lib_LTLIBRARIES = libglib-1.1.la
 
 libglib_1_1_la_SOURCES = \

diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog
index 507449c056fc3b11ed9cb4857ef7027d41f335ec..2fcde620fcbb7f830d302aeb9af537e3b65cad73 100644 (file)
--- a/gmodule/ChangeLog
+++ b/gmodule/ChangeLog
@@ -1,3 +1,11 @@
+Mon Aug 10 02:18:31 1998  Tim Janik  <timj@gtk.org>
+
+       * Makefile.am (lib_LTLIBRARIES): for now, skip the dependency on
+       -lglib for libgmodule-1.1.la, libgplugin_a.la and libgplugin_b.la
+       since this clashes with inter-library-dependencies for not installed
+       libraries. glib-config takes care of this for the usuall case, but
+       there needs to be a better way...
+
 Sun Aug  9 15:57:38 1998  Tim Janik  <timj@gtk.org>
 
        * testgmodule.c: test program for GModule.

diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am
index 5b6806f9ac13cfeec72ac914d7fec266056d5ab0..8cc23a5885eaaebb511c20d230794909d22488ce 100644 (file)
--- a/gmodule/Makefile.am
+++ b/gmodule/Makefile.am
@@ -11,23 +11,27 @@ gmoduleconf.h:      gmoduleconf.h.in
 include_HEADERS = \
                gmodule.h
 
+libglib = $(top_builddir)/libglib-@LT_RELEASE@.la # -lglib-@LT_RELEASE@
+
 lib_LTLIBRARIES = libgmodule-1.1.la libgplugin_a.la libgplugin_b.la
 
 libgmodule_1_1_la_SOURCES = gmodule.c
 libgmodule_1_1_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libgmodule_1_1_la_LIBADD = @G_MODULE_LIBS@ -lglib-@LT_RELEASE@
+libgmodule_1_1_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
+# we should really depend on $(libglib) for libgmodule-1.1.la, but libtool has a
+# problem with this ;(
 
 libgplugin_a_la_SOURCES = libgplugin_a.c
 libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@
-libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ -lglib-@LT_RELEASE@
+libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
 
 libgplugin_b_la_SOURCES = libgplugin_b.c
 libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@
-libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ -lglib-@LT_RELEASE@
+libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
 
 noinst_PROGRAMS = testgmodule
 testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
-testgmodule_LDADD = libgmodule-@LT_RELEASE@.la -lglib-@LT_RELEASE@ @G_MODULE_LIBS@
+testgmodule_LDADD = libgmodule-@LT_RELEASE@.la $(libglib) @G_MODULE_LIBS@
 
 .PHONY: files release
 

diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c
index a883ace18e4be205c8b652bbbdd91dec1f59dc61..6d9083001b79652af96f34a2593248ebb511351b 100644 (file)
--- a/gmodule/gmodule.c
+++ b/gmodule/gmodule.c
@@ -189,12 +189,12 @@ g_module_open (const gchar    *file_name,
       modules = module;
 
       /* check initialization */
-      if (g_module_symbol (module, "g_module_check_init", &check_init))
+      if (g_module_symbol (module, "g_module_check_init", (gpointer) &check_init))
        check_failed = check_init (module);
 
       /* we don't call de_init() if the initialization check failed. */
       if (!check_failed)
-       g_module_symbol (module, "g_module_de_init", &module->de_init);
+       g_module_symbol (module, "g_module_de_init", (gpointer) &module->de_init);
 
       if (check_failed)
        {