luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-03 20:46:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use the _LIBADD dependencies on libglib only on Win32.

Browse Source 
2001-03-10  Tor Lillqvist  <tml@iki.fi>

	* */Makefile.am: Use the _LIBADD dependencies on libglib only on
	Win32.

	* gobject/gobject.def: Add a couple of missing entries.
This commit is contained in:
Tor Lillqvist 2001-03-10 20:03:53 +00:00 committed by Tor Lillqvist
parent c54732d0ea
commit 8f69a82ccb
16 changed files with 74 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2001-03-10 Tor Lillqvist <tml@iki.fi>
* tests/Makefile.am: Use the _LIBADD dependency on libglib only on
Win32.
2001-03-09 Tor Lillqvist <tml@iki.fi> 2001-03-09 Tor Lillqvist <tml@iki.fi>
* README.win32: Update with some information about using configure * README.win32: Update with some information about using configure

5
ChangeLog.pre-2-0
View File

@ -1,3 +1,8 @@
2001-03-10 Tor Lillqvist <tml@iki.fi>
* tests/Makefile.am: Use the _LIBADD dependency on libglib only on
Win32.
2001-03-09 Tor Lillqvist <tml@iki.fi> 2001-03-09 Tor Lillqvist <tml@iki.fi>
* README.win32: Update with some information about using configure * README.win32: Update with some information about using configure

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2001-03-10 Tor Lillqvist <tml@iki.fi>
* tests/Makefile.am: Use the _LIBADD dependency on libglib only on
Win32.
2001-03-09 Tor Lillqvist <tml@iki.fi> 2001-03-09 Tor Lillqvist <tml@iki.fi>
* README.win32: Update with some information about using configure * README.win32: Update with some information about using configure

5
ChangeLog.pre-2-12
View File

@ -1,3 +1,8 @@
2001-03-10 Tor Lillqvist <tml@iki.fi>
* tests/Makefile.am: Use the _LIBADD dependency on libglib only on
Win32.
2001-03-09 Tor Lillqvist <tml@iki.fi> 2001-03-09 Tor Lillqvist <tml@iki.fi>
* README.win32: Update with some information about using configure * README.win32: Update with some information about using configure

5
ChangeLog.pre-2-2
View File

@ -1,3 +1,8 @@
2001-03-10 Tor Lillqvist <tml@iki.fi>
* tests/Makefile.am: Use the _LIBADD dependency on libglib only on
Win32.
2001-03-09 Tor Lillqvist <tml@iki.fi> 2001-03-09 Tor Lillqvist <tml@iki.fi>
* README.win32: Update with some information about using configure * README.win32: Update with some information about using configure

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
2001-03-10 Tor Lillqvist <tml@iki.fi>
* tests/Makefile.am: Use the _LIBADD dependency on libglib only on
Win32.
2001-03-09 Tor Lillqvist <tml@iki.fi> 2001-03-09 Tor Lillqvist <tml@iki.fi>
* README.win32: Update with some information about using configure * README.win32: Update with some information about using configure

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
2001-03-10 Tor Lillqvist <tml@iki.fi>
* tests/Makefile.am: Use the _LIBADD dependency on libglib only on
Win32.
2001-03-09 Tor Lillqvist <tml@iki.fi> 2001-03-09 Tor Lillqvist <tml@iki.fi>
* README.win32: Update with some information about using configure * README.win32: Update with some information about using configure

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
2001-03-10 Tor Lillqvist <tml@iki.fi>
* tests/Makefile.am: Use the _LIBADD dependency on libglib only on
Win32.
2001-03-09 Tor Lillqvist <tml@iki.fi> 2001-03-09 Tor Lillqvist <tml@iki.fi>
* README.win32: Update with some information about using configure * README.win32: Update with some information about using configure

5
gmodule/ChangeLog
View File

@ -1,3 +1,8 @@
2001-03-10 Tor Lillqvist <tml@iki.fi>
* Makefile.am: Use the _LIBADD dependency on libglib only on the
Win32 platform (including Cygwin).
2001-03-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2001-03-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* Makefile.am, makefile.mingw.in, makefile.msc.in: Set * Makefile.am, makefile.mingw.in, makefile.msc.in: Set

9
gmodule/Makefile.am
View File

@ -35,6 +35,7 @@ top_builddir_full=`cd \$(top_builddir); pwd`
lib_LTLIBRARIES = libgmodule-1.3.la libgplugin_a.la libgplugin_b.la lib_LTLIBRARIES = libgmodule-1.3.la libgplugin_a.la libgplugin_b.la
if PLATFORM_WIN32 if PLATFORM_WIN32
libadd_libglib = $(libglib)
no_undefined = -no-undefined no_undefined = -no-undefined
endif endif
if OS_WIN32 if OS_WIN32
@ -47,17 +48,15 @@ libgmodule_1_3_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic $(no_undefined) $(export_symbols) -export-dynamic $(no_undefined) $(export_symbols)
libgmodule_1_3_la_LIBADD = @G_MODULE_LIBS_EXTRA@ @G_MODULE_LIBS@ $(libglib) libgmodule_1_3_la_LIBADD = @G_MODULE_LIBS_EXTRA@ @G_MODULE_LIBS@ $(libadd_libglib)
# we should really depend on $(libglib) for libgmodule.la, but libtool has a
# problem with this ;( Ummm? Does it?
libgplugin_a_la_SOURCES = libgplugin_a.c libgplugin_a_la_SOURCES = libgplugin_a.c
libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined) 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_SOURCES = libgplugin_b.c
libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined) 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 noinst_PROGRAMS = testgmodule
testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@ testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@

