]> Pileus Git - ~andy/gtk/blobdiff - gtk/Makefile.am
Updated Norwegian bokmål translation.
[~andy/gtk] / gtk / Makefile.am
index e960a07fba316dc5cc7122322b61d8e8dc443658..62d5352eea304cb3d14d79ea2ec6cb05e91bd6f8 100644 (file)
@@ -1,21 +1,28 @@
 # Makefile.am for gtk+/gtk
 include $(top_srcdir)/Makefile.decl
 
-xdgmimedir =
-
-if OS_UNIX
-xdgmimedir += xdgmime
+if USE_QUARTZ
+GTK_PRINT_PREVIEW_COMMAND="open -a /Applications/Preview.app %f"
+else
 GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
 endif
 
-SUBDIRS = theme-bits $(xdgmimedir) . tests
-DIST_SUBDIRS=theme-bits xdgmime
+SUBDIRS = theme-bits . tests
+DIST_SUBDIRS=theme-bits tests
 
+if HAVE_PAPI_CUPS
+GTK_PRINT_BACKENDS=file,papi,cups
+else
 if HAVE_CUPS
 GTK_PRINT_BACKENDS=file,cups
 else
+if HAVE_PAPI
+GTK_PRINT_BACKENDS=file,papi
+else
 GTK_PRINT_BACKENDS=file,lpr
 endif
+endif
+endif
 
 INCLUDES =                                             \
        -DG_LOG_DOMAIN=\"Gtk\"                          \
@@ -29,17 +36,19 @@ INCLUDES =                                          \
        -DGTK_COMPILATION                               \
        -DGTK_PRINT_BACKENDS=\"$(GTK_PRINT_BACKENDS)\"  \
        -DGTK_PRINT_PREVIEW_COMMAND=\"$(GTK_PRINT_PREVIEW_COMMAND)\"    \
+       -I$(top_builddir)                               \
        -I$(top_builddir)/gtk                           \
        -I$(top_srcdir) -I../gdk                        \
        -I$(top_srcdir)/gdk                             \
        -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf      \
-       -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
        -DGDK_DISABLE_DEPRECATED                        \
+       -DGTK_DISABLE_DEPRECATED                        \
        -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED            \
        -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED          \
        $(GTK_DEBUG_FLAGS)                              \
        $(GTK_DEP_CFLAGS)                               \
-       $(gtk_clipboard_dnd_c_sources_CFLAGS)
+       $(gtk_clipboard_dnd_c_sources_CFLAGS)           \
+       $(INCLUDED_IMMODULE_DEFINE)
 
 gtarget=$(gdktarget)
 
@@ -49,7 +58,7 @@ endif
 
 if OS_WIN32
 gtk_def = gtk.def
-gtk_win32_symbols = -export-symbols gtk.def
+gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def
 
 gtk_win32_res = gtk-win32-res.o
 gtk_win32_res_ldflag = -Wl,gtk-win32-res.o
@@ -58,7 +67,7 @@ gtk-win32-res.o : gtk-win32.rc
        $(WINDRES) gtk-win32.rc $@
 
 install-def-file: gtk.def
-       $(INSTALL) gtk.def $(DESTDIR)$(libdir)/gtk-win32-2.0.def
+       $(INSTALL) $(srcdir)/gtk.def $(DESTDIR)$(libdir)/gtk-win32-2.0.def
 uninstall-def-file:
        -rm $(DESTDIR)$(libdir)/gtk-win32-2.0.def
 else
@@ -70,7 +79,7 @@ if MS_LIB_AVAILABLE
 noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib
 
 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:$@
+       lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gtk.def -out:$@
 
 install-ms-lib:
        $(INSTALL) gtk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
@@ -82,8 +91,10 @@ install-ms-lib:
 uninstall-ms-lib:
 endif
 
+# This places the generated .def file in srcdir, since it is expected to be there.
+# (The one from a tarball is)
 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
