GitLab repository storage has been migrated to hashed layout. Please contact Infrastructure team if you notice any issues with repositories or hooks.

Commit 52f1266e authored by Tim Janik's avatar Tim Janik Committed by Tim Janik

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...
parent d94e2552
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> Sun Aug 9 15:56:11 1998 Tim Janik <timj@gtk.org>
* configure.in: added GModule checks. generate files in gmodule/. * configure.in: added GModule checks. generate files in gmodule/.
......
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> Sun Aug 9 15:56:11 1998 Tim Janik <timj@gtk.org>
* configure.in: added GModule checks. generate files in gmodule/. * configure.in: added GModule checks. generate files in gmodule/.
......
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> Sun Aug 9 15:56:11 1998 Tim Janik <timj@gtk.org>
* configure.in: added GModule checks. generate files in gmodule/. * configure.in: added GModule checks. generate files in gmodule/.
......
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> Sun Aug 9 15:56:11 1998 Tim Janik <timj@gtk.org>
* configure.in: added GModule checks. generate files in gmodule/. * configure.in: added GModule checks. generate files in gmodule/.
......
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> Sun Aug 9 15:56:11 1998 Tim Janik <timj@gtk.org>
* configure.in: added GModule checks. generate files in gmodule/. * configure.in: added GModule checks. generate files in gmodule/.
......
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> Sun Aug 9 15:56:11 1998 Tim Janik <timj@gtk.org>
* configure.in: added GModule checks. generate files in gmodule/. * configure.in: added GModule checks. generate files in gmodule/.
......
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> Sun Aug 9 15:56:11 1998 Tim Janik <timj@gtk.org>
* configure.in: added GModule checks. generate files in gmodule/. * configure.in: added GModule checks. generate files in gmodule/.
......
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> Sun Aug 9 15:56:11 1998 Tim Janik <timj@gtk.org>
* configure.in: added GModule checks. generate files in gmodule/. * configure.in: added GModule checks. generate files in gmodule/.
......
...@@ -12,6 +12,9 @@ EXTRA_DIST = \ ...@@ -12,6 +12,9 @@ EXTRA_DIST = \
glib.m4 \ glib.m4 \
glib.spec glib.spec
# build . first, then SUBDIRS
all-recursive-am: all-am
lib_LTLIBRARIES = libglib-1.1.la lib_LTLIBRARIES = libglib-1.1.la
libglib_1_1_la_SOURCES = \ libglib_1_1_la_SOURCES = \
......
...@@ -12,6 +12,9 @@ EXTRA_DIST = \ ...@@ -12,6 +12,9 @@ EXTRA_DIST = \
glib.m4 \ glib.m4 \
glib.spec glib.spec
# build . first, then SUBDIRS
all-recursive-am: all-am
lib_LTLIBRARIES = libglib-1.1.la lib_LTLIBRARIES = libglib-1.1.la
libglib_1_1_la_SOURCES = \ libglib_1_1_la_SOURCES = \
......
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> Sun Aug 9 15:57:38 1998 Tim Janik <timj@gtk.org>
* testgmodule.c: test program for GModule. * testgmodule.c: test program for GModule.
......
...@@ -11,23 +11,27 @@ gmoduleconf.h: gmoduleconf.h.in ...@@ -11,23 +11,27 @@ gmoduleconf.h: gmoduleconf.h.in
include_HEADERS = \ include_HEADERS = \
gmodule.h gmodule.h
libglib = $(top_builddir)/libglib-@LT_RELEASE@.la # -lglib-@LT_RELEASE@
lib_LTLIBRARIES = libgmodule-1.1.la libgplugin_a.la libgplugin_b.la lib_LTLIBRARIES = libgmodule-1.1.la libgplugin_a.la libgplugin_b.la
libgmodule_1_1_la_SOURCES = gmodule.c 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_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_SOURCES = libgplugin_a.c
libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ 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_SOURCES = libgplugin_b.c
libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ 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 noinst_PROGRAMS = testgmodule
testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@ 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 .PHONY: files release
......
...@@ -189,12 +189,12 @@ g_module_open (const gchar *file_name, ...@@ -189,12 +189,12 @@ g_module_open (const gchar *file_name,
modules = module; modules = module;
/* check initialization */ /* 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); check_failed = check_init (module);
/* we don't call de_init() if the initialization check failed. */ /* we don't call de_init() if the initialization check failed. */
if (!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) if (check_failed)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment