]> Pileus Git - ~andy/gtk/blobdiff - gtk/Makefile.am
If major.minor of required and available glib versions are the same, add
[~andy/gtk] / gtk / Makefile.am
index 505ef1de3b257ba60a9b76640e96450f95193e87..961c55cfd9e0f5f1b984f8d096ea519fecf4a74f 100644 (file)
@@ -1,26 +1,35 @@
 # Makefile.am for gtk+/gtk
 
-SUBDIRS=stock-icons
+SUBDIRS=theme-bits
 
-INCLUDES = @STRIP_BEGIN@ \
+if OS_UNIX
+SUBDIRS += xdgmime
+endif
+
+DIST_SUBDIRS=stock-icons theme-bits xdgmime
+
+INCLUDES =                                             \
        -DG_LOG_DOMAIN=\"Gtk\"                          \
        -DGTK_LIBDIR=\"$(libdir)\"                      \
+       -DGTK_DATADIR=\"$(datadir)\"                    \
        -DGTK_DATA_PREFIX=\"$(prefix)\"                 \
        -DGTK_SYSCONFDIR=\"$(sysconfdir)\"              \
-       -DGTK_LOCALEDIR=\"$(gtklocaledir)\"             \
-       -DGTK_VERSION=\"@GTK_VERSION@\"                 \
-       -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"   \
-       -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\"  \
+       -DGTK_VERSION=\"$(GTK_VERSION)\"                \
+       -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"  \
+       -DGTK_HOST=\"$(host)\"                          \
        -DGTK_COMPILATION                               \
        -I$(top_builddir)/gtk                           \
        -I$(top_srcdir) -I../gdk                        \
        -I$(top_srcdir)/gdk                             \
        -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf      \
-       @GTK_DEBUG_FLAGS@                               \
-       @GTK_DEP_CFLAGS@                                \
-@STRIP_END@
+       -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
+       -DGDK_DISABLE_DEPRECATED                        \
+       -DGTK_DISABLE_DEPRECATED                        \
+       -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED            \
+       $(GTK_DEBUG_FLAGS)                              \
+       $(GTK_DEP_CFLAGS)
 
-gtarget=@gdktarget@
+gtarget=$(gdktarget)
 
 if PLATFORM_WIN32
 no_undefined = -no-undefined
@@ -28,53 +37,70 @@ endif
 
 if OS_WIN32
 gtk_def = gtk.def
-gtk_win32_symbols = -export-symbols $(gtk_def) -lwsock32
+gtk_win32_symbols = -export-symbols $(gtk_def)
 
-gtk_win32res_lo = gtk-win32res.lo
+gtk_win32_res = gtk-win32-res.o
+gtk_win32_res_ldflag = -Wl,$(gtk_win32_res)
 
-gtk-win32res.lo : gtk-win32.rc
-       $(top_srcdir)/build/win32/lt-compile-resource gtk-win32.rc gtk-win32res.lo
+gtk-win32-res.o : gtk-win32.rc
+       $(WINDRES) gtk-win32.rc $@
 
-install-libtool-import-lib:
-       $(INSTALL) .libs/libgtk-win32-1.3.dll.a $(DESTDIR)$(libdir)
-uninstall-libtool-import-lib:
-       -rm $(DESTDIR)$(libdir)/libtk-win32-1.3.dll.a
+install-def-file: gtk.def
+       $(INSTALL) $(gtk_def) $(DESTDIR)$(libdir)/gtk-win32-2.0.def
+uninstall-def-file:
+       -rm $(DESTDIR)$(libdir)/gtk-win32-2.0.def
 else
-install-libtool-import-lib:
-uninstall-libtool-import-lib:
+install-def-file:
+uninstall-def-file:
 endif
 
 if MS_LIB_AVAILABLE
-noinst_DATA = gtk-win32-1.3.lib
+noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib
 
-gtk-win32-1.3.lib: libgtk-win32-1.3.la gtk.def
-       lib -name:libgtk-win32-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gtk.def -out:$@
+gtk-win32-$(GTK_API_VERSION).lib: libgtk-win32-$(GTK_API_VERSION).la gtk.def
+       lib -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gtk.def -out:$@
 
 install-ms-lib:
-       $(INSTALL) gtk-win32-1.3.lib $(DESTDIR)$(libdir)
+       $(INSTALL) gtk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
 
 uninstall-ms-lib:
-       -rm $(DESTDIR)$(libdir)/gtk-win32-1.3.lib
+       -rm $(DESTDIR)$(libdir)/gtk-win32-$(GTK_API_VERSION).lib
 else
 install-ms-lib:
 uninstall-ms-lib:
 endif
 
+gtk.def: gtk.symbols
+       (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/    /' -e 's/G_GNUC_[^ ]*//g') > gtk.def
+
+gtkalias.h: gtk.symbols
+         $(PERL) $(srcdir)/makegtkalias.pl < $(srcdir)/gtk.symbols > gtkalias.h
+gtkaliasdef.c: gtk.symbols
+         $(PERL) $(srcdir)/makegtkalias.pl -def < $(srcdir)/gtk.symbols > gtkaliasdef.c
+
+if OS_LINUX
+TESTS = abicheck.sh
+endif
+
 # libtool stuff: set version and export symbols for resolving
 # since automake doesn't support conditionalized libsomething_la_LDFLAGS
 # we use the general approach here
 libgtkincludedir = $(includedir)/gtk-2.0/gtk
-LDFLAGS = @STRIP_BEGIN@ \
-       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
-       -export-dynamic                                         \
-       -rpath @prefix@/lib                                     \
-       $(no_undefined)                                         \
-       @LIBTOOL_EXPORT_OPTIONS@                                \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la         \
-       $(top_builddir)/gdk/@gdktargetlib@                      \
-       $(gtk_win32_symbols)                                    \
-       @GTK_DEP_LIBS@                                          \
-@STRIP_END@
+libadd =                                                               \
+       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
+       $(top_builddir)/gdk/$(gdktargetlib)                             \
+       $(GTK_DEP_LIBS)
+
+if OS_UNIX
+libadd += xdgmime/libxdgmime.la
+endif
+
+# common options for the various packages.
+libtool_opts =                                                 \
+  -version-info $(LT_VERSION_INFO)                             \
+  -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS)    \
+  -rpath $(libdir) $(libgtk_target_ldflags)
+
 
 #
 # setup source file variables
@@ -82,48 +108,68 @@ LDFLAGS = @STRIP_BEGIN@ \
 
 # GTK+ header files for public installation (non-generated, or generated
 # by configure)
-gtk_public_h_sources = @STRIP_BEGIN@ \
+gtk_public_h_sources =          \
        gtk.h                   \
+       gtkaboutdialog.h        \
        gtkaccelgroup.h         \
        gtkaccellabel.h         \
        gtkaccelmap.h           \
        gtkaccessible.h         \
