From: Tor Lillqvist Date: Fri, 2 Nov 2001 22:56:59 +0000 (+0000) Subject: Use -no-undefined on Windows. Look for .dll or .so as appropriate as X-Git-Url: http://pileus.org/git/?p=~andy%2Fgtk;a=commitdiff_plain;h=1d15be159965ca4465127a3d1f7833a47080fa5a Use -no-undefined on Windows. Look for .dll or .so as appropriate as 2001-11-03 Tor Lillqvist * 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 * 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 * 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. --- diff --git a/ChangeLog b/ChangeLog index b1f93fd11..86286a380 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +2001-11-03 Tor Lillqvist + + * 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 + + * 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 + + * 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. + Fri Nov 2 16:45:17 2001 Jonathan Blandford * gtk/gtkrbtree.c (_gtk_rbtree_remove_node): Clean up height code @@ -173,7 +195,6 @@ Thu Nov 1 00:44:50 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_class_init): Support Shift, Control, and Shift|Control L<->R, #63475 ->>>>>>> 1.2518 Wed Oct 31 18:53:51 2001 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index b1f93fd11..86286a380 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,25 @@ +2001-11-03 Tor Lillqvist + + * 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 + + * 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 + + * 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. + Fri Nov 2 16:45:17 2001 Jonathan Blandford * gtk/gtkrbtree.c (_gtk_rbtree_remove_node): Clean up height code @@ -173,7 +195,6 @@ Thu Nov 1 00:44:50 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_class_init): Support Shift, Control, and Shift|Control L<->R, #63475 ->>>>>>> 1.2518 Wed Oct 31 18:53:51 2001 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b1f93fd11..86286a380 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,25 @@ +2001-11-03 Tor Lillqvist + + * 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 + + * 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 + + * 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. + Fri Nov 2 16:45:17 2001 Jonathan Blandford * gtk/gtkrbtree.c (_gtk_rbtree_remove_node): Clean up height code @@ -173,7 +195,6 @@ Thu Nov 1 00:44:50 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_class_init): Support Shift, Control, and Shift|Control L<->R, #63475 ->>>>>>> 1.2518 Wed Oct 31 18:53:51 2001 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b1f93fd11..86286a380 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,25 @@ +2001-11-03 Tor Lillqvist + + * 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 + + * 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 + + * 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. + Fri Nov 2 16:45:17 2001 Jonathan Blandford * gtk/gtkrbtree.c (_gtk_rbtree_remove_node): Clean up height code @@ -173,7 +195,6 @@ Thu Nov 1 00:44:50 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_class_init): Support Shift, Control, and Shift|Control L<->R, #63475 ->>>>>>> 1.2518 Wed Oct 31 18:53:51 2001 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b1f93fd11..86286a380 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,25 @@ +2001-11-03 Tor Lillqvist + + * 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 + + * 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 + + * 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. + Fri Nov 2 16:45:17 2001 Jonathan Blandford * gtk/gtkrbtree.c (_gtk_rbtree_remove_node): Clean up height code @@ -173,7 +195,6 @@ Thu Nov 1 00:44:50 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_class_init): Support Shift, Control, and Shift|Control L<->R, #63475 ->>>>>>> 1.2518 Wed Oct 31 18:53:51 2001 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b1f93fd11..86286a380 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,25 @@ +2001-11-03 Tor Lillqvist + + * 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 + + * 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 + + * 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. + Fri Nov 2 16:45:17 2001 Jonathan Blandford * gtk/gtkrbtree.c (_gtk_rbtree_remove_node): Clean up height code @@ -173,7 +195,6 @@ Thu Nov 1 00:44:50 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_class_init): Support Shift, Control, and Shift|Control L<->R, #63475 ->>>>>>> 1.2518 Wed Oct 31 18:53:51 2001 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b1f93fd11..86286a380 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,25 @@ +2001-11-03 Tor Lillqvist + + * 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 + + * 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 + + * 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. + Fri Nov 2 16:45:17 2001 Jonathan Blandford * gtk/gtkrbtree.c (_gtk_rbtree_remove_node): Clean up height code @@ -173,7 +195,6 @@ Thu Nov 1 00:44:50 2001 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_class_init): Support Shift, Control, and Shift|Control L<->R, #63475 ->>>>>>> 1.2518 Wed Oct 31 18:53:51 2001 Jonathan Blandford * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): fix diff --git a/Makefile.am b/Makefile.am index 4dac8bafe..fbf33ab52 100644 --- a/Makefile.am +++ b/Makefile.am @@ -149,11 +149,11 @@ install-data-hook: (cd $(DESTDIR)$(pkgconfigdir) && \ test -e gdk-$(DEFAULT_GDKTARGET)-2.0.pc && \ test -e gtk+-$(DEFAULT_GDKTARGET)-2.0.pc && \ - $(LN_S) -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc gdk-2.0.pc && \ - $(LN_S) -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc gtk+-2.0.pc) || \ + cp -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc gdk-2.0.pc && \ + cp -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc gtk+-2.0.pc) || \ (cd $(DESTDIR)$(pkgconfigdir) && \ - $(LN_S) -f gdk-$(GDKTARGET)-2.0.pc gdk-2.0.pc && \ - $(LN_S) -f gtk+-$(GDKTARGET)-2.0.pc gtk+-2.0.pc) + cp -f gdk-$(GDKTARGET)-2.0.pc gdk-2.0.pc && \ + cp -f gtk+-$(GDKTARGET)-2.0.pc gtk+-2.0.pc) dist-hook: gtk+.spec if test -e $(srcdir)/INSTALL.in && test -e $(srcdir)/README.in ; then \ diff --git a/gtk-zip.sh.in b/gtk-zip.sh.in index 97935b3f3..ac5c485f3 100755 --- a/gtk-zip.sh.in +++ b/gtk-zip.sh.in @@ -16,15 +16,18 @@ lib/libgdk_pixbuf-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@ lib/libgdk_pixbuf-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.dll.a lib/gdk_pixbuf-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.lib lib/libgdk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll -lib/libgdk-win32.dll.a -lib/gdk-win32.lib +lib/libgdk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.dll.a +lib/gdk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.lib lib/libgtk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll -lib/libgtk-win32.dll.a -lib/gtk-win32.lib +lib/libgtk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.dll.a +lib/gtk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.lib lib/gtk-2.0 lib/pkgconfig/gdk-pixbuf-2.0.pc lib/pkgconfig/gdk-2.0.pc +lib/pkgconfig/gdk-win32-2.0.pc lib/pkgconfig/gtk+-2.0.pc +lib/pkgconfig/gtk+-win32-2.0.pc +share/aclocal/gtk-2.0.m4 EOF zip -r $ZIP lib/locale/*/LC_MESSAGES/gtk20.mo diff --git a/gtk/gtk.def b/gtk/gtk.def index 259e0e17a..2a20f0645 100755 --- a/gtk/gtk.def +++ b/gtk/gtk.def @@ -1848,6 +1848,7 @@ EXPORTS gtk_tree_view_collapse_row gtk_tree_view_column_add_attribute gtk_tree_view_column_cell_draw_focus + gtk_tree_view_column_cell_event gtk_tree_view_column_cell_focus gtk_tree_view_column_cell_get_size gtk_tree_view_column_cell_is_visible @@ -2007,6 +2008,7 @@ EXPORTS gtk_widget_ensure_style gtk_widget_event gtk_widget_freeze_child_notify + gtk_widget_get_accessible gtk_widget_get_ancestor gtk_widget_get_child_requisition gtk_widget_get_child_visible diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 204eb8214..806896adf 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -53,6 +53,7 @@ #include "gtkthemes.h" #include "gtkintl.h" #include "gtkiconfactory.h" +#include "gtkprivate.h" #include "gtksettings.h" #include "gtkwindow.h" @@ -304,7 +305,7 @@ gtk_rc_make_default_dir (const gchar *type) if (var) path = g_build_filename (var, "lib", "gtk-2.0", type, GTK_BINARY_VERSION, NULL); else - path = g_build_filename (GTK_LIBDIR, "gtk-2.0,", type, GTK_BINARY_VERSION, NULL); + path = g_build_filename (GTK_LIBDIR, "gtk-2.0", type, GTK_BINARY_VERSION, NULL); return path; } diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index 5f9fbf894..f3c8d8725 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 diff --git a/po/ChangeLog b/po/ChangeLog index e3ee6c193..54a78e7b4 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2001-11-03 Tor Lillqvist + + * makefile.mingw: Update according to my current conventions. + 2001-10-24 Stanislav Visnovsky * sk.po: More updates. diff --git a/po/makefile.mingw b/po/makefile.mingw index 21f406901..e40ad35ff 100644 --- a/po/makefile.mingw +++ b/po/makefile.mingw @@ -5,21 +5,19 @@ ## To convert the clear-text message catalogs to binary form (.gmo) ## files you will need msgfmt, from GNU gettext. -# This file is included from other po directories, too. -# They should define their own PACKAGE and possibly INSTALLSUBDIR -# and LOCALEDIR macros +# This file is possibly included from other po directories, too. They +# should define their own PACKAGE and possibly INSTALLSUBDIR and +# LOCALEDIR macros ifndef PACKAGE PACKAGE = gtk20 endif -ifndef INSTALLSUBDIR -INSTALLSUBDIR = $(PACKAGE) -endif + ifndef LOCALEDIR # This is what I use as installation target, from where the installer-builder # will pick it up. The end-user installation location will be asked by -# the installer (typically %WinDir%\gtk+). -LOCALEDIR = /install/$(INSTALLSUBDIR)/locale +# an installer. +LOCALEDIR = /target/lib/locale endif LANGUAGES = $(subst .po,,$(wildcard *.po))