+       (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') > $(srcdir)/gtk.def
 
 gtkalias.h: gtk.symbols
          $(PERL) $(srcdir)/makegtkalias.pl < $(srcdir)/gtk.symbols > gtkalias.h
@@ -101,26 +112,35 @@ if OS_LINUX
 TESTS += abicheck.sh pltcheck.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
 libadd =                                                               \
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
        $(top_builddir)/gdk/$(gdktargetlib)                             \
        $(GTK_DEP_LIBS)
+deps =
 
-if OS_UNIX
-libadd += xdgmime/libxdgmime.la
-endif
-
-# common options for the various packages.
+# libtool stuff: set version and export symbols for resolving
+# since automake doesn't support conditionalized libsomething_la_LDFLAGS
+# we use the general approach here
 libtool_opts =                                                 \
   -version-info $(LT_VERSION_INFO)                             \
   -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS)    \
   -rpath $(libdir) $(libgtk_target_ldflags)
 
 
+included-modules:
+if HAVE_INCLUDED_IMMMODULES
+       @cd $(top_builddir)/modules/input && $(MAKE) $(AM_MAKEFLAGS) included-modules
+
+libadd += $(INCLUDED_IMMODULE_OBJ)
+deps += $(INCLUDED_IMMODULE_OBJ)
+
+$(INCLUDED_IMMODULE_OBJ): included-modules
+       @true
+endif
+
+.PHONY: included-modules
+
 #
 # setup source file variables
 #
@@ -136,6 +156,7 @@ gtk_public_h_sources =          \
        gtkaccessible.h         \
        gtkaction.h             \
        gtkactiongroup.h        \
+       gtkactivatable.h        \
        gtkadjustment.h         \
        gtkalignment.h          \
        gtkarrow.h              \
@@ -163,15 +184,12 @@ gtk_public_h_sources =          \
        gtkcheckbutton.h        \
        gtkcheckmenuitem.h      \
        gtkclipboard.h          \
-       gtkclist.h              \
        gtkcolorbutton.h        \
        gtkcolorsel.h           \
        gtkcolorseldialog.h     \
-       gtkcombo.h              \
        gtkcombobox.h           \
        gtkcomboboxentry.h      \
        gtkcontainer.h          \
-       gtkctree.h              \
        gtkcurve.h              \
        gtkdebug.h              \
        gtkdialog.h             \
@@ -179,6 +197,7 @@ gtk_public_h_sources =          \
        gtkdrawingarea.h        \
        gtkeditable.h           \
        gtkentry.h              \
+       gtkentrybuffer.h        \
        gtkentrycompletion.h    \
        gtkenums.h              \
        gtkeventbox.h           \
@@ -188,7 +207,6 @@ gtk_public_h_sources =          \
        gtkfilechooserdialog.h  \
        gtkfilechooserwidget.h  \
        gtkfilefilter.h         \
-       gtkfilesel.h            \
        gtkfixed.h              \
        gtkfontbutton.h         \
        gtkfontsel.h            \
@@ -203,6 +221,7 @@ gtk_public_h_sources =          \
        gtkhscale.h             \
        gtkhscrollbar.h         \
        gtkhseparator.h         \
+       gtkhsv.h                \
        gtkiconfactory.h        \
        gtkicontheme.h          \
        gtkiconview.h           \
@@ -212,15 +231,13 @@ gtk_public_h_sources =          \
        gtkimcontextsimple.h    \
        gtkimmodule.h           \
        gtkimmulticontext.h     \
+       gtkinfobar.h            \
        gtkinputdialog.h        \
        gtkinvisible.h          \
        gtkitem.h               \
-       gtkitemfactory.h        \
        gtklabel.h              \
        gtklayout.h             \
        gtklinkbutton.h         \
-       gtklist.h               \
-       gtklistitem.h           \
        gtkliststore.h          \
        gtkmain.h               \
        gtkmenu.h               \
@@ -231,22 +248,19 @@ gtk_public_h_sources =          \
        gtkmessagedialog.h      \
        gtkmisc.h               \
        gtkmodules.h            \
+       gtkmountoperation.h     \
        gtknotebook.h           \
        gtkobject.h             \
-       gtkoldeditable.h        \
-       gtkoptionmenu.h         \
+       gtkorientable.h         \
        gtkpagesetup.h          \
        gtkpaned.h              \
        gtkpapersize.h          \
-       gtkpixmap.h             \
        gtkplug.h               \
-       gtkpreview.h            \
        gtkprintcontext.h       \
        gtkprintoperation.h     \
        gtkprintoperationpreview.h      \
        gtkprintsettings.h      \
        gtkprivate.h            \
