diff -Nur gtk+-2.6.1-bak/aclocal.m4 gtk+-2.6.1/aclocal.m4 --- gtk+-2.6.1-bak/aclocal.m4 2005-01-08 15:15:07.000000000 +0900 +++ gtk+-2.6.1/aclocal.m4 2005-01-21 06:00:09.108224000 +0900 @@ -5980,7 +5980,7 @@ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ;; cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AIRTW]] /s/.* //'\'' | sort | uniq > $export_symbols' ;; *) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -6093,7 +6093,7 @@ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_AC_TAGVAR(always_export_symbols, $1)=no _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AIRTW]] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' diff -Nur gtk+-2.6.1-bak/configure gtk+-2.6.1/configure --- gtk+-2.6.1-bak/configure 2005-01-08 15:15:26.000000000 +0900 +++ gtk+-2.6.1/configure 2005-01-21 06:00:09.168310400 +0900 @@ -6845,7 +6845,7 @@ allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AIRTW] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' @@ -11311,7 +11311,7 @@ export_symbols_cmds_CXX="$ltdll_cmds" ;; cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AIRTW] /s/.* //'\'' | sort | uniq > $export_symbols' ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -30428,7 +30428,7 @@ fi - GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -user32 -limm32 -lshell32 -lole32 -luuid" + GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -user32 -limm32 -lshell32 -lole32 -Wl,-luuid" if true; then diff -Nur gtk+-2.6.1-bak/configure.in gtk+-2.6.1/configure.in --- gtk+-2.6.1-bak/configure.in 2004-12-27 15:13:07.000000000 +0900 +++ gtk+-2.6.1/configure.in 2005-01-21 06:00:09.178324800 +0900 @@ -1330,7 +1330,7 @@ AC_SUBST(GDK_WIN32_EXTRA_CFLAGS) fi - GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -user32 -limm32 -lshell32 -lole32 -luuid" + GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -user32 -limm32 -lshell32 -lole32 -Wl,-luuid" AM_CONDITIONAL(USE_WIN32, true) else AM_CONDITIONAL(USE_WIN32, false) diff -Nur gtk+-2.6.1-bak/docs/tools/Makefile.am gtk+-2.6.1/docs/tools/Makefile.am --- gtk+-2.6.1-bak/docs/tools/Makefile.am 2004-11-12 12:44:01.000000000 +0900 +++ gtk+-2.6.1/docs/tools/Makefile.am 2005-01-21 06:01:45.296536000 +0900 @@ -17,8 +17,8 @@ $(top_builddir)/gtk/$(gtktargetlib) if OS_UNIX -noinst_PROGRAMS = \ - doc-shooter +#noinst_PROGRAMS = \ +# doc-shooter endif doc_shooter_DEPENDENCIES = $(DEPS) diff -Nur gtk+-2.6.1-bak/docs/tools/Makefile.in gtk+-2.6.1/docs/tools/Makefile.in --- gtk+-2.6.1-bak/docs/tools/Makefile.in 2005-01-08 15:15:20.000000000 +0900 +++ gtk+-2.6.1/docs/tools/Makefile.in 2005-01-21 06:01:18.477972800 +0900 @@ -296,8 +296,8 @@ $(top_builddir)/gtk/$(gtktargetlib) -@OS_UNIX_TRUE@noinst_PROGRAMS = \ -@OS_UNIX_TRUE@ doc-shooter +#@OS_UNIX_TRUE@noinst_PROGRAMS = \ +#@OS_UNIX_TRUE@ doc-shooter doc_shooter_DEPENDENCIES = $(DEPS) @@ -314,8 +314,8 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -@OS_UNIX_TRUE@noinst_PROGRAMS = doc-shooter$(EXEEXT) -@OS_UNIX_FALSE@noinst_PROGRAMS = +#@OS_UNIX_TRUE@noinst_PROGRAMS = doc-shooter$(EXEEXT) +#@OS_UNIX_FALSE@noinst_PROGRAMS = PROGRAMS = $(noinst_PROGRAMS) am_doc_shooter_OBJECTS = shadow.$(OBJEXT) shooter.$(OBJEXT) \ diff -Nur gtk+-2.6.1-bak/gdk/Makefile.am gtk+-2.6.1/gdk/Makefile.am --- gtk+-2.6.1-bak/gdk/Makefile.am 2004-12-03 13:05:10.000000000 +0900 +++ gtk+-2.6.1/gdk/Makefile.am 2005-01-21 06:02:07.248100800 +0900 @@ -142,7 +142,7 @@ libgdk_win32_2_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS) \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la libgdk_win32_2_0_la_DEPENDENCIES = win32/libgdk-win32.la gdk.def -libgdk_win32_2_0_la_LDFLAGS = -export-symbols gdk.def $(LDADD) +libgdk_win32_2_0_la_LDFLAGS = $(LDADD) if HAVE_WINTAB libgdk_win32_2_0_la_LIBADD += -Lwin32 -lwntab32x endif diff -Nur gtk+-2.6.1-bak/gdk/Makefile.in gtk+-2.6.1/gdk/Makefile.in --- gtk+-2.6.1-bak/gdk/Makefile.in 2005-01-08 15:15:21.000000000 +0900 +++ gtk+-2.6.1/gdk/Makefile.in 2005-01-21 06:02:19.565812800 +0900 @@ -427,7 +427,7 @@ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la\ $(am__append_1) $(am__append_2) libgdk_win32_2_0_la_DEPENDENCIES = win32/libgdk-win32.la gdk.def -libgdk_win32_2_0_la_LDFLAGS = -export-symbols gdk.def $(LDADD) +libgdk_win32_2_0_la_LDFLAGS = $(LDADD) @MS_LIB_AVAILABLE_TRUE@noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib diff -Nur gtk+-2.6.1-bak/gtk/Makefile.am gtk+-2.6.1/gtk/Makefile.am --- gtk+-2.6.1-bak/gtk/Makefile.am 2005-01-03 08:15:21.000000000 +0900 +++ gtk+-2.6.1/gtk/Makefile.am 2005-01-21 06:02:32.614576000 +0900 @@ -38,7 +38,7 @@ if OS_WIN32 gtk_def = gtk.def -gtk_win32_symbols = -export-symbols $(gtk_def) +gtk_win32_symbols = gtk_win32res_lo = gtk-win32res.lo diff -Nur gtk+-2.6.1-bak/gtk/Makefile.in gtk+-2.6.1/gtk/Makefile.in --- gtk+-2.6.1-bak/gtk/Makefile.in 2005-01-08 15:15:22.000000000 +0900 +++ gtk+-2.6.1/gtk/Makefile.in 2005-01-21 06:02:43.940862400 +0900 @@ -316,7 +316,7 @@ @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined @OS_WIN32_TRUE@gtk_def = gtk.def -@OS_WIN32_TRUE@gtk_win32_symbols = -export-symbols $(gtk_def) +@OS_WIN32_TRUE@gtk_win32_symbols = @OS_WIN32_TRUE@gtk_win32res_lo = gtk-win32res.lo