diff options
| author | Tor Lillqvist <tml@iki.fi> | 2001-03-09 21:33:23 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2001-03-09 21:33:23 +0000 |
| commit | 8dd860987015d6be46bccab82ba00f03140f0396 (patch) | |
| tree | 30d2299a35f948d8102364bb743742892e6e8309 /gmodule/Makefile.am | |
| parent | 754d8ddad85ef7054bf262bbc57ee67a0278f493 (diff) | |
Use G_BEGIN_DECLS and G_END_DECLS. Define G_MODULE_EXPORT correctly on
2001-02-21 Tor Lillqvist <tml@iki.fi>
* gmodule.h: Use G_BEGIN_DECLS and G_END_DECLS. Define
G_MODULE_EXPORT correctly on Cygwin, too.
* gmodule-win32.c (_g_module_open): Convert path to Windows format
on Cygwin.
* Makefile.am (libglib): Use libglib-1.3.la from
top_builddir. Invoke libtool with -no-undefined for Win32 and
Cygwin.
Diffstat (limited to 'gmodule/Makefile.am')
| -rw-r--r-- | gmodule/Makefile.am | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index 7bac888a1..19ad51d59 100644 --- a/gmodule/Makefile.am +++ b/gmodule/Makefile.am @@ -28,29 +28,36 @@ glibincludedir=$(includedir)/glib-2.0 glibinclude_HEADERS = \ gmodule.h -libglib = $(top_builddir)/libglib-1.3.la # -lglib +libglib = $(top_builddir)/libglib-1.3.la top_builddir_full=`cd \$(top_builddir); pwd` lib_LTLIBRARIES = libgmodule-1.3.la libgplugin_a.la libgplugin_b.la +if PLATFORM_WIN32 +no_undefined = -no-undefined +endif +if OS_WIN32 +export_symbols = -export-symbols gmodule.def +endif + libgmodule_1_3_la_SOURCES = gmodule.c libgmodule_1_3_la_LDFLAGS = \ @G_MODULE_LDFLAGS@ \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-dynamic + -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@ $(libglib) # we should really depend on $(libglib) for libgmodule.la, but libtool has a -# problem with this ;( +# problem with this ;( Ummm? Does it? libgplugin_a_la_SOURCES = libgplugin_a.c -libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module -libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_LIBS@ # $(libglib) +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_b_la_SOURCES = libgplugin_b.c -libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module -libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_LIBS@ # $(libglib) +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) noinst_PROGRAMS = testgmodule testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@ |