6
gobject/ChangeLog
View File

@ -1,3 +1,9 @@
2001-03-10 Tor Lillqvist <tml@iki.fi>
* 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 <timj@gtk.org> Fri Mar 9 14:57:17 2001 Tim Janik <timj@gtk.org>
* testgruntime.c: test program. covers run first/last/cleanup signal * testgruntime.c: test program. covers run first/last/cleanup signal

3
gobject/Makefile.am
View File

@ -29,7 +29,10 @@ libgobject_1_3_la_LDFLAGS = @STRIP_BEGIN@ \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic $(no_undefined) $(export_symbols) \ -export-dynamic $(no_undefined) $(export_symbols) \
@STRIP_END@ @STRIP_END@
if PLATFORM_WIN32
libgobject_1_3_la_LIBADD = $(libglib) libgobject_1_3_la_LIBADD = $(libglib)
endif
# #
# setup source file variables # setup source file variables

2
gobject/gobject.def
View File

@ -5,6 +5,7 @@ EXPORTS
g_bsearch_array_insert g_bsearch_array_insert
g_bsearch_array_remove g_bsearch_array_remove
g_bsearch_array_remove_node g_bsearch_array_remove_node
g_cclosure_marshal_STRING__OBJECT_POINTER
g_cclosure_marshal_VOID__INT g_cclosure_marshal_VOID__INT
g_cclosure_marshal_VOID__POINTER g_cclosure_marshal_VOID__POINTER
g_cclosure_marshal_VOID__UINT g_cclosure_marshal_VOID__UINT
@ -208,6 +209,7 @@ EXPORTS
g_value_set_static_boxed g_value_set_static_boxed
g_value_set_static_string g_value_set_static_string
g_value_set_string g_value_set_string
g_value_set_string_take_ownership
g_value_set_uchar g_value_set_uchar
g_value_set_uint g_value_set_uint
g_value_set_ulong g_value_set_ulong

5
gthread/ChangeLog
View File

@ -1,3 +1,8 @@
2001-03-10 Tor Lillqvist <tml@iki.fi>
* Makefile.am: Use the _LIBADD dependency on libglib only on
Win32.
2001-02-21 Tor Lillqvist <tml@iki.fi> 2001-02-21 Tor Lillqvist <tml@iki.fi>
* Makefile.am: Use libglib-1.3.la from top_builddir. Invoke * Makefile.am: Use libglib-1.3.la from top_builddir. Invoke

3
gthread/Makefile.am
View File

@ -25,6 +25,7 @@ top_builddir_full=`cd \$(top_builddir); pwd`
lib_LTLIBRARIES = libgthread-1.3.la lib_LTLIBRARIES = libgthread-1.3.la
if PLATFORM_WIN32 if PLATFORM_WIN32
libadd_libglib = $(libglib)
no_undefined = -no-undefined no_undefined = -no-undefined
endif endif
if OS_WIN32 if OS_WIN32
@ -36,7 +37,7 @@ libgthread_1_3_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic $(no_undefined) $(export_symbols) -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 gthread.rc: $(top_builddir)/config.status $(top_srcdir)/gthread/gthread.rc.in
cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status

13
tests/Makefile.am
View File

@ -1,7 +1,3 @@
if PLATFORM_WIN32
no_undefined = -no-undefined
endif
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gmodule @GLIB_DEBUG_FLAGS@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gmodule @GLIB_DEBUG_FLAGS@
EFENCE= EFENCE=
@ -11,6 +7,11 @@ libgthread = $(top_builddir)/gthread/libgthread-1.3.la
libgmodule = $(top_builddir)/gmodule/libgmodule-1.3.la libgmodule = $(top_builddir)/gmodule/libgmodule-1.3.la
libgobject = $(top_builddir)/gobject/libgobject-1.3.la libgobject = $(top_builddir)/gobject/libgobject-1.3.la
if PLATFORM_WIN32
libadd_libglib = $(libglib)
no_undefined = -no-undefined
endif
EXTRA_DIST = \ EXTRA_DIST = \
$(test_scripts) \ $(test_scripts) \
makefile.msc.in \ makefile.msc.in \
@ -90,11 +91,11 @@ install-libLTLIBRARIES:
libmoduletestplugin_a_la_SOURCES = libmoduletestplugin_a.c libmoduletestplugin_a_la_SOURCES = libmoduletestplugin_a.c
libmoduletestplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined) 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_SOURCES = libmoduletestplugin_b.c
libmoduletestplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined) 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 makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/tests/makefile.mingw.in
cd $(top_builddir) && CONFIG_FILES=tests/$@ CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=tests/$@ CONFIG_HEADERS= $(SHELL) ./config.status