luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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...
This commit is contained in:
Tim Janik 1998-08-10 00:26:44 +00:00 committed by Tim Janik
parent d94e25520b
commit 52f1266e0a
13 changed files with 64 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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/.

5
ChangeLog.pre-2-0
View File

@ -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/.

5
ChangeLog.pre-2-10
View File

@ -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/.

5
ChangeLog.pre-2-12
View File

@ -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/.

5
ChangeLog.pre-2-2
View File

@ -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/.

5
ChangeLog.pre-2-4
View File

@ -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/.

5
ChangeLog.pre-2-6
View File

@ -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/.

5
ChangeLog.pre-2-8
View File

@ -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/.

3
Makefile.am
View File

@ -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 = \

3
glib/Makefile.am
View File

@ -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 = \

8
gmodule/ChangeLog
View File

@ -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.

12
gmodule/Makefile.am
View File

@ -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

4
gmodule/gmodule.c
View File

@ -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)
{