-       gtkprogress.h           \
        gtkprogressbar.h        \
        gtkradioaction.h        \
        gtkradiobutton.h        \
@@ -270,8 +284,8 @@ gtk_public_h_sources =          \
        gtkseparator.h          \
        gtkseparatormenuitem.h  \
        gtkseparatortoolitem.h  \
+       gtkshow.h               \
        gtksettings.h           \
-       gtksignal.h             \
        gtksizegroup.h          \
        gtksocket.h             \
        gtkspinbutton.h         \
@@ -282,7 +296,6 @@ gtk_public_h_sources =          \
        gtktable.h              \
        gtktearoffmenuitem.h    \
        gtktestutils.h          \
-       gtktext.h               \
        gtktextbuffer.h         \
        gtktextbufferrichtext.h \
        gtktextchild.h          \
@@ -292,18 +305,15 @@ gtk_public_h_sources =          \
        gtktexttag.h            \
        gtktexttagtable.h       \
        gtktextview.h           \
-       gtktipsquery.h          \
        gtktoggleaction.h       \
        gtktogglebutton.h       \
        gtktoggletoolbutton.h   \
        gtktoolbar.h            \
        gtktoolbutton.h         \
        gtktoolitem.h           \
+       gtktoolshell.h          \
        gtktooltip.h            \
-       gtktooltips.h           \
-       gtktree.h               \
        gtktreednd.h            \
-       gtktreeitem.h           \
        gtktreemodel.h          \
        gtktreemodelfilter.h    \
        gtktreemodelsort.h      \
@@ -331,38 +341,37 @@ gtk_unix_print_public_h_sources =    \
        gtkpagesetupunixdialog.h        \
        gtkprintunixdialog.h            \
        gtkprinter.h                    \
-       gtkprintjob.h
+       gtkprintjob.h                   \
+       gtkunixprint.h
 endif
 
 # Installed header files without compatibility guarantees
 # that are not included in gtk/gtk.h
 gtk_semi_private_h_sources =    \
-       gtktextlayout.h         \
-       gtkfilesystem.h
+       gtktextlayout.h
 
 # GTK+ header files that don't get installed
 gtk_private_h_sources =                \
        gtkquery.h              \
        gtksearchengine.h       \
-       gtksearchenginebeagle.h \
-       gtksearchenginetracker.h\
        gtksearchenginesimple.h \
        gtkdndcursors.h         \
        gtkentryprivate.h       \
        gtkbuilderprivate.h     \
+       gtkcustompaperunixdialog.h\
        gtkfilechooserdefault.h \
        gtkfilechooserembed.h   \
        gtkfilechooserentry.h   \
        gtkfilechooserprivate.h \
        gtkfilechoosersettings.h \
        gtkfilechooserutils.h   \
+       gtkfilesystem.h         \
        gtkfilesystemmodel.h    \
-       gtkfilesystemunix.h     \
-       gtkhsv.h                \
        gtkiconcache.h          \
        gtkintl.h               \
        gtkkeyhash.h            \
        gtkmnemonichash.h       \
+       gtkmountoperationprivate.h \
        gtkpathbar.h            \
        gtkplugprivate.h        \
        gtkprintoperation-private.h\
@@ -385,14 +394,13 @@ gtk_private_h_sources =           \
        gtktoggleactionprivate.h\
        gtktreedatalist.h       \
        gtktreeprivate.h        \
-       gtkwindow-decorate.h
+       gtkwindow-decorate.h    \
+       $(gtk_clipboard_dnd_h_sources)
 
 # GTK+ C sources to build the library from
 gtk_base_c_sources =            \
        gtkquery.c              \
        gtksearchengine.c       \
-       gtksearchenginebeagle.c \
-       gtksearchenginetracker.c\
        gtksearchenginesimple.c \
        fnmatch.c               \
        gtkaboutdialog.c        \
@@ -402,6 +410,7 @@ gtk_base_c_sources =            \
        gtkaccessible.c         \
        gtkaction.c             \
        gtkactiongroup.c        \
+       gtkactivatable.c        \
        gtkadjustment.c         \
        gtkalignment.c          \
        gtkarrow.c              \
@@ -429,20 +438,18 @@ gtk_base_c_sources =            \
        gtkcellview.c           \
        gtkcheckbutton.c        \
        gtkcheckmenuitem.c      \