+       gtkaction.h             \
+       gtkactiongroup.h        \
        gtkadjustment.h         \
        gtkalignment.h          \
        gtkarrow.h              \
        gtkaspectframe.h        \
+       gtkassistant.h          \
+       gtkbbox.h               \
        gtkbin.h                \
        gtkbindings.h           \
-       gtkbbox.h               \
        gtkbox.h                \
        gtkbutton.h             \
        gtkcalendar.h           \
+       gtkcelleditable.h       \
+       gtkcelllayout.h         \
+       gtkcellrenderer.h       \
+       gtkcellrendereraccel.h  \
+       gtkcellrenderercombo.h  \
+       gtkcellrendererpixbuf.h \
+       gtkcellrendererprogress.h \
+       gtkcellrenderertext.h   \
+       gtkcellrenderertoggle.h \
+       gtkcellview.h           \
        gtkcheckbutton.h        \
        gtkcheckmenuitem.h      \
-       gtkseparatormenuitem.h  \
+       gtkclipboard.h          \
        gtkclist.h              \
        gtkclipboard.h          \
+       gtkcolorbutton.h        \
        gtkcolorsel.h           \
        gtkcolorseldialog.h     \
        gtkcombo.h              \
+       gtkcombobox.h           \
+       gtkcomboboxentry.h      \
        gtkcontainer.h          \
        gtkctree.h              \
        gtkcurve.h              \
-       gtkcellrenderer.h       \
-       gtkcelleditable.h       \
-       gtkcellrenderertext.h   \
-       gtkcellrenderertoggle.h \
-       gtkcellrendererpixbuf.h \
        gtkdebug.h              \
        gtkdialog.h             \
        gtkdnd.h                \
        gtkdrawingarea.h        \
        gtkeditable.h           \
        gtkentry.h              \
+       gtkentrycompletion.h    \
        gtkenums.h              \
        gtkeventbox.h           \
+       gtkexpander.h           \
+       gtkfilechooser.h        \
+       gtkfilechooserbutton.h  \
+       gtkfilechooserdialog.h  \
+       gtkfilechooserwidget.h  \
+       gtkfilefilter.h         \
        gtkfilesel.h            \
        gtkfixed.h              \
+       gtkfontbutton.h         \
        gtkfontsel.h            \
        gtkframe.h              \
        gtkgamma.h              \
@@ -136,8 +182,9 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtkhscale.h             \
        gtkhscrollbar.h         \
        gtkhseparator.h         \
-       gtkhsv.h                \
        gtkiconfactory.h        \
+       gtkicontheme.h          \
+       gtkiconview.h           \
        gtkimage.h              \
        gtkimagemenuitem.h      \
        gtkimcontext.h          \
@@ -150,6 +197,7 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtkitemfactory.h        \
        gtklabel.h              \
        gtklayout.h             \
+       gtklinkbutton.h         \
        gtklist.h               \
        gtklistitem.h           \
        gtkliststore.h          \
@@ -158,11 +206,13 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtkmenubar.h            \
        gtkmenuitem.h           \
        gtkmenushell.h          \
+       gtkmenutoolbutton.h     \
        gtkmessagedialog.h      \
        gtkmisc.h               \
+       gtkmodules.h            \
        gtknotebook.h           \
-       gtkoldeditable.h        \
        gtkobject.h             \
+       gtkoldeditable.h        \
        gtkoptionmenu.h         \
        gtkpaned.h              \
        gtkpixmap.h             \
@@ -171,8 +221,10 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtkprivate.h            \
        gtkprogress.h           \
        gtkprogressbar.h        \
+       gtkradioaction.h        \
        gtkradiobutton.h        \
        gtkradiomenuitem.h      \
+       gtkradiotoolbutton.h    \
        gtkrange.h              \
        gtkrc.h                 \
        gtkruler.h              \
@@ -181,34 +233,41 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtkscrolledwindow.h     \
        gtkselection.h          \
        gtkseparator.h          \
+       gtkseparatormenuitem.h  \
+       gtkseparatortoolitem.h  \
        gtksettings.h           \
        gtksignal.h             \
        gtksizegroup.h          \
        gtksocket.h             \
        gtkspinbutton.h         \
-       gtkstyle.h              \
        gtkstatusbar.h          \
+       gtkstatusicon.h         \
        gtkstock.h              \
+       gtkstyle.h              \
        gtktable.h              \
        gtktearoffmenuitem.h    \
+       gtktext.h               \
        gtktextbuffer.h         \
        gtktextchild.h          \
        gtktextdisplay.h        \
        gtktextiter.h           \
-       gtktextlayout.h         \
        gtktextmark.h           \
        gtktexttag.h            \
        gtktexttagtable.h       \
        gtktextview.h           \
-       gtktext.h               \
        gtktipsquery.h          \
+       gtktoggleaction.h       \
        gtktogglebutton.h       \
+       gtktoggletoolbutton.h   \
        gtktoolbar.h            \
+       gtktoolbutton.h         \
+       gtktoolitem.h           \
        gtktooltips.h           \
        gtktree.h               \
        gtktreednd.h            \
        gtktreeitem.h           \
        gtktreemodel.h          \
+       gtktreemodelfilter.h    \
        gtktreemodelsort.h      \
        gtktreeselection.h      \
        gtktreesortable.h       \
@@ -216,6 +275,7 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtktreeview.h           \
        gtktreeviewcolumn.h     \
        gtktypeutils.h          \
+       gtkuimanager.h          \
        gtkvbbox.h              \
        gtkvbox.h               \
        gtkviewport.h           \
@@ -225,13 +285,33 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtkvscrollbar.h         \
        gtkvseparator.h         \
        gtkwidget.h             \
-       gtkwindow.h             \
-@STRIP_END@
+       gtkwindow.h
+
+# Installed header files without compatibility guarantees
+# that are not include in gtk/gtk.h
+gtk_semi_private_h_sources =    \
+       gtktextlayout.h         \
+       gtkfilesystem.h
+
 # GTK+ header files that don't get installed
-gtk_private_h_sources = @STRIP_BEGIN@ \
-       gtkrbtree.h             \
+gtk_private_h_sources =                \
+       gtkdndcursors.h         \
+       gtkentryprivate.h       \
+       gtkfilechooserembed.h   \
+       gtkfilechooserentry.h   \
+       gtkfilechooserdefault.h \
+       gtkfilechooserprivate.h \
+       gtkfilechooserutils.h   \
+       gtkfilesystemunix.h     \
+       gtkfilesystemmodel.h    \
+       gtkiconcache.h          \
+       gtkpathbar.h            \
+       gtkplugprivate.h        \
+       gtkrbtree.h             \
+       gtksequence.h           \
+       gtksocketprivate.h      \
        gtktextbtree.h          \
