diff options
| author | Tor Lillqvist <tml@iki.fi> | 2001-11-02 22:56:59 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2001-11-02 22:56:59 +0000 |
| commit | 1d15be159965ca4465127a3d1f7833a47080fa5a (patch) | |
| tree | 900d5d8fad8cbfc5f3704a07cf32a8eacab8d312 /modules | |
| parent | 050625298e15a57543ffefcce79ef2bf8edcc184 (diff) | |
| download | gtk+-1d15be159965ca4465127a3d1f7833a47080fa5a.tar.gz | |
Use -no-undefined on Windows. Look for .dll or .so as appropriate as
2001-11-03 Tor Lillqvist <tml@iki.fi>
* modules/input/Makefile.am: Use -no-undefined on Windows. Look
for .dll or .so as appropriate as module suffix.
* gtk-zip.sh.in: Use correct import library names.
* gtk/gtk.def: Add a couple of missing entry points. (#63585)
2001-11-02 Tor Lillqvist <tml@iki.fi>
* gtk/gtkrc.c (gtk_rc_make_default_dir): Fix typo: extraneous
comma. Include gtkprivate.h for GTK_LIBDIR etc definitions on
Windows.
2001-10-30 Tor Lillqvist <tml@iki.fi>
* Makefile (install-data-hook): Use cp, not $(LN_S) on the .pc
files. Configure on Win32 (running on Cygwin) thinks symlinks
exist, but pkg-config is not necesarily a Cygwin program, and
doesn't understand them.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/input/Makefile.am | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index 5f9fbf8946..f3c8d87253 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -1,4 +1,11 @@ -## Makefile.am for gtk+/demos +## Makefile.am for gtk+/modules/input + +if PLATFORM_WIN32 +no_undefined = -no-undefined +SOSUFFIX=dll +else +SOSUFFIX=so +endif INCLUDES = @STRIP_BEGIN@ \ -I$(top_srcdir) \ @@ -24,7 +31,7 @@ LDADDS = @STRIP_BEGIN@ \ moduledir = $(libdir)/gtk-2.0/immodules/$(GTK_BINARY_VERSION) -im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module +im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_xim_la_SOURCES = \ gtkimcontextxim.c \ gtkimcontextxim.h \ @@ -34,23 +41,23 @@ if USE_X11 IM_XIM_MODULE=im-xim.la endif -im_cyrillic_translit_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module +im_cyrillic_translit_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_cyrillic_translit_la_SOURCES = imcyrillic-translit.c im_cyrillic_translit_la_LIBADD = $(LDADDS) -im_thai_broken_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module +im_thai_broken_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_thai_broken_la_SOURCES = imthai-broken.c im_thai_broken_la_LIBADD = $(LDADDS) -im_viqr_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module +im_viqr_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_viqr_la_SOURCES = imviqr.c im_viqr_la_LIBADD = $(LDADDS) -im_inuktitut_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module +im_inuktitut_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_inuktitut_la_SOURCES = iminuktitut.c im_inuktitut_la_LIBADD = $(LDADDS) -im_ipa_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module +im_ipa_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_ipa_la_SOURCES = imipa.c im_ipa_la_LIBADD = $(LDADDS) @@ -66,6 +73,6 @@ module_LTLIBRARIES = im-cyrillic-translit.la $(IM_XIM_MODULE) im-viqr.la im-thai im-inuktitut.la im-ipa.la gtk.immodules: Makefile.am $(module_LTLIBRARIES) - $(top_builddir)/gtk/gtk-query-immodules-2.0 .libs/*.so > gtk.immodules + $(top_builddir)/gtk/gtk-query-immodules-2.0 .libs/*.$(SOSUFFIX) > gtk.immodules all-local: gtk.immodules |