-       gtkclist.c              \
        gtkcolorbutton.c        \
        gtkcolorsel.c           \
        gtkcolorseldialog.c     \
-       gtkcombo.c              \
        gtkcombobox.c           \
        gtkcomboboxentry.c      \
        gtkcontainer.c          \
-       gtkctree.c              \
        gtkcurve.c              \
        gtkdialog.c             \
        gtkdrawingarea.c        \
        gtkeditable.c           \
        gtkentry.c              \
+       gtkentrybuffer.c        \
        gtkentrycompletion.c    \
        gtkeventbox.c           \
        gtkexpander.c           \
@@ -456,7 +463,6 @@ gtk_base_c_sources =            \
        gtkfilechooserutils.c   \
        gtkfilechooserwidget.c  \
        gtkfilefilter.c         \
-       gtkfilesel.c            \
        gtkfilesystem.c         \
        gtkfilesystemmodel.c    \
        gtkfixed.c              \
@@ -485,16 +491,14 @@ gtk_base_c_sources =            \
        gtkimcontextsimple.c    \
        gtkimmodule.c           \
        gtkimmulticontext.c     \
+       gtkinfobar.c            \
        gtkinputdialog.c        \
        gtkinvisible.c          \
        gtkitem.c               \
-       gtkitemfactory.c        \
        gtkkeyhash.c            \
        gtklabel.c              \
        gtklayout.c             \
        gtklinkbutton.c         \
-       gtklist.c               \
-       gtklistitem.c           \
        gtkliststore.c          \
        gtkmain.c               \
        gtkmarshal.c            \
@@ -508,23 +512,20 @@ gtk_base_c_sources =            \
        gtkmisc.c               \
        gtkmnemonichash.c       \
        gtkmodules.c            \
+       gtkmountoperation.c     \
        gtknotebook.c           \
        gtkobject.c             \
-       gtkoldeditable.c        \
-       gtkoptionmenu.c         \
+       gtkorientable.c         \
        gtkpagesetup.c          \
        gtkpaned.c              \
        gtkpapersize.c          \
        gtkpathbar.c            \
-       gtkpixmap.c             \
        gtkplug.c               \
-       gtkpreview.c            \
        gtkprintcontext.c       \
        gtkprintoperation.c     \
        gtkprintoperationpreview.c      \
        gtkprintsettings.c      \
        gtkprintutils.c         \
-       gtkprogress.c           \
        gtkprogressbar.c        \
        gtkradioaction.c        \
        gtkradiobutton.c        \
@@ -552,8 +553,8 @@ gtk_base_c_sources =            \
        gtkseparatormenuitem.c  \
        gtkseparatortoolitem.c  \
        gtksettings.c           \
-       gtksignal.c             \
        gtksizegroup.c          \
+       gtkshow.c               \
        gtksocket.c             \
        gtkspinbutton.c         \
        gtkstatusbar.c          \
@@ -563,7 +564,6 @@ gtk_base_c_sources =            \
        gtktable.c              \
        gtktearoffmenuitem.c    \
        gtktestutils.c          \
-       gtktext.c               \
        gtktextbtree.c          \
        gtktextbuffer.c         \
        gtktextbufferrichtext.c \
@@ -580,19 +580,16 @@ gtk_base_c_sources =            \
        gtktextutil.c           \
        gtktextview.c           \
        gtkthemes.c             \
-       gtktipsquery.c          \
        gtktoggleaction.c       \
        gtktogglebutton.c       \
        gtktoggletoolbutton.c   \
        gtktoolbar.c            \
        gtktoolbutton.c         \
        gtktoolitem.c           \
+       gtktoolshell.c          \
        gtktooltip.c            \
-       gtktooltips.c           \
-       gtktree.c               \
        gtktreedatalist.c       \
        gtktreednd.c            \
-       gtktreeitem.c           \
        gtktreemodel.c          \
        gtktreemodelfilter.c    \
        gtktreemodelsort.c      \
@@ -617,11 +614,56 @@ gtk_base_c_sources =            \
        gtkwindow-decorate.c    \
        gtkwindow.c             \
        $(gtk_clipboard_dnd_c_sources)