-       gtktextchildprivate.h   \
+       gtktextchildprivate.h   \
        gtktextsegment.h        \
        gtktexttypes.h          \
        gtktextutil.h           \
@@ -241,37 +321,50 @@ gtk_private_h_sources = @STRIP_BEGIN@ \
        gtkthemes.h             \
        gtktreedatalist.h       \
        gtktreeprivate.h        \
-       gtkwindow-decorate.h    \
-@STRIP_END@
+       gtkwindow-decorate.h    \
+       gtktoggleactionprivate.h
+
 # GTK+ C sources to build the library from
-gtk_c_sources = @STRIP_BEGIN@   \
+gtk_c_sources =                 \
+       fnmatch.c               \
+       gtkaboutdialog.c        \
        gtkaccelgroup.c         \
-       gtkaccelmap.c           \
        gtkaccellabel.c         \
+       gtkaccelmap.c           \
        gtkaccessible.c         \
+       gtkaction.c             \
+       gtkactiongroup.c        \
        gtkadjustment.c         \
        gtkalignment.c          \
        gtkarrow.c              \
        gtkaspectframe.c        \
+       gtkassistant.c          \
+       gtkbbox.c               \
        gtkbin.c                \
        gtkbindings.c           \
-       gtkbbox.c               \
        gtkbox.c                \
        gtkbutton.c             \
        gtkcalendar.c           \
-       gtkcellrenderer.c       \
        gtkcelleditable.c       \
+       gtkcelllayout.c         \
+       gtkcellrenderer.c       \
+       gtkcellrendereraccel.c  \
+       gtkcellrenderercombo.c  \
+       gtkcellrendererpixbuf.c \
+       gtkcellrendererprogress.c \
        gtkcellrenderertext.c   \
        gtkcellrenderertoggle.c \
-       gtkcellrendererpixbuf.c \
+       gtkcellview.c           \
        gtkcheckbutton.c        \
        gtkcheckmenuitem.c      \
-       gtkseparatormenuitem.c  \
        gtkclipboard.c          \
        gtkclist.c              \
+       gtkcolorbutton.c        \
        gtkcolorsel.c           \
        gtkcolorseldialog.c     \
        gtkcombo.c              \
+       gtkcombobox.c           \
+       gtkcomboboxentry.c      \
        gtkcontainer.c          \
        gtkctree.c              \
        gtkcurve.c              \
@@ -280,9 +373,23 @@ gtk_c_sources = @STRIP_BEGIN@   \
        gtkdrawingarea.c        \
        gtkeditable.c           \
        gtkentry.c              \
+       gtkentrycompletion.c    \
        gtkeventbox.c           \
+       gtkexpander.c           \
+       gtkfilechooser.c        \
+       gtkfilechooserbutton.c  \
+       gtkfilechooserdialog.c  \
+       gtkfilechooserembed.c   \
+       gtkfilechooserentry.c   \
+       gtkfilechooserdefault.c \
+       gtkfilechooserutils.c   \
+       gtkfilechooserwidget.c  \
+       gtkfilefilter.c         \
        gtkfilesel.c            \
+       gtkfilesystem.c         \
+       gtkfilesystemmodel.c    \
        gtkfixed.c              \
+       gtkfontbutton.c         \
        gtkfontsel.c            \
        gtkframe.c              \
        gtkgamma.c              \
@@ -296,7 +403,11 @@ gtk_c_sources = @STRIP_BEGIN@   \
        gtkhscrollbar.c         \
        gtkhseparator.c         \
        gtkhsv.c                \
+       gtkhsv.h                \
        gtkiconfactory.c        \
+       gtkiconcache.c          \
+       gtkicontheme.c          \
+       gtkiconview.c           \
        gtkimage.c              \
        gtkimagemenuitem.c      \
        gtkimcontext.c          \
@@ -308,31 +419,42 @@ gtk_c_sources = @STRIP_BEGIN@   \
        gtkinvisible.c          \
        gtkitem.c               \
        gtkitemfactory.c        \
+       gtkkeyhash.c            \
+       gtkkeyhash.h            \
        gtklabel.c              \
        gtklayout.c             \
+       gtklinkbutton.c         \
        gtklist.c               \
        gtklistitem.c           \
        gtkliststore.c          \
        gtkmain.c               \
-       gtkmarshalers.c         \
        gtkmarshal.c            \
+       gtkmarshalers.c         \
        gtkmenu.c               \
        gtkmenubar.c            \
        gtkmenuitem.c           \
        gtkmenushell.c          \
+       gtkmenutoolbutton.c     \
        gtkmessagedialog.c      \
        gtkmisc.c               \
+       gtkmnemonichash.c       \
+       gtkmnemonichash.h       \
+       gtkmodules.c            \
        gtknotebook.c           \
        gtkobject.c             \
        gtkoldeditable.c        \
        gtkoptionmenu.c         \
        gtkpaned.c              \
+       gtkpathbar.c            \
        gtkpixmap.c             \
+       gtkplug.c               \
        gtkpreview.c            \
        gtkprogress.c           \
        gtkprogressbar.c        \
+       gtkradioaction.c        \
        gtkradiobutton.c        \
        gtkradiomenuitem.c      \
+       gtkradiotoolbutton.c    \
        gtkrange.c              \
        gtkrbtree.c             \
        gtkrc.c                 \
@@ -340,15 +462,20 @@ gtk_c_sources = @STRIP_BEGIN@   \
        gtkscale.c              \
        gtkscrollbar.c          \
        gtkscrolledwindow.c     \
+       gtksequence.c           \
        gtkselection.c          \
        gtkseparator.c          \
+       gtkseparatormenuitem.c  \
+       gtkseparatortoolitem.c  \
        gtksettings.c           \
        gtksignal.c             \
        gtksizegroup.c          \
+       gtksocket.c             \
        gtkspinbutton.c         \
+       gtkstatusbar.c          \
+       gtkstatusicon.c         \
        gtkstock.c              \
        gtkstyle.c              \
-       gtkstatusbar.c          \
        gtktable.c              \
        gtktearoffmenuitem.c    \
        gtktext.c               \
@@ -369,21 +496,28 @@ gtk_c_sources = @STRIP_BEGIN@   \
        gtktextview.c           \
        gtkthemes.c             \
        gtktipsquery.c          \
+       gtktoggleaction.c       \
        gtktogglebutton.c       \
+       gtktoggletoolbutton.c   \
        gtktoolbar.c            \
+       gtktoolbutton.c         \
+       gtktoolitem.c           \
        gtktooltips.c           \
        gtktree.c               \
-       gtktreeitem.c           \
        gtktreedatalist.c       \
        gtktreednd.c            \
+       gtktreeitem.c           \
        gtktreemodel.c          \
