From 8f69a82ccba8bb23ece458d9e6bc7f8948f5a533 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 10 Mar 2001 20:03:53 +0000 Subject: [PATCH] Use the _LIBADD dependencies on libglib only on Win32. 2001-03-10 Tor Lillqvist * */Makefile.am: Use the _LIBADD dependencies on libglib only on Win32. * gobject/gobject.def: Add a couple of missing entries. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gmodule/ChangeLog | 5 +++++ gmodule/Makefile.am | 9 ++++----- gobject/ChangeLog | 6 ++++++ gobject/Makefile.am | 3 +++ gobject/gobject.def | 2 ++ gthread/ChangeLog | 5 +++++ gthread/Makefile.am | 3 ++- tests/Makefile.am | 13 +++++++------ 16 files changed, 74 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4394d4d8..48ded5b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-03-10 Tor Lillqvist + + * tests/Makefile.am: Use the _LIBADD dependency on libglib only on + Win32. + 2001-03-09 Tor Lillqvist * README.win32: Update with some information about using configure diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 4394d4d8..48ded5b6 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2001-03-10 Tor Lillqvist + + * tests/Makefile.am: Use the _LIBADD dependency on libglib only on + Win32. + 2001-03-09 Tor Lillqvist * README.win32: Update with some information about using configure diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4394d4d8..48ded5b6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2001-03-10 Tor Lillqvist + + * tests/Makefile.am: Use the _LIBADD dependency on libglib only on + Win32. + 2001-03-09 Tor Lillqvist * README.win32: Update with some information about using configure diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 4394d4d8..48ded5b6 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2001-03-10 Tor Lillqvist + + * tests/Makefile.am: Use the _LIBADD dependency on libglib only on + Win32. + 2001-03-09 Tor Lillqvist * README.win32: Update with some information about using configure diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 4394d4d8..48ded5b6 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2001-03-10 Tor Lillqvist + + * tests/Makefile.am: Use the _LIBADD dependency on libglib only on + Win32. + 2001-03-09 Tor Lillqvist * README.win32: Update with some information about using configure diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4394d4d8..48ded5b6 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2001-03-10 Tor Lillqvist + + * tests/Makefile.am: Use the _LIBADD dependency on libglib only on + Win32. + 2001-03-09 Tor Lillqvist * README.win32: Update with some information about using configure diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4394d4d8..48ded5b6 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2001-03-10 Tor Lillqvist + + * tests/Makefile.am: Use the _LIBADD dependency on libglib only on + Win32. + 2001-03-09 Tor Lillqvist * README.win32: Update with some information about using configure diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4394d4d8..48ded5b6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2001-03-10 Tor Lillqvist + + * tests/Makefile.am: Use the _LIBADD dependency on libglib only on + Win32. + 2001-03-09 Tor Lillqvist * README.win32: Update with some information about using configure diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog index bd8021e1..2404ec13 100644 --- a/gmodule/ChangeLog +++ b/gmodule/ChangeLog @@ -1,3 +1,8 @@ +2001-03-10 Tor Lillqvist + + * Makefile.am: Use the _LIBADD dependency on libglib only on the + Win32 platform (including Cygwin). + 2001-03-07 Sebastian Wilhelmi * Makefile.am, makefile.mingw.in, makefile.msc.in: Set diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index 19ad51d5..b724fae2 100644 --- a/gmodule/Makefile.am +++ b/gmodule/Makefile.am @@ -35,6 +35,7 @@ top_builddir_full=`cd \$(top_builddir); pwd` lib_LTLIBRARIES = libgmodule-1.3.la libgplugin_a.la libgplugin_b.la if PLATFORM_WIN32 +libadd_libglib = $(libglib) no_undefined = -no-undefined endif if OS_WIN32 @@ -47,17 +48,15 @@ libgmodule_1_3_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -export-dynamic $(no_undefined) $(export_symbols) -libgmodule_1_3_la_LIBADD = @G_MODULE_LIBS_EXTRA@ @G_MODULE_LIBS@ $(libglib) -# we should really depend on $(libglib) for libgmodule.la, but libtool has a -# problem with this ;( Ummm? Does it? +libgmodule_1_3_la_LIBADD = @G_MODULE_LIBS_EXTRA@ @G_MODULE_LIBS@ $(libadd_libglib) libgplugin_a_la_SOURCES = libgplugin_a.c libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined) -libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_LIBS@ libgmodule-1.3.la $(libglib) +libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_LIBS@ libgmodule-1.3.la $(libadd_libglib) libgplugin_b_la_SOURCES = libgplugin_b.c libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined) -libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_LIBS@ libgmodule-1.3.la $(libglib) +libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_LIBS@ libgmodule-1.3.la $(libadd_libglib) noinst_PROGRAMS = testgmodule testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@ diff --git a/gobject/ChangeLog b/gobject/ChangeLog index ada4431a..65283dc0 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,9 @@ +2001-03-10 Tor Lillqvist + + * gobject.def: Add a couple of missing entries. + + * Makefile.am (libgobject_1_3_la_LIBADD): Use only on Win32. + Fri Mar 9 14:57:17 2001 Tim Janik * testgruntime.c: test program. covers run first/last/cleanup signal diff --git a/gobject/Makefile.am b/gobject/Makefile.am index 61cabe7f..2e02e112 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -29,7 +29,10 @@ libgobject_1_3_la_LDFLAGS = @STRIP_BEGIN@ \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -export-dynamic $(no_undefined) $(export_symbols) \ @STRIP_END@ + +if PLATFORM_WIN32 libgobject_1_3_la_LIBADD = $(libglib) +endif # # setup source file variables diff --git a/gobject/gobject.def b/gobject/gobject.def index d4ebd4cc..fe1565a5 100644 --- a/gobject/gobject.def +++ b/gobject/gobject.def @@ -5,6 +5,7 @@ EXPORTS g_bsearch_array_insert g_bsearch_array_remove g_bsearch_array_remove_node + g_cclosure_marshal_STRING__OBJECT_POINTER g_cclosure_marshal_VOID__INT g_cclosure_marshal_VOID__POINTER g_cclosure_marshal_VOID__UINT @@ -208,6 +209,7 @@ EXPORTS g_value_set_static_boxed g_value_set_static_string g_value_set_string + g_value_set_string_take_ownership g_value_set_uchar g_value_set_uint g_value_set_ulong diff --git a/gthread/ChangeLog b/gthread/ChangeLog index 9aab5a8d..7fae2394 100644 --- a/gthread/ChangeLog +++ b/gthread/ChangeLog @@ -1,3 +1,8 @@ +2001-03-10 Tor Lillqvist + + * Makefile.am: Use the _LIBADD dependency on libglib only on + Win32. + 2001-02-21 Tor Lillqvist * Makefile.am: Use libglib-1.3.la from top_builddir. Invoke diff --git a/gthread/Makefile.am b/gthread/Makefile.am index 4780748d..485247a6 100644 --- a/gthread/Makefile.am +++ b/gthread/Makefile.am @@ -25,6 +25,7 @@ top_builddir_full=`cd \$(top_builddir); pwd` lib_LTLIBRARIES = libgthread-1.3.la if PLATFORM_WIN32 +libadd_libglib = $(libglib) no_undefined = -no-undefined endif if OS_WIN32 @@ -36,7 +37,7 @@ libgthread_1_3_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -export-dynamic $(no_undefined) $(export_symbols) -libgthread_1_3_la_LIBADD = @G_THREAD_LIBS_EXTRA@ @G_THREAD_LIBS@ $(libglib) +libgthread_1_3_la_LIBADD = @G_THREAD_LIBS_EXTRA@ @G_THREAD_LIBS@ $(libadd_libglib) gthread.rc: $(top_builddir)/config.status $(top_srcdir)/gthread/gthread.rc.in cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/tests/Makefile.am b/tests/Makefile.am index 3c33e60e..5029d513 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,3 @@ -if PLATFORM_WIN32 -no_undefined = -no-undefined -endif - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gmodule @GLIB_DEBUG_FLAGS@ EFENCE= @@ -11,6 +7,11 @@ libgthread = $(top_builddir)/gthread/libgthread-1.3.la libgmodule = $(top_builddir)/gmodule/libgmodule-1.3.la libgobject = $(top_builddir)/gobject/libgobject-1.3.la +if PLATFORM_WIN32 +libadd_libglib = $(libglib) +no_undefined = -no-undefined +endif + EXTRA_DIST = \ $(test_scripts) \ makefile.msc.in \ @@ -90,11 +91,11 @@ install-libLTLIBRARIES: libmoduletestplugin_a_la_SOURCES = libmoduletestplugin_a.c libmoduletestplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined) -libmoduletestplugin_a_la_LIBADD = @G_MODULE_LIBS@ $(libgmodule) $(libglib) +libmoduletestplugin_a_la_LIBADD = @G_MODULE_LIBS@ $(libgmodule) $(libadd_libglib) libmoduletestplugin_b_la_SOURCES = libmoduletestplugin_b.c libmoduletestplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined) -libmoduletestplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libgmodule) $(libglib) +libmoduletestplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libgmodule) $(libadd_libglib) makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/tests/makefile.mingw.in cd $(top_builddir) && CONFIG_FILES=tests/$@ CONFIG_HEADERS= $(SHELL) ./config.status -- 2.34.1