+
+# Broken
+gtk_public_h_sources += \
+       gtktext.h               \
+       gtktree.h               \
+       gtktreeitem.h
+gtk_base_c_sources += \
+       gtktext.c               \
+       gtktree.c               \
+       gtktreeitem.c
+
+# Deprecated
+gtk_public_h_sources += \
+       gtkclist.h              \
+       gtkcombo.h              \
+       gtkctree.h              \
+       gtkfilesel.h            \
+       gtkitemfactory.h        \
+       gtklist.h               \
+       gtklistitem.h           \
+       gtkoldeditable.h        \
+       gtkoptionmenu.h         \
+       gtkpixmap.h             \
+       gtkpreview.h            \
+       gtkprogress.h           \
+       gtksignal.h             \
+       gtktipsquery.h          \
+       gtktooltips.h
+gtk_base_c_sources += \
+       gtkclist.c              \
+       gtkcombo.c              \
+       gtkctree.c              \
+       gtkfilesel.c            \
+       gtkitemfactory.c        \
+       gtklist.c               \
+       gtklistitem.c           \
+       gtkoldeditable.c        \
+       gtkoptionmenu.c         \
+       gtkpixmap.c             \
+       gtkpreview.c            \
+       gtkprogress.c           \
+       gtksignal.c             \
+       gtktipsquery.c          \
+       gtktooltips.c
+
 gtk_c_sources = $(gtk_base_c_sources)
 gtk_all_c_sources = $(gtk_base_c_sources)
 
 gtk_os_unix_c_sources = \
-       gtkfilesystemunix.c             \
+       gtkcustompaperunixdialog.c      \
        gtkpagesetupunixdialog.c        \
        gtkprinter.c                    \
        gtkprinteroption.c              \
@@ -630,27 +672,29 @@ gtk_os_unix_c_sources = \
        gtkprintjob.c                   \
        gtkprintoperation-unix.c        \
        gtkprintunixdialog.c            \
-        gtkprintbackend.c
+        gtkprintbackend.c              \
+       gtksearchenginebeagle.c         \
+       gtksearchenginetracker.c
 gtk_all_c_sources += $(gtk_os_unix_c_sources)
 if OS_UNIX
 gtk_private_h_sources += \
-       gtkfilesystemunix.h             \
        gtkiconcachevalidator.h         \
        gtkprintbackend.h               \
        gtkprinter-private.h            \
        gtkprinteroption.h              \
        gtkprinteroptionset.h           \
-       gtkprinteroptionwidget.h
+       gtkprinteroptionwidget.h        \
+       gtksearchenginebeagle.h         \
+       gtksearchenginetracker.h
 gtk_c_sources += $(gtk_os_unix_c_sources)
 endif
 
 gtk_os_win32_c_sources = \
-       gtkfilesystemwin32.c            \
        gtkprint-win32.c                \
        gtkprintoperation-win32.c
 gtk_all_c_sources += $(gtk_os_win32_c_sources)
 if OS_WIN32
-gtk_private_h_sources += gtkfilesystemwin32.h gtkprint-win32.h
+gtk_private_h_sources += gtkprint-win32.h
 gtk_c_sources += $(gtk_os_win32_c_sources)
 endif
 
@@ -658,19 +702,23 @@ gtk_use_x11_c_sources = \
        gtkplug-x11.c   \
        gtksocket-x11.c \
        gtkxembed.c     \
-       gtktrayicon-x11.c
+       gtktrayicon-x11.c \
+       gtkmountoperation-x11.c
 gtk_use_win32_c_sources = \
        gtkplug-win32.c   \
        gtksocket-win32.c \
        gtkwin32embed.c   \
-       gtkwin32embedwidget.c
+       gtkwin32embedwidget.c \
+       gtkmountoperation-stub.c
 gtk_use_quartz_c_sources =     \
        gtksearchenginequartz.c \
        gtkplug-stub.c          \
-       gtksocket-stub.c
+       gtksocket-stub.c        \
+       gtkmountoperation-stub.c
 gtk_use_stub_c_sources = \
        gtkplug-stub.c   \
-       gtksocket-stub.c
+       gtksocket-stub.c \
+       gtkmountoperation-stub.c
 gtk_all_c_sources += $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_quartz_c_sources) $(gtk_use_stub_c_sources)
 if USE_X11
 gtk_private_h_sources += gtkxembed.h gtktrayicon.h xembed.h
@@ -691,12 +739,14 @@ endif
 endif
 
 if USE_QUARTZ