+       gtktreemodelfilter.c    \
        gtktreemodelsort.c      \
        gtktreeselection.c      \
        gtktreesortable.c       \
        gtktreestore.c          \
        gtktreeview.c           \
        gtktreeviewcolumn.c     \
+       gtktypebuiltins.c       \
        gtktypeutils.c          \
+       gtkuimanager.c          \
        gtkvbbox.c              \
        gtkvbox.c               \
        gtkviewport.c           \
@@ -393,18 +527,34 @@ gtk_c_sources = @STRIP_BEGIN@   \
        gtkvscrollbar.c         \
        gtkvseparator.c         \
        gtkwidget.c             \
-       gtkwindow.c             \
        gtkwindow-decorate.c    \
-       fnmatch.c               \
-       fnmatch.h               \
-       xembed.h                \
-@STRIP_END@
+       gtkwindow.c             \
+       xembed.h
+
+if OS_UNIX
+gtk_private_h_sources += gtkfilesystemunix.h
+gtk_c_sources +=         gtkfilesystemunix.c
+endif
+
+if OS_WIN32
+gtk_private_h_sources += gtkfilesystemwin32.h
+gtk_c_sources +=         gtkfilesystemwin32.c
+endif
 
 if USE_X11
-gtk_plug_c_sources = @STRIP_BEGIN@   \
-       gtkplug.c               \
-       gtksocket.c             \
-@STRIP_END@
+gtk_private_h_sources += gtkxembed.h gtktrayicon.h
+gtk_c_sources += \
+       gtkplug-x11.c   \
+       gtksocket-x11.c \
+       gtkxembed.c     \
+       gtktrayicon-x11.c
+else
+if USE_WIN32
+gtk_private_h_sources += gtkwin32embed.h
+gtk_c_sources +=         gtkplug-win32.c gtksocket-win32.c gtkwin32embed.c
+else
+gtk_c_sources +=         gtkplug-stub.c gtksocket-stub.c
+endif
 endif
 
 # we use our own built_sources variable rules to avoid automake's
@@ -414,42 +564,43 @@ endif
 # content
 
 # built sources that get installed with the header files
-gtk_built_public_sources = @STRIP_BEGIN@ \
-       gtkmarshal.h            \
-       gtktypebuiltins.h       \
-@STRIP_END@
+gtk_built_public_sources =                     \
+       gtkmarshal.h                            \
+       gtktypebuiltins.h
+
 # built sources that don't get installed
-gtk_built_sources = @STRIP_BEGIN@ \
-       stamp-gtk.defs          \
-       stamp-gtktypebuiltins.h \
-       stamp-gtkmarshalers.h   \
-       gtktypebuiltins_vars.c  \
-       gtktypebuiltins_ids.c   \
-       gtktypebuiltins_evals.c \
-       gtkmarshalers.c         \
-       gtkmarshalers.h         \
-       gtkmarshal.c            \
-       gtk.defs                \
-       ${gtk_built_public_sources} \
-@STRIP_END@
+gtk_built_private_headers =                    \
+       gtkalias.h                              \
+       gtkmarshalers.h                         \
+       gtkbuiltincache.h
+
+gtk_built_sources =                            \
+       gtkaliasdef.c                           \
+       gtktypebuiltins.c                       \
+       gtkmarshalers.c                         \
+       gtkmarshalers.h                         \
+       gtkmarshal.c                            \
+       ${gtk_built_private_headers}            \
+       ${gtk_built_public_sources}
+
+stamp_files =                                  \
+       stamp-gtkmarshalers.h                   \
+       stamp-gtkmarshal.h                      \
+       stamp-gtktypebuiltins.h
+
 # non-header sources (headers should be specified in the above variables)
 # that don't serve as direct make target sources, i.e. they don't have
 # their own .lo rules and don't get publically installed
-gtk_extra_sources = @STRIP_BEGIN@ \
-       gtkversion.h.in         \
-       maketypes.awk           \
-       makeenums.h             \
-       gtk-boxed.defs          \
-       gtkmarshalers.list      \
-       gtkmarshal.list         \
-@STRIP_END@
+gtk_extra_sources =                            \
+       gtk.symbols                             \
+       gtkversion.h.in                         \
+       gtkmarshalers.list                      \
+       gtkmarshal.list
 
 #
-# setup GTK+ sources and their dependancies
+# setup GTK+ sources and their dependencies
 #
-gtk_target_headers = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkversion.h
-gtk_target_sources = $(gtk_c_sources) $(gtk_plug_c_sources)
-MAINTAINERCLEANFILES = $(gtk_built_sources)
+MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files)
 EXTRA_HEADERS =
 EXTRA_DIST = $(gtk_private_h_sources) $(gtk_extra_sources)
 EXTRA_DIST += $(gtk_built_sources)
@@ -457,161 +608,143 @@ EXTRA_DIST += $(gtk_built_sources)
 #
 # rules to generate built sources
 #
-# setup autogeneration dependancies
-gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc
+# setup autogeneration dependencies
+gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc
 CLEANFILES = $(gen_sources)
-Makefile: oldest-source-stamp  # oh boy, does automake SUCK!
-oldest-source-stamp: $(gtk_built_sources)
-$(OBJECTS): oldest-source-stamp  ${gtk_built_public_sources} # this is our oldest file, used for implicit auto-generation deps
-# initial creation of the real stamp-* files
-gtk.defs gtkmarshalers.h gtktypebuiltins.h:          # never add deps here
-       test -f "$(srcdir)/$@" || touch $(srcdir)/$@
-# normal autogeneration rules
+
+BUILT_SOURCES = $(gtk_built_sources)
+
 # all autogenerated files need to be generated in the srcdir,
 # so old versions get remade and are not confused with newer
 # versions in the build dir. thus a development setup requires
 # srcdir to be writable, passing --disable-rebuilds to
 # ../configure will supress all autogeneration rules.
