mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-10 03:16:17 +01:00
Link with the libgmodule la only on Win32.
2001-03-12 Tor Lillqvist <tml@iki.fi> * tests/Makefile.am (libmoduletestplugin_b_la_LIBADD, libmoduletestplugin_b_la_LIBADD): Link with the libgmodule la only on Win32. 2001-03-12 Tor Lillqvist <tml@iki.fi> * Makefile.am (libgplugin_a_la_LIBADD, libgplugin_b_la_LIBADD): Link with the libgmodule la only on Win32.
This commit is contained in:
parent
f3258dddca
commit
096ba91bdc
@ -1,3 +1,9 @@
|
||||
2001-03-12 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* tests/Makefile.am (libmoduletestplugin_b_la_LIBADD,
|
||||
libmoduletestplugin_b_la_LIBADD): Link with the libgmodule la only
|
||||
on Win32.
|
||||
|
||||
2001-03-10 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* glibconfig.h.win32.in: Define G_PLATFORM_WIN32 here, too.
|
||||
|
@ -1,3 +1,9 @@
|
||||
2001-03-12 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* tests/Makefile.am (libmoduletestplugin_b_la_LIBADD,
|
||||
libmoduletestplugin_b_la_LIBADD): Link with the libgmodule la only
|
||||
on Win32.
|
||||
|
||||
2001-03-10 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* glibconfig.h.win32.in: Define G_PLATFORM_WIN32 here, too.
|
||||
|
@ -1,3 +1,9 @@
|
||||
2001-03-12 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* tests/Makefile.am (libmoduletestplugin_b_la_LIBADD,
|
||||
libmoduletestplugin_b_la_LIBADD): Link with the libgmodule la only
|
||||
on Win32.
|
||||
|
||||
2001-03-10 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* glibconfig.h.win32.in: Define G_PLATFORM_WIN32 here, too.
|
||||
|
@ -1,3 +1,9 @@
|
||||
2001-03-12 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* tests/Makefile.am (libmoduletestplugin_b_la_LIBADD,
|
||||
libmoduletestplugin_b_la_LIBADD): Link with the libgmodule la only
|
||||
on Win32.
|
||||
|
||||
2001-03-10 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* glibconfig.h.win32.in: Define G_PLATFORM_WIN32 here, too.
|
||||
|
@ -1,3 +1,9 @@
|
||||
2001-03-12 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* tests/Makefile.am (libmoduletestplugin_b_la_LIBADD,
|
||||
libmoduletestplugin_b_la_LIBADD): Link with the libgmodule la only
|
||||
on Win32.
|
||||
|
||||
2001-03-10 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* glibconfig.h.win32.in: Define G_PLATFORM_WIN32 here, too.
|
||||
|
@ -1,3 +1,9 @@
|
||||
2001-03-12 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* tests/Makefile.am (libmoduletestplugin_b_la_LIBADD,
|
||||
libmoduletestplugin_b_la_LIBADD): Link with the libgmodule la only
|
||||
on Win32.
|
||||
|
||||
2001-03-10 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* glibconfig.h.win32.in: Define G_PLATFORM_WIN32 here, too.
|
||||
|
@ -1,3 +1,9 @@
|
||||
2001-03-12 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* tests/Makefile.am (libmoduletestplugin_b_la_LIBADD,
|
||||
libmoduletestplugin_b_la_LIBADD): Link with the libgmodule la only
|
||||
on Win32.
|
||||
|
||||
2001-03-10 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* glibconfig.h.win32.in: Define G_PLATFORM_WIN32 here, too.
|
||||
|
@ -1,3 +1,9 @@
|
||||
2001-03-12 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* tests/Makefile.am (libmoduletestplugin_b_la_LIBADD,
|
||||
libmoduletestplugin_b_la_LIBADD): Link with the libgmodule la only
|
||||
on Win32.
|
||||
|
||||
2001-03-10 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* glibconfig.h.win32.in: Define G_PLATFORM_WIN32 here, too.
|
||||
|
@ -1,3 +1,8 @@
|
||||
2001-03-12 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* Makefile.am (libgplugin_a_la_LIBADD, libgplugin_b_la_LIBADD):
|
||||
Link with the libgmodule la only on Win32.
|
||||
|
||||
2001-03-10 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* Makefile.am: Use the _LIBADD dependency on libglib only on the
|
||||
|
@ -36,6 +36,7 @@ lib_LTLIBRARIES = libgmodule-1.3.la libgplugin_a.la libgplugin_b.la
|
||||
|
||||
if PLATFORM_WIN32
|
||||
libadd_libglib = $(libglib)
|
||||
libadd_libgmodule = libgmodule-1.3.la
|
||||
no_undefined = -no-undefined
|
||||
endif
|
||||
if OS_WIN32
|
||||
@ -52,11 +53,11 @@ libgmodule_1_3_la_LIBADD = @G_MODULE_LIBS_EXTRA@ @G_MODULE_LIBS@ $(libadd_libgli
|
||||
|
||||
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 $(libadd_libglib)
|
||||
libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_LIBS@ $(libadd_libgmodule) $(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 $(libadd_libglib)
|
||||
libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_LIBS@ $(libadd_libgmodule) $(libadd_libglib)
|
||||
|
||||
noinst_PROGRAMS = testgmodule
|
||||
testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
|
||||
|
@ -8,6 +8,7 @@ libgmodule = $(top_builddir)/gmodule/libgmodule-1.3.la
|
||||
libgobject = $(top_builddir)/gobject/libgobject-1.3.la
|
||||
|
||||
if PLATFORM_WIN32
|
||||
libadd_libgmodule = $(libgmodule)
|
||||
libadd_libglib = $(libglib)
|
||||
no_undefined = -no-undefined
|
||||
endif
|
||||
@ -91,11 +92,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) $(libadd_libglib)
|
||||
libmoduletestplugin_a_la_LIBADD = @G_MODULE_LIBS@ $(libadd_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) $(libadd_libglib)
|
||||
libmoduletestplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libadd_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
|
||||
|
Loading…
Reference in New Issue
Block a user