-gtk_clipboard_dnd_c_sources = gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c gtkquartz.h
+gtk_clipboard_dnd_c_sources = gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c
+gtk_clipboard_dnd_h_sources = gtkquartz.h
 gtk_clipboard_dnd_c_sources_CFLAGS = "-xobjective-c"
 else
 gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c
-gtk_clipboard_dnd_c_sources_CFLAGS = 
+gtk_clipboard_dnd_c_sources_CFLAGS =
 endif
+EXTRA_DIST += gtkquartz.h
 
 # we use our own built_sources variable rules to avoid automake's
 # BUILT_SOURCES oddities
@@ -713,7 +763,8 @@ gtk_built_public_sources =                  \
 gtk_built_private_headers =                    \
        gtkalias.h                              \
        gtkmarshalers.h                         \
-       gtkbuiltincache.h
+       gtkbuiltincache.h                       \
+       gtkimcontextsimpleseqs.h
 
 gtk_built_sources =                            \
        gtkaliasdef.c                           \
@@ -746,7 +797,7 @@ gtk_extra_sources =                         \
 #
 # setup GTK+ sources and their dependencies
 #
-MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS)
+MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS) stock-icons/icon-theme.cache
 EXTRA_HEADERS =
 EXTRA_DIST += $(gtk_private_h_sources) $(gtk_extra_sources)
 EXTRA_DIST += $(gtk_built_sources)
@@ -815,10 +866,9 @@ gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.c.template
 gtktypefuncs.c: @REBUILD@ $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
        echo '#include <gtk/gtk.h>' > xgen-gtfsrc.c && \
          ${CPP} $(DEFS) $(INCLUDES) -DGTK_ENABLE_BROKEN $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
-         egrep '\<g[td]k_[a-zA-Z0-9_]+_get_type\>' | \
-         sed -e 's/.*\(\<g[td]k_[a-zA-Z0-9_]\+_get_type\>\).*/\1/' | \
+         grep -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
          sort | uniq | \
-         sed '{ s/^/vgt=/; s/$$/();/; }' > xgen-gtf \
+         sed '{ s/^/*tp++ = /; s/$$/();/; }' > xgen-gtf \
        && cp xgen-gtf $@ && rm -f xgen-gtf
 gtktestutils.c: gtktypefuncs.c
 
@@ -832,28 +882,29 @@ gtkunixprintincludedir = $(includedir)/gtk-unix-print-2.0/gtk
 gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
 
 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_directfb_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) -Wl,-luuid
 libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts)
 libgtk_directfb_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 -lcomdlg32 -lwinspool -lcomctl32
-libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res)
 libgtk_quartz_2_0_la_LIBADD = $(libadd)
 libgtk_directfb_2_0_la_LIBADD = $(libadd)
 
+libgtk_x11_2_0_la_DEPENDENCIES = $(deps)
+libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps)
+libgtk_quartz_2_0_la_DEPENDENCIES = $(deps)
+libgtk_directfb_2_0_la_DEPENDENCIES = $(deps)
+
 if USE_WIN32
 libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
 endif
-EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-linux-fb-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la
+EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la
 
 install-exec-hook: 
 if DISABLE_EXPLICIT_DEPS
@@ -970,10 +1021,15 @@ STOCK_ICONS = \
        stock-icons/16/gtk-network.png                  \
        stock-icons/16/gtk-new.png                      \
        stock-icons/16/gtk-open.png                     \
+       stock-icons/16/gtk-page-setup.png               \
        stock-icons/16/gtk-paste.png                    \
        stock-icons/16/gtk-preferences.png              \
        stock-icons/16/gtk-print.png                    \
+       stock-icons/16/gtk-print-error.png              \
+       stock-icons/16/gtk-print-paused.png             \
        stock-icons/16/gtk-print-preview.png            \
+       stock-icons/16/gtk-print-report.png             \
+       stock-icons/16/gtk-print-warning.png            \
        stock-icons/16/gtk-properties.png               \
        stock-icons/16/gtk-quit.png                     \
        stock-icons/16/gtk-redo-ltr.png                 \
@@ -1011,6 +1067,10 @@ STOCK_ICONS = \
        stock-icons/20/gtk-no.png                       \
        stock-icons/20/gtk-ok.png                       \
        stock-icons/20/gtk-yes.png                      \