-$(srcdir)/stamp-gtk.defs: @REBUILD@ gtk.defs gtk-boxed.defs $(gtk_public_h_sources)
-       case @GLIB_MKENUMS@ in                                                                  \
-          .*) glib_mkenums=`pwd`/@GLIB_MKENUMS@ ;;                     \
-          *) glib_mkenums=@GLIB_MKENUMS@ ;;                                                    \
-       esac;                                                                                   \
-       cd $(srcdir) \
-       && $$glib_mkenums --comments ";; @comment@" \
-                       --fprod "; enumerations from \"@filename@\"\n " \
-                       --vhead "(define-@type@ @EnumName@" \
-                       --vprod "   (@valuenick@ @VALUENAME@)" \
-                       --vtail ")" \
-                       $(gtk_public_h_sources) > xgen-gdef \
-       && cat gtk-boxed.defs >> xgen-gdef \
-       && (cmp -s xgen-gdef gtk.defs || cp xgen-gdef gtk.defs) \
-       && rm -f xgen-gdef \
-       && echo timestamp > $(@F)
-
-$(srcdir)/stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list gtkmarshalers.h
-       case @GLIB_GENMARSHAL@ in                                                               \
-          .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;;                                       \
-          *) glib_genmarshal=@GLIB_GENMARSHAL@ ;;                                              \
-       esac;                                                                                   \
-       cd $(srcdir)                                                                            \
-       && $$glib_genmarshal --prefix=_gtk_marshal gtkmarshalers.list --header >> xgen-gmlh     \
-       && (cmp -s xgen-gmlh gtkmarshalers.h || cp xgen-gmlh gtkmarshalers.h)                   \
-       && rm -f xgen-gmlh                                                                      \
+gtkmarshalers.h: stamp-gtkmarshalers.h
+       @true
+stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list
+       $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --header >> xgen-gmlh \
+       && (cmp -s xgen-gmlh gtkmarshalers.h || cp xgen-gmlh gtkmarshalers.h) \
+       && rm -f xgen-gmlh \
+       && echo timestamp > $(@F)       
+gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
+       (echo "#include \"gtkalias.h\""; $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --body) >> xgen-gmlc \
+       && cp xgen-gmlc gtkmarshalers.c \
+       && rm -f xgen-gmlc
+
+gtkmarshal.h: stamp-gtkmarshal.h
+       @true
+stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.list
+       echo "#ifndef GTK_DISABLE_DEPRECATED" > xgen-gmh                                        \
+        && $(GLIB_GENMARSHAL) --prefix=gtk_marshal $(srcdir)/gtkmarshal.list --header >> xgen-gmh \
+       && echo "#endif /* GTK_DISABLE_DEPRECATED */" >> xgen-gmh \
+       && (cmp -s xgen-gmh gtkmarshal.h || cp xgen-gmh gtkmarshal.h) \
+       && rm -f xgen-gmh \
        && echo timestamp > $(@F)
-$(srcdir)/gtkmarshalers.c: @REBUILD@ $(srcdir)/stamp-gtkmarshalers.h
-       case @GLIB_GENMARSHAL@ in                                                               \
-          .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;;                                       \
-          *) glib_genmarshal=@GLIB_GENMARSHAL@ ;;                                              \
-       esac;                                                                                   \
-       cd $(srcdir)                                                                            \
-       && $$glib_genmarshal --prefix=_gtk_marshal gtkmarshalers.list --body >> xgen-gmlc       \
-       && cp xgen-gmlc gtkmarshalers.c                                                         \
-       && rm -f xgen-gmlc 
-$(srcdir)/gtkmarshal.h: @REBUILD@ gtkmarshal.list
-       case @GLIB_GENMARSHAL@ in                                                               \
-          .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;;                                       \
-          *) glib_genmarshal=@GLIB_GENMARSHAL@ ;;                                              \
-       esac;                                                                                   \
-       cd $(srcdir)                                                                            \
-       && echo "#ifndef GTK_DISABLE_DEPRECATED" > xgen-gmh                                     \
-        && $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --header >> xgen-gmh         \
-       && echo "#endif /* GTK_DISABLE_DEPRECATED */" >> xgen-gmh                               \
-       && cp xgen-gmh gtkmarshal.h                                                             \
-       && rm -f xgen-gmh 
-$(srcdir)/gtkmarshal.c: @REBUILD@ gtkmarshal.h
-       case @GLIB_GENMARSHAL@ in                                                               \
-          .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;;                                       \
-          *) glib_genmarshal=@GLIB_GENMARSHAL@ ;;                                              \
-       esac;                                                                                   \
-       cd $(srcdir)                                                                            \
-       && $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --body >> xgen-gmc            \
-       && cp xgen-gmc gtkmarshal.c                                                             \
+gtkmarshal.c: @REBUILD@ gtkmarshal.list
+       (echo "#include \"gtkalias.h\""; $(GLIB_GENMARSHAL) --prefix=gtk_marshal $(srcdir)/gtkmarshal.list --body) >> xgen-gmc \
+       && cp xgen-gmc gtkmarshal.c \
        && rm -f xgen-gmc 
 
-$(srcdir)/stamp-gtktypebuiltins.h: @REBUILD@ maketypes.awk $(srcdir)/stamp-gtk.defs gtktypebuiltins.h
-       cd $(srcdir) \
-       && LC_ALL=C $(AWK) -f maketypes.awk gtk.defs macros > xgen-gtbh \
-       && (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h) \
+gtktypebuiltins.h: stamp-gtktypebuiltins.h
+       @true
+stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) Makefile
+       ( cd $(srcdir) && $(GLIB_MKENUMS) \
+                       --fhead "#ifndef __GTK_TYPE_BUILTINS_H__\n#define __GTK_TYPE_BUILTINS_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+                       --fprod "/* enumerations from \"@filename@\" */\n" \
+                       --vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define GTK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
+                       --ftail "G_END_DECLS\n\n#endif /* __GTK_TYPE_BUILTINS_H__ */" \
+               $(gtk_public_h_sources) ) >> xgen-gtbh \
+       && (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h ) \
        && rm -f xgen-gtbh \
        && echo timestamp > $(@F)
