]> Pileus Git - ~andy/gtk/commitdiff
Use correct DLL and import library names, with GTK_API_VERSION in name,
authorTor Lillqvist <tml@iki.fi>
Sun, 5 Jan 2003 02:24:15 +0000 (02:24 +0000)
committerTor Lillqvist <tml@src.gnome.org>
Sun, 5 Jan 2003 02:24:15 +0000 (02:24 +0000)
2003-01-05  Tor Lillqvist  <tml@iki.fi>

* gtk-zip.sh.in: Use correct DLL and import library names, with
GTK_API_VERSION in name, not GTK_MAJOR_VERSION.GTK_MINOR_VERSION.
(DEVZIP): Add gdk-pixbuf-query-loaders.exe.

* configure.in: Improve check for dimm.h.

* configure.in: Set SOEXT to 'so' on Unix, 'dll' on Win32. Used in
gdk-pixbuf/Makefile.am.

* gdk-pixbuf/makefile.mingw.in
* gdk-pixbuf/pixops/makefile.mingw.in
* gdk/makefile.mingw.in
* gdk/win32/makefile.mingw.in
* gtk/makefile.mingw.in: Remove. Not maintained anyway.

* gdk-pixbuf/Makefile.am
* gdk-pixbuf/pixops/Makefile.am
* gdk/Makefile.am
* gdk/win32/Makefile.am
* gtk/Makefile.am
* configure.in: Remove makefile.mingw{,.in} from here, too.

* README.win32: Updates. Don't mention the now removed
makefile.mingw files.

* gdk/gdk.def
* gtk/gtk.def: Add a couple of missing entries.

* gdk/gdkkeynames.c: Include <string.h> for strcmp() and memcpy().

* gdk/win32/gdkevents-win32.c: Move dimm.h header clash workaround
earlier.

* gdk/win32/rc/Makefile.am: Add hack to help
build/win32/lt-compile-resource decide which kind of libtool
object file to produce.

23 files changed:
ChangeLog
ChangeLog.pre-2-10
ChangeLog.pre-2-4
ChangeLog.pre-2-6
ChangeLog.pre-2-8
configure.in
gdk-pixbuf/ChangeLog
gdk-pixbuf/Makefile.am
gdk-pixbuf/makefile.mingw.in [deleted file]
gdk-pixbuf/pixops/Makefile.am
gdk-pixbuf/pixops/makefile.mingw.in [deleted file]
gdk/Makefile.am
gdk/gdk.def
gdk/gdkkeynames.c
gdk/makefile.mingw.in [deleted file]
gdk/win32/Makefile.am
gdk/win32/gdkevents-win32.c
gdk/win32/makefile.mingw.in [deleted file]
gdk/win32/rc/Makefile.am
gtk-zip.sh.in
gtk/Makefile.am
gtk/gtk.def
gtk/makefile.mingw.in [deleted file]

index 2333ed52eed0628eb272020dd4630dbec288c2ec..e46eba3c33c00f225006473fb49007259df71346 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+2003-01-05  Tor Lillqvist  <tml@iki.fi>
+
+       * gtk-zip.sh.in: Use correct DLL and import library names, with
+       GTK_API_VERSION in name, not GTK_MAJOR_VERSION.GTK_MINOR_VERSION.
+       (DEVZIP): Add gdk-pixbuf-query-loaders.exe.
+
+       * configure.in: Improve check for dimm.h.
+
+       * configure.in: Set SOEXT to 'so' on Unix, 'dll' on Win32. Used in
+       gdk-pixbuf/Makefile.am.
+
+       * gdk-pixbuf/makefile.mingw.in
+       * gdk-pixbuf/pixops/makefile.mingw.in
+       * gdk/makefile.mingw.in
+       * gdk/win32/makefile.mingw.in
+       * gtk/makefile.mingw.in: Remove. Not maintained anyway.
+
+       * gdk-pixbuf/Makefile.am
+       * gdk-pixbuf/pixops/Makefile.am
+       * gdk/Makefile.am
+       * gdk/win32/Makefile.am
+       * gtk/Makefile.am
+       * configure.in: Remove makefile.mingw{,.in} from here, too.
+       
+       * README.win32: Updates. Don't mention the now removed
+       makefile.mingw files.
+
+       * gdk/gdk.def
+       * gtk/gtk.def: Add a couple of missing entries.
+
+       * gdk/gdkkeynames.c: Include <string.h> for strcmp() and memcpy().
+
+       * gdk/win32/gdkevents-win32.c: Move dimm.h header clash workaround
+       earlier.
+
+       * gdk/win32/rc/Makefile.am: Add hack to help
+       build/win32/lt-compile-resource decide which kind of libtool
+       object file to produce.
+
 2003-01-05  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Make
index 2333ed52eed0628eb272020dd4630dbec288c2ec..e46eba3c33c00f225006473fb49007259df71346 100644 (file)
@@ -1,3 +1,42 @@
+2003-01-05  Tor Lillqvist  <tml@iki.fi>
+
+       * gtk-zip.sh.in: Use correct DLL and import library names, with
+       GTK_API_VERSION in name, not GTK_MAJOR_VERSION.GTK_MINOR_VERSION.
+       (DEVZIP): Add gdk-pixbuf-query-loaders.exe.
+
+       * configure.in: Improve check for dimm.h.
+
+       * configure.in: Set SOEXT to 'so' on Unix, 'dll' on Win32. Used in
+       gdk-pixbuf/Makefile.am.
+
+       * gdk-pixbuf/makefile.mingw.in
+       * gdk-pixbuf/pixops/makefile.mingw.in
+       * gdk/makefile.mingw.in
+       * gdk/win32/makefile.mingw.in
+       * gtk/makefile.mingw.in: Remove. Not maintained anyway.
+
+       * gdk-pixbuf/Makefile.am
+       * gdk-pixbuf/pixops/Makefile.am
+       * gdk/Makefile.am
+       * gdk/win32/Makefile.am
+       * gtk/Makefile.am
+       * configure.in: Remove makefile.mingw{,.in} from here, too.
+       
+       * README.win32: Updates. Don't mention the now removed
+       makefile.mingw files.
+
+       * gdk/gdk.def
+       * gtk/gtk.def: Add a couple of missing entries.
+
+       * gdk/gdkkeynames.c: Include <string.h> for strcmp() and memcpy().
+
+       * gdk/win32/gdkevents-win32.c: Move dimm.h header clash workaround
+       earlier.
+
+       * gdk/win32/rc/Makefile.am: Add hack to help
+       build/win32/lt-compile-resource decide which kind of libtool
+       object file to produce.
+
 2003-01-05  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Make