+       stock-icons/24/audio-volume-high.png            \
+       stock-icons/24/audio-volume-low.png             \
+       stock-icons/24/audio-volume-medium.png          \
+       stock-icons/24/audio-volume-muted.png           \
        stock-icons/24/document-open-recent.png         \
        stock-icons/24/gtk-about.png                    \
        stock-icons/24/gtk-add.png                      \
@@ -1071,10 +1131,15 @@ STOCK_ICONS = \
        stock-icons/24/gtk-orientation-landscape.png    \
        stock-icons/24/gtk-orientation-reverse-portrait.png     \
        stock-icons/24/gtk-orientation-portrait.png     \
+       stock-icons/24/gtk-page-setup.png               \
        stock-icons/24/gtk-paste.png                    \
        stock-icons/24/gtk-preferences.png              \
        stock-icons/24/gtk-print.png                    \
+       stock-icons/24/gtk-print-error.png              \
+       stock-icons/24/gtk-print-paused.png             \
        stock-icons/24/gtk-print-preview.png            \
+       stock-icons/24/gtk-print-report.png             \
+       stock-icons/24/gtk-print-warning.png            \
        stock-icons/24/gtk-properties.png               \
        stock-icons/24/gtk-quit.png                     \
        stock-icons/24/gtk-redo-ltr.png                 \
@@ -1124,6 +1189,12 @@ GENERATED_ICONS = \
        stock-icons/16/gtk-media-previous-rtl.png       \
        stock-icons/16/gtk-media-rewind-rtl.png         \
        stock-icons/16/gtk-save.png                     \
+       stock-icons/16/drive-harddisk.png               \
+       stock-icons/16/folder.png                       \
+       stock-icons/16/folder-remote.png                \
+       stock-icons/16/user-home.png                    \
+       stock-icons/16/user-desktop.png                 \
+       stock-icons/16/text-x-generic.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           \
@@ -1132,7 +1203,13 @@ GENERATED_ICONS = \
        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
+       stock-icons/24/gtk-save.png                     \
+       stock-icons/24/drive-harddisk.png               \
+       stock-icons/24/folder.png                       \
+       stock-icons/24/folder-remote.png                \
+       stock-icons/24/user-home.png                    \
+       stock-icons/24/user-desktop.png                 \
+       stock-icons/24/text-x-generic.png
 
 # need to copy the icons so that we can replace the generated ones with
 # symlinks, even in the readonly srcdir case
@@ -1165,8 +1242,20 @@ stamp-icons: $(STOCK_ICONS)
           && $(RM) gtk-media-rewind-rtl.png                            \
           && $(LN_S) gtk-media-forward-ltr.png gtk-media-rewind-rtl.png\
           && $(RM) gtk-save.png                                        \
-          && $(LN_S) gtk-floppy.png gtk-save.png)                      \
-       done                                                            \
+          && $(LN_S) gtk-floppy.png gtk-save.png                       \
+          && $(RM) drive-harddisk.png                                  \
+          && $(LN_S) gtk-harddisk.png drive-harddisk.png               \
+          && $(RM) folder.png                                          \
+          && $(LN_S) gtk-directory.png folder.png                      \
+          && $(RM) folder-remote.png                                   \
+          && $(LN_S) gtk-directory.png folder-remote.png               \
+          && $(RM) user-home.png                                       \
+          && $(LN_S) gtk-directory.png user-home.png                   \
+          && $(RM) user-desktop.png                                    \
+          && $(LN_S) gtk-directory.png user-desktop.png                \
+          && $(RM) text-x-generic.png                                  \
+          && $(LN_S) gtk-file.png text-x-generic.png                   \
+       ) done                                                          \
        && touch stamp-icons
 
 if CROSS_COMPILING
@@ -1199,8 +1288,6 @@ EXTRA_DIST +=                   \
        gtkwin32embed.h         \
        gtkwin32embedwidget.h   \
        gtkwin32embedwidget.c   \
-       gtkfilesystemwin32.h    \
-       gtkfilesystemwin32.c    \
        gtkprint-win32.h        \
        gtkprint-win32.c        \
        gtksearchenginequartz.h \
@@ -1218,3 +1305,5 @@ EXTRA_DIST +=                   \
 
 
 install-data-local:
+
+-include $(top_srcdir)/git.mk