-$(srcdir)/gtktypebuiltins_vars.c: @REBUILD@ maketypes.awk $(srcdir)/stamp-gtk.defs
-       cd $(srcdir) \
-       && LC_ALL=C $(AWK) -f maketypes.awk gtk.defs variables > xgen-gtbvc \
-       && cp xgen-gtbvc $(@F) \
-       && rm -f xgen-gtbvc
-$(srcdir)/gtktypebuiltins_ids.c: @REBUILD@ maketypes.awk $(srcdir)/stamp-gtk.defs
-       cd $(srcdir) \
-       && LC_ALL=C $(AWK) -f maketypes.awk gtk.defs entries > xgen-gtbic \
-       && cp xgen-gtbic $(@F) \
-       && rm -f xgen-gtbic
-$(srcdir)/gtktypebuiltins_evals.c: @REBUILD@ $(gtk_public_h_sources)
-       case @GLIB_MKENUMS@ in                                                                  \
-          .*) glib_mkenums=`pwd`/@GLIB_MKENUMS@ ;;                     \
-          *) glib_mkenums=@GLIB_MKENUMS@ ;;                                                    \
-       esac;                                                                                   \
-       cd $(srcdir) \
-       && $$glib_mkenums \
+gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile
+       ( cd $(srcdir) && $(GLIB_MKENUMS) \
+                       --fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include \"gtk.h\"\n#include \"gtkprivate.h\"\n#include \"gtkalias.h\"\n" \
+                       --ftail "#define __GTK_TYPE_BUILTINS_C__\n#include \"gtkaliasdef.c\"\n" \
                        --fprod "\n/* enumerations from \"@filename@\" */" \
-                       --vhead "static const GtkEnumValue _@enum_name@_values[] = {" \
-                       --vprod "  { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
-                       --vtail "  { 0, NULL, NULL }\n};" \
-                       $(gtk_public_h_sources) > xgen-gtbec \
-       && cp xgen-gtbec $(@F) \
-       && rm -f xgen-gtbec
-
+                       --vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
+                       --vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+                       --vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (g_intern_static_string (\"@EnumName@\"), values);\n  }\n  return etype;\n}\n" \
+               $(gtk_public_h_sources) ) > xgen-gtbc \
+       && cp xgen-gtbc gtktypebuiltins.c  \
+       && rm -f xgen-gtbc
 
 # target platform:
-lib_ltlibraries = @gtktargetlib@
-# now define the real one to workaround automake's mishandling
-lib_LTLIBRARIES = $(lib_ltlibraries)
-if USE_X11
-libgtk_x11_includedir = $(includedir)/gtk-2.0/gtk
-libgtk_x11_include_HEADERS = $(gtk_target_headers)
-libgtk_x11_1_3_la_SOURCES = $(gtk_target_sources)
-endif
-if USE_LINUX_FB
-libgtk_linux_fb_includedir = $(includedir)/gtk-2.0/gtk
-libgtk_linux_fb_include_HEADERS = $(gtk_target_headers)
-libgtk_linux_fb_1_3_la_SOURCES = $(gtk_target_sources)
-endif
+lib_LTLIBRARIES = $(gtktargetlib)
+
+gtkincludedir = $(includedir)/gtk-2.0/gtk
+gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h
+
+libgtk_x11_2_0_la_SOURCES = $(gtk_c_sources)
+libgtk_linux_fb_2_0_la_SOURCES = $(gtk_c_sources)
+libgtk_win32_2_0_la_SOURCES = $(gtk_c_sources)
+libgtk_quartz_2_0_la_SOURCES = $(gtk_c_sources)
+
+libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts)
+libgtk_linux_fb_2_0_la_LDFLAGS = $(libtool_opts)
+libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts)
+libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts)
+
+libgtk_x11_2_0_la_LIBADD = $(libadd)
+libgtk_linux_fb_2_0_la_LIBADD = $(libadd)
+libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32
+libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res)
+libgtk_quartz_2_0_la_LIBADD = $(libadd)
+
 if USE_WIN32
-libgtk_win32_includedir = $(includedir)/gtk-2.0/gtk
-libgtk_win32_include_HEADERS = $(gtk_target_headers)
-libgtk_win32_1_3_la_SOURCES = $(gtk_target_sources)
-libgtk_win32_1_3_la_LIBADD = $(gtk_win32res_lo)
-libgtk_win32_1_3_la_DEPENDENCIES = $(gtk_def) $(gtk_win32res_lo)
+libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
 endif
-EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-linux-fb-1.3.la libgtk-win32-1.3.la
+EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-linux-fb-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la
 
+install-exec-hook: 
+if DISABLE_EXPLICIT_DEPS
+       $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$(gtktargetlib)
+endif
 
-# We create a dummy theme for the default GTK+ theme
-install-data-local:  install-ms-lib install-libtool-import-lib
-       $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0
-       echo "# Empty gtkrc for default theme" > $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
-       rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
-
-uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
+# Install a RC file for the default GTK+ theme, and key themes
+install-data-local: install-ms-lib install-def-file
+       $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0
+       $(INSTALL_DATA) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0/gtkrc
+       $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key
+       $(INSTALL_DATA) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc
+       $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key
+       $(INSTALL_DATA) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
+
+uninstall-local: uninstall-ms-lib uninstall-def-file
+       rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0/gtkrc
+       rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc
+       rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
+
+# if srcdir!=builddir, clean out maintainer-clean files from builddir
+# this allows dist to pass.
+distclean-local:
+       if test $(srcdir) != .; then \
+         rm -f $(MAINTAINERCLEANFILES); \
+       fi
+
+DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib)
 
-DEPS = @gtktargetlib@ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la $(top_builddir)/gdk/@gdktargetlib@
 TEST_DEPS = $(DEPS) gtk.immodules
 
-LDADDS = @STRIP_BEGIN@ \
-       @gtktargetlib@                                  \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
-       $(top_builddir)/gdk/@gdktargetlib@              \
-@STRIP_END@
+LDADDS =                                                               \
+       $(gtktargetlib)                                                 \
+       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
+       $(top_builddir)/gdk/$(gdktargetlib)
 
 #
 # Installed tools
 #
-bin_PROGRAMS = gtk-query-immodules-2.0
+bin_PROGRAMS = gtk-query-immodules-2.0 gtk-update-icon-cache
 
 gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
 gtk_query_immodules_2_0_LDADD = $(LDADDS)
 
 gtk_query_immodules_2_0_SOURCES = queryimmodules.c
 
+gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
+
+gtk_update_icon_cache_SOURCES = updateiconcache.c
+
 .PHONY: files test test-debug
 
 files:
@@ -619,8 +752,250 @@ files:
          echo $$p; \
        done
 