index 2333ed52eed0628eb272020dd4630dbec288c2ec..e46eba3c33c00f225006473fb49007259df71346 100644 (file)
@@ -1,3 +1,42 @@
+2003-01-05  Tor Lillqvist  <tml@iki.fi>
+
+       * gtk-zip.sh.in: Use correct DLL and import library names, with
+       GTK_API_VERSION in name, not GTK_MAJOR_VERSION.GTK_MINOR_VERSION.
+       (DEVZIP): Add gdk-pixbuf-query-loaders.exe.
+
+       * configure.in: Improve check for dimm.h.
+
+       * configure.in: Set SOEXT to 'so' on Unix, 'dll' on Win32. Used in
+       gdk-pixbuf/Makefile.am.
+
+       * gdk-pixbuf/makefile.mingw.in
+       * gdk-pixbuf/pixops/makefile.mingw.in
+       * gdk/makefile.mingw.in
+       * gdk/win32/makefile.mingw.in
+       * gtk/makefile.mingw.in: Remove. Not maintained anyway.
+
+       * gdk-pixbuf/Makefile.am
+       * gdk-pixbuf/pixops/Makefile.am
+       * gdk/Makefile.am
+       * gdk/win32/Makefile.am
+       * gtk/Makefile.am
+       * configure.in: Remove makefile.mingw{,.in} from here, too.
+       
+       * README.win32: Updates. Don't mention the now removed
+       makefile.mingw files.
+
+       * gdk/gdk.def
+       * gtk/gtk.def: Add a couple of missing entries.
+
+       * gdk/gdkkeynames.c: Include <string.h> for strcmp() and memcpy().
+
+       * gdk/win32/gdkevents-win32.c: Move dimm.h header clash workaround
+       earlier.
+
+       * gdk/win32/rc/Makefile.am: Add hack to help
+       build/win32/lt-compile-resource decide which kind of libtool
+       object file to produce.
+
 2003-01-05  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Make
index 2333ed52eed0628eb272020dd4630dbec288c2ec..e46eba3c33c00f225006473fb49007259df71346 100644 (file)
@@ -1,3 +1,42 @@
+2003-01-05  Tor Lillqvist  <tml@iki.fi>
+
+       * gtk-zip.sh.in: Use correct DLL and import library names, with
+       GTK_API_VERSION in name, not GTK_MAJOR_VERSION.GTK_MINOR_VERSION.
+       (DEVZIP): Add gdk-pixbuf-query-loaders.exe.
+
+       * configure.in: Improve check for dimm.h.
+
+       * configure.in: Set SOEXT to 'so' on Unix, 'dll' on Win32. Used in
+       gdk-pixbuf/Makefile.am.
+
+       * gdk-pixbuf/makefile.mingw.in
+       * gdk-pixbuf/pixops/makefile.mingw.in
+       * gdk/makefile.mingw.in
+       * gdk/win32/makefile.mingw.in
+       * gtk/makefile.mingw.in: Remove. Not maintained anyway.
+
+       * gdk-pixbuf/Makefile.am
+       * gdk-pixbuf/pixops/Makefile.am
+       * gdk/Makefile.am
+       * gdk/win32/Makefile.am
+       * gtk/Makefile.am
+       * configure.in: Remove makefile.mingw{,.in} from here, too.
+       
+       * README.win32: Updates. Don't mention the now removed
+       makefile.mingw files.
+
+       * gdk/gdk.def
+       * gtk/gtk.def: Add a couple of missing entries.
+
+       * gdk/gdkkeynames.c: Include <string.h> for strcmp() and memcpy().
+
+       * gdk/win32/gdkevents-win32.c: Move dimm.h header clash workaround
+       earlier.
+
+       * gdk/win32/rc/Makefile.am: Add hack to help
+       build/win32/lt-compile-resource decide which kind of libtool
+       object file to produce.
+
 2003-01-05  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Make
index 2333ed52eed0628eb272020dd4630dbec288c2ec..e46eba3c33c00f225006473fb49007259df71346 100644 (file)
@@ -1,3 +1,42 @@
+2003-01-05  Tor Lillqvist  <tml@iki.fi>
+
+       * gtk-zip.sh.in: Use correct DLL and import library names, with
+       GTK_API_VERSION in name, not GTK_MAJOR_VERSION.GTK_MINOR_VERSION.
+       (DEVZIP): Add gdk-pixbuf-query-loaders.exe.
+
+       * configure.in: Improve check for dimm.h.
+
+       * configure.in: Set SOEXT to 'so' on Unix, 'dll' on Win32. Used in
+       gdk-pixbuf/Makefile.am.
+
+       * gdk-pixbuf/makefile.mingw.in
+       * gdk-pixbuf/pixops/makefile.mingw.in
+       * gdk/makefile.mingw.in
+       * gdk/win32/makefile.mingw.in
+       * gtk/makefile.mingw.in: Remove. Not maintained anyway.
+
+       * gdk-pixbuf/Makefile.am
+       * gdk-pixbuf/pixops/Makefile.am
+       * gdk/Makefile.am
+       * gdk/win32/Makefile.am
+       * gtk/Makefile.am
+       * configure.in: Remove makefile.mingw{,.in} from here, too.
+       
+       * README.win32: Updates. Don't mention the now removed
+       makefile.mingw files.
+
+       * gdk/gdk.def
+       * gtk/gtk.def: Add a couple of missing entries.
+
+       * gdk/gdkkeynames.c: Include <string.h> for strcmp() and memcpy().
+
+       * gdk/win32/gdkevents-win32.c: Move dimm.h header clash workaround
+       earlier.
+
+       * gdk/win32/rc/Makefile.am: Add hack to help
+       build/win32/lt-compile-resource decide which kind of libtool
+       object file to produce.
+
 2003-01-05  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtktextview.c (gtk_text_view_move_cursor_internal): Make
index 991cb57a10160757820546d88b123c947c4a5535..167bc1de5b89a4a6aba588d42cb9bf7d8806adb4 100644 (file)
@@ -149,13 +149,16 @@ case "$host" in
   *-*-mingw*)
     os_win32=yes
     MATH_LIB=
+    SOEXT=dll
     ;;
   *)
     os_win32=no
+    SOEXT=so
     ;;
 esac
 AC_MSG_RESULT([$os_win32])
 AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
+AC_SUBST(SOEXT)
 
 if test "$os_win32" = "yes"; then
   AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
@@ -470,13 +473,15 @@ if test "${with_ie55+set}" = set && test $with_ie55 != no; then
   AC_MSG_CHECKING([for dimm.h])
   saved_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -idirafter $with_ie55/Include"