-EXTRA_DIST += @STRIP_BEGIN@    \
-       oldest-source-stamp     \
+STOCK_ICONS = \
+       stock-icons/16/gtk-about.png                    \
+       stock-icons/16/gtk-add.png                      \
+       stock-icons/16/gtk-cdrom.png                    \
+       stock-icons/16/gtk-connect.png                  \
+       stock-icons/16/gtk-convert.png                  \
+       stock-icons/16/gtk-copy.png                     \
+       stock-icons/16/gtk-cut.png                      \
+       stock-icons/16/gtk-delete.png                   \
+       stock-icons/16/gtk-directory.png                \
+       stock-icons/16/gtk-disconnect.png               \
+       stock-icons/16/gtk-edit.png                     \
+       stock-icons/16/gtk-execute.png                  \
+       stock-icons/16/gtk-file.png                     \
+       stock-icons/16/gtk-find-and-replace.png         \
+       stock-icons/16/gtk-find.png                     \
+       stock-icons/16/gtk-floppy.png                   \
+       stock-icons/16/gtk-fullscreen.png               \
+       stock-icons/16/gtk-go-back-ltr.png              \
+       stock-icons/16/gtk-go-down.png                  \
+       stock-icons/16/gtk-go-forward-ltr.png           \
+       stock-icons/16/gtk-goto-bottom.png              \
+       stock-icons/16/gtk-goto-first-ltr.png           \
+       stock-icons/16/gtk-goto-last-ltr.png            \
+       stock-icons/16/gtk-goto-top.png                 \
+       stock-icons/16/gtk-go-up.png                    \
+       stock-icons/16/gtk-harddisk.png                 \
+       stock-icons/16/gtk-help.png                     \
+       stock-icons/16/gtk-home.png                     \
+       stock-icons/16/gtk-indent-ltr.png               \
+       stock-icons/16/gtk-indent-rtl.png               \
+       stock-icons/16/gtk-index.png                    \
+       stock-icons/16/gtk-info.png                     \
+       stock-icons/16/gtk-jump-to-ltr.png              \
+       stock-icons/16/gtk-jump-to-rtl.png              \
+       stock-icons/16/gtk-justify-center.png           \
+       stock-icons/16/gtk-justify-fill.png             \
+       stock-icons/16/gtk-justify-left.png             \
+       stock-icons/16/gtk-justify-right.png            \
+       stock-icons/16/gtk-leave-fullscreen.png         \
+       stock-icons/16/gtk-media-forward-ltr.png        \
+       stock-icons/16/gtk-media-next-ltr.png           \
+       stock-icons/16/gtk-media-pause.png              \
+       stock-icons/16/gtk-media-play-ltr.png           \
+       stock-icons/16/gtk-media-play-rtl.png           \
+       stock-icons/16/gtk-media-previous-ltr.png       \
+       stock-icons/16/gtk-media-record.png             \
+       stock-icons/16/gtk-media-rewind-ltr.png         \
+       stock-icons/16/gtk-media-stop.png               \
+       stock-icons/16/gtk-missing-image.png            \
+       stock-icons/16/gtk-network.png                  \
+       stock-icons/16/gtk-new.png                      \
+       stock-icons/16/gtk-open.png                     \
+       stock-icons/16/gtk-paste.png                    \
+       stock-icons/16/gtk-preferences.png              \
+       stock-icons/16/gtk-print.png                    \
+       stock-icons/16/gtk-print-preview.png            \
+       stock-icons/16/gtk-properties.png               \
+       stock-icons/16/gtk-quit.png                     \
+       stock-icons/16/gtk-redo-ltr.png                 \
+       stock-icons/16/gtk-redo-rtl.png                 \
+       stock-icons/16/gtk-refresh.png                  \
+       stock-icons/16/gtk-remove.png                   \
+       stock-icons/16/gtk-revert-to-saved-ltr.png      \
+       stock-icons/16/gtk-revert-to-saved-rtl.png      \
+       stock-icons/16/gtk-save-as.png                  \
+       stock-icons/16/gtk-select-all.png               \
+       stock-icons/16/gtk-select-font.png              \
+       stock-icons/16/gtk-sort-ascending.png           \
+       stock-icons/16/gtk-sort-descending.png          \
+       stock-icons/16/gtk-spell-check.png              \
+       stock-icons/16/gtk-stop.png                     \
+       stock-icons/16/gtk-strikethrough.png            \
+       stock-icons/16/gtk-font.png                     \
+       stock-icons/16/gtk-undelete-ltr.png             \
+       stock-icons/16/gtk-undelete-rtl.png             \
+       stock-icons/16/gtk-underline.png                \
+       stock-icons/16/gtk-undo-ltr.png                 \
+       stock-icons/16/gtk-undo-rtl.png                 \
+       stock-icons/16/gtk-unindent-ltr.png             \
+       stock-icons/16/gtk-unindent-rtl.png             \
+       stock-icons/16/gtk-zoom-100.png                 \
+       stock-icons/16/gtk-zoom-fit.png                 \
+       stock-icons/16/gtk-zoom-in.png                  \
+       stock-icons/16/gtk-zoom-out.png                 \
+       stock-icons/16/gtk-italic.png                   \
+       stock-icons/16/gtk-bold.png                     \
+       stock-icons/20/gtk-apply.png                    \
+       stock-icons/20/gtk-cancel.png                   \
+       stock-icons/20/gtk-close.png                    \
+       stock-icons/20/gtk-no.png                       \
+       stock-icons/20/gtk-ok.png                       \
+       stock-icons/20/gtk-yes.png                      \
+       stock-icons/24/gtk-about.png                    \
+       stock-icons/24/gtk-add.png                      \
+       stock-icons/24/gtk-bold.png                     \
+       stock-icons/24/gtk-cdrom.png                    \
+       stock-icons/24/gtk-clear.png                    \
+       stock-icons/24/gtk-close.png                    \
+       stock-icons/24/gtk-color-picker.png             \
+       stock-icons/24/gtk-connect.png                  \
+       stock-icons/24/gtk-convert.png                  \
+       stock-icons/24/gtk-copy.png                     \
+       stock-icons/24/gtk-cut.png                      \
+       stock-icons/24/gtk-directory.png                \
+       stock-icons/24/gtk-disconnect.png               \
+       stock-icons/24/gtk-edit.png                     \
+       stock-icons/24/gtk-execute.png                  \
+       stock-icons/24/gtk-file.png                     \
+       stock-icons/24/gtk-find-and-replace.png         \
+       stock-icons/24/gtk-find.png                     \
+       stock-icons/24/gtk-font.png                     \
+       stock-icons/24/gtk-fullscreen.png               \
+       stock-icons/24/gtk-go-back-ltr.png              \
+       stock-icons/24/gtk-goto-top.png                 \
+       stock-icons/24/gtk-go-down.png                  \
+       stock-icons/24/gtk-goto-bottom.png              \
+       stock-icons/24/gtk-goto-first-ltr.png           \
+       stock-icons/24/gtk-goto-last-ltr.png            \
+       stock-icons/24/gtk-go-up.png                    \
+       stock-icons/24/gtk-harddisk.png                 \
+       stock-icons/24/gtk-help.png                     \
+       stock-icons/24/gtk-home.png                     \
+       stock-icons/24/gtk-indent-ltr.png               \
+       stock-icons/24/gtk-indent-rtl.png               \
+       stock-icons/24/gtk-index.png                    \
+       stock-icons/24/gtk-info.png                     \
+       stock-icons/24/gtk-italic.png                   \
+       stock-icons/24/gtk-jump-to-ltr.png              \
+       stock-icons/24/gtk-jump-to-rtl.png              \
+       stock-icons/24/gtk-justify-center.png           \
+       stock-icons/24/gtk-justify-fill.png             \
+       stock-icons/24/gtk-justify-left.png             \
+       stock-icons/24/gtk-justify-right.png            \
+       stock-icons/24/gtk-leave-fullscreen.png         \
+       stock-icons/24/gtk-media-forward-ltr.png        \
+       stock-icons/24/gtk-media-next-ltr.png           \
+       stock-icons/24/gtk-media-pause.png              \
+       stock-icons/24/gtk-media-play-ltr.png           \
+       stock-icons/24/gtk-media-play-rtl.png           \
+       stock-icons/24/gtk-media-previous-ltr.png       \
+       stock-icons/24/gtk-media-record.png             \
+       stock-icons/24/gtk-media-rewind-ltr.png         \
+       stock-icons/24/gtk-media-stop.png               \
+       stock-icons/24/gtk-missing-image.png            \
+       stock-icons/24/gtk-network.png                  \
+       stock-icons/24/gtk-new.png                      \
+       stock-icons/24/gtk-open.png                     \
+       stock-icons/24/gtk-paste.png                    \
+       stock-icons/24/gtk-preferences.png              \
+       stock-icons/24/gtk-print.png                    \
+       stock-icons/24/gtk-print-preview.png            \
+       stock-icons/24/gtk-properties.png               \
+       stock-icons/24/gtk-quit.png                     \
+       stock-icons/24/gtk-redo-ltr.png                 \
+       stock-icons/24/gtk-redo-rtl.png                 \
+       stock-icons/24/gtk-refresh.png                  \
+       stock-icons/24/gtk-remove.png                   \
+       stock-icons/24/gtk-revert-to-saved-ltr.png      \
+       stock-icons/24/gtk-revert-to-saved-rtl.png      \
+       stock-icons/24/gtk-select-font.png              \
+       stock-icons/24/gtk-save-as.png                  \
+       stock-icons/24/gtk-floppy.png                   \
+       stock-icons/24/gtk-select-all.png               \
+       stock-icons/24/gtk-select-color.png             \
+       stock-icons/24/gtk-sort-ascending.png           \
+       stock-icons/24/gtk-sort-descending.png          \
+       stock-icons/24/gtk-spell-check.png              \
+       stock-icons/24/gtk-stop.png                     \
+       stock-icons/24/gtk-strikethrough.png            \
+       stock-icons/24/gtk-delete.png                   \
+       stock-icons/24/gtk-undelete-ltr.png             \
+       stock-icons/24/gtk-undelete-rtl.png             \
+       stock-icons/24/gtk-underline.png                \
+       stock-icons/24/gtk-undo-ltr.png                 \
+       stock-icons/24/gtk-undo-rtl.png                 \
+       stock-icons/24/gtk-unindent-ltr.png             \
+       stock-icons/24/gtk-unindent-rtl.png             \
+       stock-icons/24/gtk-zoom-100.png                 \
+       stock-icons/24/gtk-zoom-fit.png                 \
+       stock-icons/24/gtk-zoom-in.png                  \
+       stock-icons/24/gtk-zoom-out.png                 \
+       stock-icons/24/gtk-go-forward-ltr.png           \
+       stock-icons/32/gtk-dnd-multiple.png             \
+       stock-icons/32/gtk-dnd.png                      \
+       stock-icons/48/gtk-dialog-authentication.png    \
+       stock-icons/48/gtk-dialog-error.png             \
+       stock-icons/48/gtk-dialog-info.png              \
+       stock-icons/48/gtk-dialog-question.png          \
+       stock-icons/48/gtk-dialog-warning.png
+
+GENERATED_ICONS = \
+       stock-icons/16/gtk-go-back-rtl.png              \
+       stock-icons/16/gtk-go-forward-rtl.png           \
+       stock-icons/16/gtk-goto-first-rtl.png           \
+       stock-icons/16/gtk-goto-last-rtl.png            \
+       stock-icons/16/gtk-media-forward-rtl.png        \
+       stock-icons/16/gtk-media-next-rtl.png           \
+       stock-icons/16/gtk-media-previous-rtl.png       \
+       stock-icons/16/gtk-media-rewind-rtl.png         \
+       stock-icons/16/gtk-save.png                     \
+       stock-icons/24/gtk-go-back-rtl.png              \
+       stock-icons/24/gtk-go-forward-rtl.png           \
+       stock-icons/24/gtk-goto-first-rtl.png           \
+       stock-icons/24/gtk-goto-last-rtl.png            \
+       stock-icons/24/gtk-media-forward-rtl.png        \
+       stock-icons/24/gtk-media-next-rtl.png           \
+       stock-icons/24/gtk-media-previous-rtl.png       \
+       stock-icons/24/gtk-media-rewind-rtl.png         \
+       stock-icons/24/gtk-save.png
+
+stamp-icons: $(STOCK_ICONS)
+       for i in 16 24; do                                                      \
+          (cd $(srcdir)/stock-icons/$$i                                        \
+          && rm -f gtk-go-back-rtl.png                                         \
+          && $(LN_S) gtk-go-forward-ltr.png gtk-go-back-rtl.png                \
+          && rm -f gtk-go-forward-rtl.png                                      \
+          && $(LN_S) gtk-go-back-ltr.png gtk-go-forward-rtl.png                \
+          && rm -f gtk-goto-first-rtl.png                                      \
+          && $(LN_S) gtk-goto-last-ltr.png gtk-goto-first-rtl.png              \
+          && rm -f gtk-goto-last-rtl.png                                       \
+          && $(LN_S) gtk-goto-first-ltr.png gtk-goto-last-rtl.png              \
+          && rm -f gtk-media-forward-rtl.png                                   \
+          && $(LN_S) gtk-media-rewind-ltr.png gtk-media-forward-rtl.png        \
+          && rm -f gtk-media-next-rtl.png                                      \
+          && $(LN_S) gtk-media-previous-ltr.png gtk-media-next-rtl.png         \
+          && rm -f gtk-media-previous-rtl.png                                  \
+          && $(LN_S) gtk-media-next-ltr.png gtk-media-previous-rtl.png         \
+          && rm -f gtk-media-rewind-rtl.png                                    \
+          && $(LN_S) gtk-media-forward-ltr.png gtk-media-rewind-rtl.png        \
+          && rm -f gtk-save.png                                                \
+          && $(LN_S) gtk-floppy.png gtk-save.png)                              \
+       done                                                                    \
+       && touch stamp-icons
+
+gtkbuiltincache.h: @REBUILD@ gtk-update-icon-cache$(EXEEXT) stamp-icons
+       ./gtk-update-icon-cache --force --ignore-theme-index    \
+          --source builtin_icons stock-icons > gtkbuiltincache.h
+
+MAINTAINERCLEANFILES += stamp-icons
+
+EXTRA_DIST +=                   \
+       $(STOCK_ICONS)          \
+       $(GENERATED_ICONS)      \
        line-arrow.xbm          \
        line-wrap.xbm           \
        tree_plus.xbm           \
@@ -630,11 +1005,15 @@ EXTRA_DIST += @STRIP_BEGIN@      \
        gtk.def                 \
        gtk-win32.rc            \
        gtk-win32.rc.in         \
-       makefile.mingw          \
-       makefile.mingw.in       \
+       gtkwin32embed.h         \
+       gtkfilesystemwin32.h    \
+       gtkfilesystemwin32.c    \
+       gtkrc.default           \
+       gtkrc.key.default       \
+       gtkrc.key.emacs         \
        makefile.msc            \
        makefile.msc.in         \
-@STRIP_END@
+       makegtkalias.pl         \
+       abicheck.sh
 
 install-data-local:
-