-  AC_TRY_COMPILE([#include <windows.h>
-#include <objbase.h>
+  AC_TRY_COMPILE([[/* The w32api imm.h clashes a bit with the IE5.5 dimm.h */
 #ifdef __GNUC__
-/* The w32api imm.h clashes a bit with the IE5.5 dimm.h */
 #define IMEMENUITEMINFOA hidden_IMEMENUITEMINFOA
 #define IMEMENUITEMINFOW hidden_IMEMENUITEMINFOW
+#endif
+#include <windows.h>
+#include <objbase.h>
 #include <imm.h>
+#ifdef __GNUC__
 #undef IMEMENUITEMINFOA
 #undef IMEMENUITEMINFOW
 #endif
@@ -1609,21 +1614,16 @@ docs/reference/gtk/version.xml
 docs/faq/Makefile
 docs/tutorial/Makefile
 gdk-pixbuf/Makefile
-gdk-pixbuf/makefile.mingw
 gdk-pixbuf/gdk_pixbuf.rc
 gdk-pixbuf/gdk-pixbuf-features.h
 gdk-pixbuf/pixops/Makefile
-gdk-pixbuf/pixops/makefile.mingw
 gdk/Makefile
-gdk/makefile.mingw
 gdk/x11/Makefile
 gdk/win32/Makefile
-gdk/win32/makefile.mingw
 gdk/win32/rc/Makefile
 gdk/win32/rc/gdk.rc
 gdk/linux-fb/Makefile
 gtk/Makefile
-gtk/makefile.mingw
 gtk/makefile.msc
 gtk/gtkversion.h
 gtk/gtk-win32.rc
index cd401dd5a289735f651d05381b390d9a22ca0a86..211a00e2c3719e3d7ed2d19dcf3176330e44c4bf 100644 (file)
@@ -1,3 +1,9 @@
+2003-01-05  Tor Lillqvist  <tml@iki.fi>
+
+       * Makefile.am (gdk-pixbuf.loaders): Use @SOEXT@ in the find command.
+
+       * gdk_pixbuf.def: Add gdk_pixbuf_loader_set_size.
+
 2003-01-03  Matthias Clasen  <maclas@gmx.de>
 
        * gdk-pixbuf-io.c (gdk_pixbuf_new_from_xpm_data): Don't crash if
index b3856f3d5a963a360724b40f2663f4f9dae225d2..466c95871ee15ee8f682d8f0585663d76afdfced 100644 (file)
@@ -393,8 +393,6 @@ CLEANFILES += xgen-gmc
 
 EXTRA_DIST =                   \
         gdk-pixbuf-csource.1    \
-       makefile.mingw          \
-       makefile.mingw.in       \
        makefile.msc            \
        gdk_pixbuf.def          \
        gdk_pixbuf.rc           \
@@ -438,7 +436,7 @@ install-data-local: install-ms-lib install-libtool-import-lib
 all-local: gdk-pixbuf.loaders
 
 gdk-pixbuf.loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders
-       if find . -name 'libpixbufloader-*.so' | grep 'so' > /dev/null ; then \
+       if find . -name 'libpixbufloader-*.@SOEXT@' | grep '@SOEXT@' > /dev/null ; then \
           echo "Writing a gdk-pixbuf.loader file to use when running examples before installing gdk-pixbuf."; \
          GDK_PIXBUF_MODULEDIR=.libs $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > ./gdk-pixbuf.loaders ;\
        else \
diff --git a/gdk-pixbuf/makefile.mingw.in b/gdk-pixbuf/makefile.mingw.in
deleted file mode 100644 (file)
index 2d356d2..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-####
-#### Out of order! Use autoconfiscation.
-####
-
-## Makefile for building the gdk_pixbuf DLL with gcc on Win32
-## Use: make -f makefile.mingw
-
-TOP = ../..
-
-include ../build/win32/make.mingw
-
-# Possibly override GTK+ version from build/win32/module.defs
-GDK_PIXBUF_VER = @GDK_PIXBUF_MAJOR@.@GDK_PIXBUF_MINOR@
-
-OPTIMIZE = -g
-
-INCLUDES = -I . -I .. 
-DEPCFLAGS = $(GLIB_CFLAGS) $(INTL_CFLAGS)
-
-all :                                          \
-       ../config.h                             \
-       gdk_pixbuf-$(GDK_PIXBUF_VER).dll        \
-       pixbufloader-bmp.dll                    \
-       pixbufloader-gif.dll                    \
-       pixbufloader-ico.dll                    \
-       pixbufloader-jpeg.dll                   \
-       pixbufloader-png.dll                    \
-       pixbufloader-pnm.dll                    \
-       pixbufloader-ras.dll                    \
-       pixbufloader-tiff.dll                   \
-       pixbufloader-wbmp.dll                   \
-       pixbufloader-xpm.dll                    \
-       make-inline-pixbuf.exe                  \
-       test-gdk-pixbuf.exe
-
-gdk_pixbuf_OBJECTS =                           \
-       gdk-pixbuf.o                            \
-       gdk-pixbuf-animation.o                  \
-       gdk-pixbuf-data.o                       \
-       gdk-pixbuf-io.o                         \
-       gdk-pixbuf-scale.o                      \
-       gdk-pixbuf-util.o                       \
-       pixops/libpixops.a
-
-../config.h : ../config.h.win32
-       cp $< $@
-
-gdk_pixbuf-$(GDK_PIXBUF_VER).dll : $(gdk_pixbuf_OBJECTS) gdk_pixbuf.def
-       $(GLIB)/build-dll gdk_pixbuf $(GDK_PIXBUF_VER) gdk_pixbuf.def $(gdk_pixbuf_OBJECTS) -L ../gdk -lgdk-$(GTK_VER) $(GLIB_LIBS) $(INTL_LIBS)
-
-gdk-pixbuf.o:: gdk-pixbuf-marshal.c
-
-gdk-pixbuf-marshal.c :
-       $(GLIB_GENMARSHAL) --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --header >$@
-
-pixops/libpixops.a :
-       cd pixops && $(MAKE) -f makefile.mingw libpixops.a
-
-pixbufloader_bmp_OBJECTS = io-bmp.o
-
-pixbufloader-bmp.dll : $(pixbufloader_bmp_OBJECTS) pixbufloader_bmp.def
-       $(GLIB)/build-dll pixbufloader-bmp - pixbufloader_bmp.def $(pixbufloader_bmp_OBJECTS) -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(INTL_LIBS)
-
-pixbufloader_gif_OBJECTS = io-gif.o
-
-pixbufloader-gif.dll : $(pixbufloader_gif_OBJECTS) pixbufloader_gif.def
-       $(GLIB)/build-dll pixbufloader-gif - pixbufloader_gif.def $(pixbufloader_gif_OBJECTS) -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(INTL_LIBS)
-
-pixbufloader_ico_OBJECTS = io-ico.o
-
-pixbufloader-ico.dll : $(pixbufloader_ico_OBJECTS) pixbufloader_ico.def
-       $(GLIB)/build-dll pixbufloader-ico - pixbufloader_ico.def $(pixbufloader_ico_OBJECTS) -L  . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(INTL_LIBS)
-
-pixbufloader_jpeg_OBJECTS = io-jpeg.o
-
-io-jpeg.o : io-jpeg.c
-       $(CC) $(CFLAGS) $(JPEG_CFLAGS) -c $<
-
-pixbufloader-jpeg.dll : $(pixbufloader_jpeg_OBJECTS) pixbufloader_jpeg.def
-       $(GLIB)/build-dll pixbufloader-jpeg - pixbufloader_jpeg.def $(pixbufloader_jpeg_OBJECTS) -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(JPEG_LIBS) $(INTL_LIBS)
-
-pixbufloader_png_OBJECTS = io-png.o
-
-io-png.o : io-png.c
-       $(CC) $(CFLAGS) $(PNG_CFLAGS) -c $<
-
-pixbufloader-png.dll : $(pixbufloader_png_OBJECTS) pixbufloader_png.def
-       $(GLIB)/build-dll pixbufloader-png - pixbufloader_png.def $(pixbufloader_png_OBJECTS) -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(PNG_LIBS) $(INTL_LIBS)
-
-pixbufloader_pnm_OBJECTS = io-pnm.o
-
-pixbufloader-pnm.dll : $(pixbufloader_pnm_OBJECTS) pixbufloader_pnm.def
-       $(GLIB)/build-dll pixbufloader-pnm - pixbufloader_pnm.def $(pixbufloader_pnm_OBJECTS) -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(INTL_LIBS)
-
-pixbufloader_ras_OBJECTS = io-ras.o
-
-pixbufloader-ras.dll : $(pixbufloader_ras_OBJECTS) pixbufloader_ras.def
-       $(GLIB)/build-dll pixbufloader-ras - pixbufloader_ras.def $(pixbufloader_ras_OBJECTS) -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(INTL_LIBS)
-
-pixbufloader_tiff_OBJECTS = io-tiff.o
-
-pixbufloader-tiff.dll : $(pixbufloader_tiff_OBJECTS) pixbufloader_tiff.def
-       $(GLIB)/build-dll pixbufloader-tiff - pixbufloader_tiff.def $(pixbufloader_tiff_OBJECTS) -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(TIFF_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(INTL_LIBS)
-
-io-tiff.o : io-tiff.c
-       $(CC) $(CFLAGS) $(TIFF_CFLAGS) -c $<
-
-pixbufloader_wbmp_OBJECTS = io-wbmp.o
-
-pixbufloader-wbmp.dll : $(pixbufloader_wbmp_OBJECTS) pixbufloader_wbmp.def
-       $(GLIB)/build-dll pixbufloader-wbmp - pixbufloader_wbmp.def $(pixbufloader_wbmp_OBJECTS) -L  . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(INTL_LIBS)
-
-pixbufloader_xpm_OBJECTS = io-xpm.o
-
-pixbufloader-xpm.dll : $(pixbufloader_xpm_OBJECTS) pixbufloader_xpm.def
-       $(GLIB)/build-dll pixbufloader-xpm - pixbufloader_xpm.def $(pixbufloader_xpm_OBJECTS) -L  . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS) $(INTL_LIBS)
-
-make-inline-pixbuf.exe : make-inline-pixbuf.o gdk_pixbuf-$(GDK_PIXBUF_VER).dll
-       $(CC) $(CFLAGS) -o $@ make-inline-pixbuf.o -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS)
-
-test-gdk-pixbuf.exe : test-gdk-pixbuf.o gdk_pixbuf-$(GDK_PIXBUF_VER).dll
-       $(CC) $(CFLAGS) -o $@ test-gdk-pixbuf.o -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GTK_LIBS) $(GLIB_LIBS)
-
-ifeq ($(wildcard makefile.mingw.in),makefile.mingw.in)
-# Hack to get an updated makefile.mingw automatically after updating
-# makefile.mingw.in. Only for developer use.
-makefile.mingw: makefile.mingw.in
-       sed -e 's,@GDK_PIXBUF[_]MAJOR@,@GDK_PIXBUF_MAJOR@,' \
-           -e 's,@GDK_PIXBUF[_]MINOR@,@GDK_PIXBUF_MINOR@,' <$< >$@
-endif
index 67c20444cd0644d21c8f8860e622505919f4cb28..16bc8d4b7bcb7354b51fe3a89ce27ca94e25fc87 100644 (file)
@@ -29,6 +29,4 @@ libpixops_la_SOURCES =                \
 
 EXTRA_DIST =                           \
        DETAILS                         \
-       makefile.mingw                  \
-       makefile.mingw.in                       \
        makefile.msc
diff --git a/gdk-pixbuf/pixops/makefile.mingw.in b/gdk-pixbuf/pixops/makefile.mingw.in
deleted file mode 100644 (file)
index 42e8fae..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-## Makefile for building libpixops.a with gcc on Win32
-## Use: make -f makefile.mingw
-
-TOP = ../../..
-
-include $(TOP)/build/win32/make.mingw
-
-# Possibly override GTK+ version from build/win32/module.defs
-GTK_VER = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@
-
-OPTIMIZE = -g
-
-INCLUDES = -I .. -I ../..
-DEPCFLAGS = $(GLIB_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) $(JPEG_CLFAGS) $(TIFF_CFLAGS)
-
-all :                                          \
-       ../../config.h                          \
-       libpixops.a                             \
-       timescale.exe
-
-libpixops_OBJECTS =                            \
-       pixops.o                                \
-       have_mmx.o                              \
-       scale_line_22_33_mmx.o                  \
-       composite_line_22_4a4_mmx.o             \
-       composite_line_color_22_4a4_mmx.o
-
-../../config.h : ../../config.h.win32
-       cp $< $@
-
-libpixops.a : $(libpixops_OBJECTS)
-       ar rv $@ $?
-
-timescale.exe : timescale.o libpixops.a
-       $(CC) $(CFLAGS) -o $@ timescale.o libpixops.a $(GLIB_LIBS)
-
-makefile.mingw: makefile.mingw.in
-       sed -e 's,@GTK_MAJOR[_]VERSION@,@GTK_MAJOR_VERSION@,' \
-           -e 's,@GTK_MINOR[_]VERSION@,@GTK_MINOR_VERSION@,' <$< >$@
-
index 2f3037ee96c9944b8d4750f95c028e0ecdbd0318..f33a518c54c98ffcf7beb0b26c3876b7a37a7461 100644 (file)
@@ -7,8 +7,6 @@ EXTRA_DIST =                    \
        gdkconfig.h.win32       \
        gdk.def                 \
        gdkmarshalers.list      \
-       makefile.mingw          \
-       makefile.mingw.in       \
        makeenums.pl            \
        makefile.msc
 
index db807b515d91cce12aa7c3da88aa443bdd5f7043..38d5e333e62d8b2b7b98a289eff0de837e93c277 100644 (file)
@@ -59,6 +59,7 @@ EXPORTS
        gdk_devices_list
        gdk_display_add_client_message_filter
        gdk_display_beep
+       gdk_display_close
        gdk_display_get_core_pointer
        gdk_display_get_default
        gdk_display_get_default_screen
@@ -71,6 +72,7 @@ EXPORTS
        gdk_display_keyboard_ungrab
        gdk_display_list_devices
        gdk_display_manager_get
+       gdk_display_manager_list_displays
        gdk_display_open
        gdk_display_open_default_libgtk_only
        gdk_display_pointer_is_grabbed
index 3789e23bf2e71a1dc08adfec8ae79354d6d1c03a..80cc5224bbed6fb50f726bae235a4bdd761a43e7 100644 (file)
@@ -26,6 +26,7 @@
 
 #include <glib/gprintf.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "gdkkeysyms.h"
 #include "gdkinternals.h"
diff --git a/gdk/makefile.mingw.in b/gdk/makefile.mingw.in
deleted file mode 100644 (file)
index 8bb2daf..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-####
-#### Out of order! Use autoconfiscation.
-####
-
-## Makefile for building the GDK DLL with gcc on Win32
-## Use: make -f makefile.mingw
-
-## There is no install target, you have to decide where and 
-## how to install for yourself.
-
-TOP = ../..
-
-include ../build/win32/make.mingw
-
-# Possibly override versions from build/win32/module.defs
-GTK_VER = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@
-GDK_PIXBUF_VER = @GDK_PIXBUF_MAJOR@.@GDK_PIXBUF_MINOR@
-
-GDK_PIXBUF_LIBS = -L ../gdk-pixbuf -lgdk_pixbuf-$(GDK_PIXBUF_VER)
-
-OPTIMIZE = -g
-
-INCLUDES = -I . -I .. -I ../gdk-pixbuf
-DEPCFLAGS = $(GLIB_CFLAGS) $(PANGO_CFLAGS)
-DEFINES = -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\" -DGDK_COMPILATION
-
-all:                                           \
-       ../config.h                             \
-       gdkconfig.h                             \
-       win32/libgdk-win32.a                    \
-       win32/gdk-win32res.o                    \
-       gdk-win32-$(GTK_VER).dll
-
-gdk_OBJECTS =                                  \
-       gdk.o                                   \
-       gdkcolor.o                              \
-       gdkcursor.o                             \
-       gdkdraw.o                               \
-       gdkevents.o                             \
-       gdkfont.o                               \
-       gdkgc.o                                 \
-       gdkglobals.o                            \
-       gdkimage.o                              \
-       gdkkeys.o                               \
-       gdkkeyuni.o                             \
-       gdkpango.o                              \
-       gdkpixbuf-drawable.o                    \
-       gdkpixbuf-render.o                      \
-       gdkpixmap.o                             \
-       gdkpolyreg-generic.o                    \
-       gdkrgb.o                                \
-       gdkrectangle.o                          \
-       gdkregion-generic.o                     \
-       gdkwindow.o
-
-../config.h : ../config.h.win32
-       cp $< $@
-
-gdkconfig.h : gdkconfig.h.win32
-       cp $< $@
-
-win32/libgdk-win32.a : FRC
-       cd win32 && $(MAKE) -f makefile.mingw libgdk-win32.a
-
-win32/gdk-win32res.o : FRC
-       cd win32 && $(MAKE) -f makefile.mingw gdk-win32res.o
-
-gdk-win32-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def win32/libgdk-win32.a win32/gdk-win32res.o win32/libwntab32x.a
-       $(GLIB)/build-dll gdk-win32 $(GTK_VER) gdk.def $(gdk_OBJECTS) win32/libgdk-win32.a win32/libwntab32x.a $(GDK_PIXBUF_LIBS) $(GLIB_LIBS) $(PANGOWIN32_LIBS) -lgdi32 -luser32 -limm32 -lshell32 -lole32 -luuid $(LDFLAGS) win32/gdk-win32res.o
-
-win32/libwntab32x.a : FRC
-       cd win32 && $(MAKE) -f makefile.mingw libwntab32x.a
-
-# Hack to get an updated makefile.mingw automatically after updating
-# makefile.mingw.in. Only for developer use.
-makefile.mingw: makefile.mingw.in
-       sed -e 's,@GTK_MAJOR[_]VERSION@,@GTK_MAJOR_VERSION@,' \
-           -e 's,@GTK_MINOR[_]VERSION@,@GTK_MINOR_VERSION@,' \
-           -e 's,@GDK_PIXBUF[_]MAJOR@,@GDK_PIXBUF_MAJOR@,'   \
-           -e 's,@GDK_PIXBUF[_]MINOR@,@GDK_PIXBUF_MINOR@,'   <$< >$@
-
-.PHONY: FRC
index d402aebb73e12f127338e8b2ed4012ee29411592..4001c5b3e9bb843e28a8b25c94fc4b6c05377b98 100644 (file)
@@ -40,7 +40,6 @@ SUBDIRS=rc
 
 EXTRA_DIST = \
        bdfcursor.c \
-       makefile.mingw  \
        makefile.msc    \
        libie55uuid.la  \
        libwntab32x.la
index ca1ce112d5d812d994c40b7c18876ec946b05065..e2bf50706deeb2a6a79f318ba023b5df7499873c 100644 (file)
 /* Do use SetCapture, it works now. Thanks to jpe@archaeopteryx.com */
 #define USE_SETCAPTURE 1
 
+#include "config.h"
+
 #include <glib/gprintf.h>
 
+#if defined (__GNUC__) && defined (HAVE_DIMM_H)
+/* The w32api imm.h clashes a bit with the IE5.5 dimm.h */
+# define IMEMENUITEMINFOA hidden_IMEMENUITEMINFOA
+# define IMEMENUITEMINFOW hidden_IMEMENUITEMINFOW
+#endif
+
 #include "gdk.h"
 #include "gdkprivate-win32.h"
 #include "gdkinput-win32.h"
 
 #include <objbase.h>
 
-#if defined (__GNUC__) && defined (HAVE_DIMM_H)
-/* The w32api imm.h clashes a bit with the IE5.5 dimm.h */
-# define IMEMENUITEMINFOA hidden_IMEMENUITEMINFOA
-# define IMEMENUITEMINFOW hidden_IMEMENUITEMINFOW
-#endif
-
 #include <imm.h>
 
 #if defined (__GNUC__) && defined (HAVE_DIMM_H)
diff --git a/gdk/win32/makefile.mingw.in b/gdk/win32/makefile.mingw.in
deleted file mode 100644 (file)
index aa8ab76..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-## Makefile for building the Win32 dependent GDK objects with gcc on Win32
-## Use: make -f makefile.mingw
-
-TOP = ../../..
-
-# Location of the Wintab toolkit. Downloadable from
-# http://www.pointing.com.  We use the wntab32x.lib archive library
-# directly (copying it to libwntab32x.a).
-WTKIT = $(TOP)/wtkit126
-
-include ../../build/win32/make.mingw
-
-# Possibly override GTK+ version from build/win32/module.defs
-GTK_VER = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@
-
-OPTIMIZE = -g -Wall
-
-INCLUDES = -I ../.. -I .. -I $(WTKIT)/include
-DEPCFLAGS = $(GLIB_CFLAGS) $(PANGO_CFLAGS)
-DEFINES = -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\" -DGDK_COMPILATION
-
-all:                                           \
-       ../../config.h                          \
-       ../gdkconfig.h                          \
-       libgdk-win32.a                          \
-       libwntab32x.a
-
-gdk_win32_OBJECTS =                            \
-       gdkcolor-win32.o                        \
-       gdkcursor-win32.o                       \
-       gdkdnd-win32.o                          \
-       gdkdrawable-win32.o                     \
-       gdkevents-win32.o                       \
-       gdkfont-win32.o                         \
-       gdkgc-win32.o                           \
-       gdkgeometry-win32.o                     \
-       gdkglobals-win32.o                      \
-       gdkim-win32.o                           \
-       gdkimage-win32.o                        \
-       gdkinput.o                              \
-       gdkinput-win32.o                        \
-       gdkkeys-win32.o                         \
-       gdkmain-win32.o                         \
-       gdkpango-win32.o                        \
-       gdkpixmap-win32.o                       \
-       gdkproperty-win32.o                     \
-       gdkselection-win32.o                    \
-       gdkvisual-win32.o                       \
-       gdkwin32id.o                            \
-       gdkwindow-win32.o
-
-../../config.h : ../../config.h.win32
-       cp $< $@
-
-../gdkconfig.h : ../gdkconfig.h.win32
-       cp $< $@
-
-gdk-win32res.o : rc/gdk.rc gdk-build.tmp
-       m4 -DBUILDNUMBER=`cat gdk-build.tmp` <rc/gdk.rc >gdk-win32res.rc
-       windres --include-dir rc gdk-win32res.rc gdk-win32res.o
-       rm gdk-build.tmp gdk-win32res.rc
-
-# The *.stamp files aren't distributed. Thus, this takes care of only
-# tml building libraries with nonzero build number.
-
-ifeq ($(wildcard gdk-build.stamp),gdk-build.stamp)
-# Magic to bump the build number
-gdk-build.tmp :
-       bash -c "read number && echo $$[number+1]" <gdk-build.stamp >gdk-build.tmp
-       cp gdk-build.tmp gdk-build.stamp
-else
-# Use zero as build number.
-gdk-build.tmp :
-       echo 0 >gdk-build.tmp
-endif
-
-libgdk-win32.a : $(gdk_win32_OBJECTS) 
-       -rm -f $@
-       $(AR) rv $@ $(gdk_win32_OBJECTS)
-
-libwntab32x.a : $(WTKIT)/lib/i386/wntab32x.lib
-       cp $< $@
-
-# Hack to get an updated makefile.mingw automatically after updating
-# makefile.mingw.in. Only for developer use.
-makefile.mingw: makefile.mingw.in
-       sed -e 's,@GTK_MAJOR[_]VERSION@,@GTK_MAJOR_VERSION@,' \
-           -e 's,@GTK_MINOR[_]VERSION@,@GTK_MINOR_VERSION@,' <$< >$@
index 707eee3dae5f6be4fd5cd67d65845d3345e0c5b7..7eec3992593fd675df7842feb4c1483e21e35a8e 100644 (file)
@@ -7,5 +7,15 @@ if USE_WIN32
 noinst_DATA = gdk-win32res.lo
 endif
 
-gdk-win32res.lo : gdk.rc gtk.ico
+noinst_PROGRAMS = foo
+
+# Compile a dummy object file into the foo.lo libtool object so that
+# the ugly hack in lt-compile-resource knows what kind of libtool
+# object to produce. (It checks whether there are any .libs/*.o
+# files.)
+
+gdk-win32res.lo : gdk.rc gtk.ico foo.lo
        $(top_srcdir)/build/win32/lt-compile-resource gdk.rc gdk-win32res.lo
+
+foo.c:
+       echo 'int main (int argc, char **argv) { return 0; }' >foo.c
index 67a30f8715cd12a27f0adc084f0344dc8da56f30..e7c0cd57cf5e1af8dc29ab4bf7cbd6ca5756452e 100755 (executable)
@@ -10,9 +10,9 @@ rm $ZIP
 zip -r $ZIP -@ <<EOF
 COPYING.LIB-2
 etc/gtk-2.0
-lib/libgdk_pixbuf-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
-lib/libgdk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
-lib/libgtk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
+lib/libgdk_pixbuf-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
+lib/libgdk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
+lib/libgtk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
 EOF
 
 zip $ZIP lib/gtk-2.0/@GTK_BINARY_VERSION@/loaders/*.dll lib/gtk-2.0/@GTK_BINARY_VERSION@/immodules/*.dll
@@ -25,13 +25,14 @@ rm $DEVZIP
 zip -r $DEVZIP -@ <<EOF
 include/gtk-2.0
 bin/gdk-pixbuf-csource.exe
+bin/gdk-pixbuf-query-loaders.exe
 man/man1/gdk-pixbuf-csource.1
-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@.dll.a
-lib/gdk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.lib
-lib/libgtk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.dll.a
-lib/gtk-win32-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.lib
+lib/libgdk_pixbuf-@GTK_API_VERSION@.dll.a
+lib/gdk_pixbuf-@GTK_API_VERSION@.lib
+lib/libgdk-win32-@GTK_API_VERSION@.dll.a
+lib/gdk-win32-@GTK_API_VERSION@.lib
+lib/libgtk-win32-@GTK_API_VERSION@.dll.a
+lib/gtk-win32-@GTK_API_VERSION@.lib
 lib/gtk-2.0/include
 lib/pkgconfig/gdk-pixbuf-2.0.pc
 lib/pkgconfig/gdk-2.0.pc
index 9ffd70378e2736524764d4e07a6293bf85eba039..fb9d0f1efe4ba113e7f2b4d7628aea0357568392 100644 (file)
@@ -619,8 +619,6 @@ EXTRA_DIST += @STRIP_BEGIN@         \
        gtkrc.default           \
        gtkrc.key.default       \
        gtkrc.key.emacs         \
-       makefile.mingw          \
-       makefile.mingw.in       \
        makefile.msc            \
        makefile.msc.in         \
 @STRIP_END@
index b6d684117aa52ce583a6c67728d2e1a294ad7e35..0bb0fe5961ef5a5b8c6dd8474d1ddbee93c653fb 100755 (executable)
@@ -2095,6 +2095,7 @@ EXPORTS
        gtk_window_begin_move_drag
        gtk_window_begin_resize_drag
        gtk_window_deiconify
+       gtk_window_fullscreen
        gtk_window_get_decorated
        gtk_window_get_default_icon_list
        gtk_window_get_default_size
@@ -2159,6 +2160,7 @@ EXPORTS
        gtk_window_set_wmclass
        gtk_window_stick
        gtk_window_type_get_type
+       gtk_window_unfullscreen
        gtk_window_unmaximize
        gtk_window_unstick
        gtk_wrap_mode_get_type
diff --git a/gtk/makefile.mingw.in b/gtk/makefile.mingw.in
deleted file mode 100644 (file)
index c2770cd..0000000
+++ /dev/null
@@ -1,477 +0,0 @@
-####
-#### Out of order! Use autoconfiscation.
-####
-
-## Makefile for building the GTK DLL with gcc on Win32
-## Use: make -f makefile.mingw
-
-## There is no install target, you have to decide where and 
-## how to install for yourself.
-
-OPTIMIZE = -g
-
-TOP = ../..
-
-include ../build/win32/make.mingw
-
-################################################################
-
-# Possibly override versions from build/win32/module.defs
-GTK_VER = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@
-GDK_PIXBUF_VER = @GDK_PIXBUF_MAJOR@.@GDK_PIXBUF_MINOR@
-
-GDK_LIBS = -L ../gdk -lgdk-win32-$(GTK_VER)
-GTK_LIBS = -L . -lgtk-win32-$(GTK_VER)
-GDK_PIXBUF_LIBS = -L ../gdk-pixbuf -lgdk_pixbuf-$(GDK_PIXBUF_VER)
-
-# Perl and awk are needed to generate some source files.
-# These generated source files are distributed with the Win32 GTk+ source
-# distributions, so don't worry if you don't have perl and awk.
-PERL = perl
-AWK = awk
-
-INCLUDES = -I . -I .. -I ../gdk -I ../gdk-pixbuf
-DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS)
-DEFINES = -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" -DGTK_VERSION=\"@GTK_VERSION@\"
-
-GLIB_GENMARSHAL = $(GLIB)/gobject/glib-genmarshal.exe
-
-all :                          \
-       ../config.h             \
-       generated               \
-       gtk-win32-$(GTK_VER).dll\
-       testcalendar.exe        \
-       testdnd.exe             \
-       testgtk.exe             \
-       testinput.exe           \
-       testrgb.exe             \
-       testselection.exe       \
-       testtext.exe            \
-       testtextbuffer.exe      \
-       simple.exe
-
-gtk_OBJECTS =                  \
-       fnmatch.o               \
-       gtkaccelgroup.o         \
-       gtkaccellabel.o         \
-       gtkadjustment.o         \
-       gtkalignment.o          \
-       gtkarg.o                \
-       gtkarrow.o              \
-       gtkaspectframe.o        \
-       gtkbin.o                \
-       gtkbindings.o           \
-       gtkbbox.o               \
-       gtkbox.o                \
-       gtkbutton.o             \
-       gtkcalendar.o           \
-       gtkcellrenderer.o       \
-       gtkcellrenderertext.o   \
-       gtkcellrenderertextpixbuf.o     \
-       gtkcellrenderertoggle.o \
-       gtkcellrendererpixbuf.o \
-       gtkcheckbutton.o        \
-       gtkcheckmenuitem.o      \
-       gtkclipboard.o          \
-       gtkclist.o              \
-       gtkcolorsel.o           \
-       gtkcolorseldialog.o     \
-       gtkcombo.o              \
-       gtkcontainer.o          \
-       gtkctree.o              \
-       gtkcurve.o              \
-       gtkdialog.o             \
-       gtkdnd.o                \
-       gtkdrawingarea.o        \
-       gtkeditable.o           \
-       gtkentry.o              \
-       gtkeventbox.o           \
-       gtkfilesel.o            \
-       gtkfixed.o              \
-       gtkfontsel.o            \
-       gtkframe.o              \
-       gtkgamma.o              \
-       gtkgc.o                 \
-       gtkhandlebox.o          \
-       gtkhbbox.o              \
-       gtkhbox.o               \
-       gtkhpaned.o             \
-       gtkhruler.o             \
-       gtkhscale.o             \
-       gtkhscrollbar.o         \
-       gtkhseparator.o         \
-       gtkhsv.o                \
-       gtkiconfactory.o        \
-       gtkimage.o              \
-       gtkimagemenuitem.o      \
-       gtkimcontext.o          \
-       gtkimcontextsimple.o    \
-       gtkimmodule.o           \
-       gtkimmulticontext.o     \
-       gtkinputdialog.o        \
-       gtkinvisible.o          \
-       gtkitem.o               \
-       gtkitemfactory.o        \
-       gtklabel.o              \
-       gtklayout.o             \
-       gtklist.o               \
-       gtklistitem.o           \
-       gtkmain.o               \
-       gtkmenu.o               \
-       gtkmenubar.o            \
-       gtkmenufactory.o        \
-       gtkmenuitem.o           \
-       gtkmenushell.o          \
-       gtkmessagedialog.o      \
-       gtkmisc.o               \
-       gtknotebook.o           \
-       gtkobject.o             \
-       gtkoldeditable.o        \
-       gtkoptionmenu.o         \
-       gtkpacker.o             \
-       gtkpaned.o              \
-       gtkpixmap.o             \
-       gtkplug.o               \
-       gtkpreview.o            \
-       gtkprogress.o           \
-       gtkprogressbar.o        \
-       gtkradiobutton.o        \
-       gtkradiomenuitem.o      \
-       gtkrange.o              \
-       gtkrbtree.o             \
-       gtkrc.o                 \
-       gtkruler.o              \
-       gtkscale.o              \
-       gtkscrollbar.o          \
-       gtkscrolledwindow.o     \
-       gtkselection.o          \
-       gtkseparator.o          \
-       gtkseparatormenuitem.o  \
-       gtksettings.o           \
-       gtksignal.o             \
-       gtksocket.o             \
-       gtkspinbutton.o         \
-       gtkstyle.o              \
-       gtkstatusbar.o          \
-       gtkstock.o              \
-       gtktable.o              \
-       gtktearoffmenuitem.o    \
-       gtktext.o               \
-       gtktextbtree.o          \
-       gtktextbuffer.o         \
-       gtktextchild.o          \
-       gtktextdisplay.o        \
-       gtktextiter.o           \
-       gtktextlayout.o         \
-       gtktextmark.o           \
-       gtktextsegment.o        \
-       gtktexttag.o            \
-       gtktexttagtable.o       \
-       gtktexttypes.o          \
-       gtktextview.o           \
-       gtkthemes.o             \
-       gtktipsquery.o          \
-       gtktogglebutton.o       \
-       gtktoolbar.o            \
-       gtktooltips.o           \
-       gtktree.o               \
-       gtktreeitem.o           \
-       gtktreedatalist.o       \
-       gtktreednd.o            \
-       gtktreemodel.o          \
-       gtktreemodelsort.o      \
-       gtktreeselection.o      \
-       gtktreestore.o          \
-       gtktreeview.o           \
-       gtktreeviewcolumn.o     \
-       gtktypeutils.o          \
-       gtkvbbox.o              \
-       gtkvbox.o               \
-       gtkviewport.o           \
-       gtkvpaned.o             \
-       gtkvruler.o             \
-       gtkvscale.o             \
-       gtkvscrollbar.o         \
-       gtkvseparator.o         \
-       gtkwidget.o             \
-       gtkwindow.o             \
-       gtkwindow-decorate.o
-
-# Source headers which are non-autogenerated headers
-gtk_public_h_sources =         \
-       gtk.h                   \
-       gtkaccelgroup.h         \
-       gtkaccellabel.h         \
-       gtkadjustment.h         \
-       gtkalignment.h          \
-       gtkarg.h                \
-       gtkarrow.h              \
-       gtkaspectframe.h        \
-       gtkbin.h                \
-       gtkbindings.h           \
-       gtkbbox.h               \
-       gtkbox.h                \
-       gtkbutton.h             \
-       gtkcalendar.h           \
-       gtkcheckbutton.h        \
-       gtkcheckmenuitem.h      \
-       gtkseparatormenuitem.h  \
-       gtkclist.h              \
-       gtkclipboard.h          \
-       gtkcolorsel.h           \
-       gtkcolorseldialog.h     \
-       gtkcombo.h              \
-       gtkcontainer.h          \
-       gtkctree.h              \
-       gtkcurve.h              \
-       gtkcellrenderer.h       \
-       gtkcellrenderertext.h   \
-       gtkcellrenderertextpixbuf.h     \
-       gtkcellrenderertoggle.h \
-       gtkcellrendererpixbuf.h \
-       gtkdebug.h              \
-       gtkdialog.h             \
-       gtkdnd.h                \
-       gtkdrawingarea.h        \
-       gtkeditable.h           \
-       gtkentry.h              \
-       gtkenums.h              \
-       gtkeventbox.h           \
-       gtkfilesel.h            \
-       gtkfixed.h              \
-       gtkfontsel.h            \
-       gtkframe.h              \
-       gtkgamma.h              \
-       gtkgc.h                 \
-       gtkhandlebox.h          \
-       gtkhbbox.h              \
-       gtkhbox.h               \
-       gtkhpaned.h             \
-       gtkhruler.h             \
-       gtkhscale.h             \
-       gtkhscrollbar.h         \
-       gtkhseparator.h         \
-       gtkhsv.h                \
-       gtkiconfactory.h        \
-       gtkimage.h              \
-       gtkimagemenuitem.h      \
-       gtkimcontext.h          \
-       gtkimmodule.h           \
-       gtkimmulticontext.h     \
-       gtkinputdialog.h        \
-       gtkinvisible.h          \
-       gtkitem.h               \
-       gtkitemfactory.h        \
-       gtklabel.h              \
-       gtklayout.h             \
-       gtklist.h               \
-       gtklistitem.h           \
-       gtkliststore.h          \
-       gtkmain.h               \
-       gtkmenu.h               \
-       gtkmenubar.h            \
-       gtkmenufactory.h        \
-       gtkmenuitem.h           \
-       gtkmenushell.h          \
-       gtkmessagedialog.h      \
-       gtkmisc.h               \
-       gtknotebook.h           \
-       gtkoldeditable.h        \
-       gtkobject.h             \
-       gtkoptionmenu.h         \
-       gtkpacker.h             \
-       gtkpaned.h              \
-       gtkpixmap.h             \
-       gtkplug.h               \
-       gtkpreview.h            \
-       gtkprivate.h            \
-       gtkprogress.h           \
-       gtkprogressbar.h        \
-       gtkradiobutton.h        \
-       gtkradiomenuitem.h      \
-       gtkrange.h              \
-       gtkrc.h                 \
-       gtkruler.h              \
-       gtkscale.h              \
-       gtkscrollbar.h          \
-       gtkscrolledwindow.h     \
-       gtkselection.h          \
-       gtkseparator.h          \
-       gtksettings.h           \
-       gtksignal.h             \
-       gtksocket.h             \
-       gtkspinbutton.h         \
-       gtkstyle.h              \
-       gtkstatusbar.h          \
-       gtkstock.h              \
-       gtktable.h              \
-       gtktearoffmenuitem.h    \
-       gtktextbuffer.h         \
-       gtktextchild.h          \
-       gtktextdisplay.h        \
-       gtktextiter.h           \
-       gtktextlayout.h         \
-       gtktextmark.h           \
-       gtktexttag.h            \
-       gtktexttagtable.h       \
-       gtktextview.h           \
-       gtktext.h               \
-       gtktipsquery.h          \
-       gtktogglebutton.h       \
-       gtktoolbar.h            \
-       gtktooltips.h           \
-       gtktree.h               \
-       gtktreednd.h            \
-       gtktreeitem.h           \
-       gtktreemodel.h          \
-       gtktreemodelsort.h      \
-       gtktreeselection.h      \
-       gtktreesortable.h       \
-       gtktreestore.h          \
-       gtktreeview.h           \
-       gtktreeviewcolumn.h     \
-       gtktypeutils.h          \
-       gtkvbbox.h              \
-       gtkvbox.h               \
-       gtkviewport.h           \
-       gtkvpaned.h             \
-       gtkvruler.h             \
-       gtkvscale.h             \
-       gtkvscrollbar.h         \
-       gtkvseparator.h         \
-       gtkwidget.h             \
-       gtkwindow.h
-
-# More headers to use when autogenerating.
-gdk_headers =                  \
-       ../gdk/gdkcolor.h       \
-       ../gdk/gdkcursor.h      \
-       ../gdk/gdkdnd.h         \
-       ../gdk/gdkdrawable.h    \
-       ../gdk/gdkevents.h      \
-       ../gdk/gdkfont.h        \
-       ../gdk/gdkgc.h          \
-       ../gdk/gdkimage.h       \
-       ../gdk/gdkinput.h       \
-       ../gdk/gdkpixmap.h      \
-       ../gdk/gdkproperty.h    \
-       ../gdk/gdkregion.h      \
-       ../gdk/gdkrgb.h         \
-       ../gdk/gdkselection.h   \
-       ../gdk/gdktypes.h       \
-       ../gdk/gdkvisual.h      \
-       ../gdk/gdkwindow.h
-
-../config.h : ../config.h.win32
-       cp $< $@
-
-GENERATED = gtk.defs gtktypebuiltins.h gtktypebuiltins_vars.c gtktypebuiltins_ids.c gtktypebuiltins_evals.c gtkmarshal.h gtkmarshal.c
-
-#
-# Generated source files:
-#
-generated : $(GENERATED)
-
-gtk.defs : makeenums.pl gtk-boxed.defs $(gtk_public_h_sources) $(gdk_headers)
-       $(PERL) makeenums.pl defs $(gtk_public_h_sources) $(gdk_headers) >gd.tmp
-       cat gd.tmp gtk-boxed.defs >gtk.defs
-       rm gd.tmp
-
-# generate type identifier header (GTK_TYPE_WIDGET_FLAGS)
-gtktypebuiltins.h: gtk.defs maketypes.awk
-       $(AWK) -f maketypes.awk gtk.defs macros >gtktypebuiltins.h
-
-# generate type identifier variables (GTK_TYPE_WIDGET_FLAGS)
-gtktypebuiltins_vars.c: gtk.defs maketypes.awk
-       $(AWK) -f maketypes.awk gtk.defs variables >gtktypebuiltins_vars.c
-
-# generate type entries for type-id registration
-gtktypebuiltins_ids.c: gtk.defs maketypes.awk
-       $(AWK) -f maketypes.awk gtk.defs entries >gtktypebuiltins_ids.c
-
-# generate enum value arrays
-gtktypebuiltins_evals.c: makeenums.pl gtk.defs
-       $(PERL) makeenums.pl arrays $(gtk_public_h_sources) $(gdk_headers) >gtktypebuiltins_evals.c
-
-gtkmarshal.h : gtkmarshal.list
-       $(GLIB_GENMARSHAL) --prefix=gtk_marshal gtkmarshal.list --header >gtkmarshal.h
-
-gtkmarshal.c : gtkmarshal.list
-       $(GLIB_GENMARSHAL) --prefix=gtk_marshal gtkmarshal.list --body >gtkmarshal.c
-
-#
-# Linking:
-#
-gtk-win32-$(GTK_VER).dll : generated $(gtk_OBJECTS) gtk.def 
-       $(GLIB)/build-dll gtk-win32 $(GTK_VER) gtk.def $(gtk_OBJECTS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LIBICONV_LIBS) $(INTL_LIBS) -luser32
-
-#
-# Test programs:
-#
-testcalendar.exe : testcalendar.o
-       $(CC) $(CFLAGS) -o $@ testcalendar.o $(GTK_LIBS) $(GDK_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
-
-# Must have separate rules for these objects that don't go in the DLL
-testcalendar.o : testcalendar.c
-       $(CC) $(CFLAGS) -UGTK_COMPILATION -c -DG_LOG_DOMAIN=\"testcalendar\" testcalendar.c
-
-testdnd.exe : testdnd.o
-       $(CC) $(CFLAGS) -o $@ testdnd.o $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
-
-testdnd.o : testdnd.c
-       $(CC) $(CFLAGS) -UGTK_COMPILATION -c -DG_LOG_DOMAIN=\"testdnd\" testdnd.c
-
-testgtk.exe : testgtk.o
-       $(CC) $(CFLAGS) -o $@  testgtk.o $(GTK_LIBS) $(GDK_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
-
-testgtk.o : testgtk.c
-       $(CC) $(CFLAGS) -UGTK_COMPILATION -c -DG_LOG_DOMAIN=\"testgtk\" testgtk.c
-
-testinput.exe : testinput.o
-       $(CC) $(CFLAGS) -o $@  testinput.o $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
-
-testinput.o : testinput.c
-       $(CC) $(CFLAGS) -UGTK_COMPILATION -c -DG_LOG_DOMAIN=\"testinput\" testinput.c
-
-testrgb.exe : testrgb.o
-       $(CC) $(CFLAGS) -o $@  testrgb.o $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
-
-testrgb.o : testrgb.c
-       $(CC) $(CFLAGS) -UGTK_COMPILATION -c -DG_LOG_DOMAIN=\"testrgb\" testrgb.c
-
-testselection.exe : testselection.o
-       $(CC) $(CFLAGS) -o $@  testselection.o $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
-
-testselection.o : testselection.c
-       $(CC) $(CFLAGS) -UGTK_COMPILATION -c -DG_LOG_DOMAIN=\"testselection\" testselection.c
-
-testtext.exe : testtext.o
-       $(CC) $(CFLAGS) -o $@  testtext.o $(PANGO_LIBS) $(GDK_PIXBUF_LIBS) $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
-
-testtext.o : testtext.c
-       $(CC) $(CFLAGS) -UGTK_COMPILATION -c -DG_LOG_DOMAIN=\"testtext\" testtext.c
-
-testtextbuffer.exe : testtextbuffer.o
-       $(CC) $(CFLAGS) -o $@  testtextbuffer.o $(GDK_PIXBUF_LIBS) $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
-
-testtextbuffer.o : testtextbuffer.c
-       $(CC) $(CFLAGS) -UGTK_COMPILATION -c -DG_LOG_DOMAIN=\"testtextbuffer\" testtextbuffer.c
-
-simple.exe : simple.o
-       $(CC) $(CFLAGS) -o $@  simple.o $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)
-
-simple.o : simple.c
-       $(CC) $(CFLAGS) -UGTK_COMPILATION -c -DG_LOG_DOMAIN=\"simple\" simple.c
-
-# The rmgen target removes just the generated source files
-rmgen:
-       -rm $(GENERATED)
-
-# Hack to get an updated makefile.mingw automatically after updating
-# makefile.mingw.in. Only for developer use.
-makefile.mingw: makefile.mingw.in
-       sed -e 's,@GTK_MAJOR[_]VERSION@,@GTK_MAJOR_VERSION@,' \
-           -e 's,@GTK_MINOR[_]VERSION@,@GTK_MINOR_VERSION@,' \
-           -e 's,@GTK[_]VERSION@,@GTK_VERSION@,' \
-           -e 's,@GDK_PIXBUF[_]MAJOR@,@GDK_PIXBUF_MAJOR@,'   \
-           -e 's,@GDK_PIXBUF[_]MINOR@,@GDK_PIXBUF_MINOR@,'     <$< >$@