]> Pileus Git - ~andy/gtk/blobdiff - gtk/Makefile.am
gail: Move from modules/other/gail to gtk/a11y
[~andy/gtk] / gtk / Makefile.am
index 6dd2e01b20b1592a59180d3dc94783cfb99a7ed3..e1eeca304d305f46fb2841daf6fb6318a964e6c9 100644 (file)
@@ -3,7 +3,8 @@ include $(top_srcdir)/Makefile.decl
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = \
-       --add-include-path=../gdk
+       --add-include-path=../gdk \
+       --warn-all
 INTROSPECTION_COMPILER_ARGS = \
        --includedir=$(srcdir) \
     --includedir=. \
@@ -15,8 +16,7 @@ else
 GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
 endif
 
-SUBDIRS = theme-bits . tests
-DIST_SUBDIRS = theme-bits tests
+SUBDIRS = . a11y tests
 
 if HAVE_PAPI_CUPS
 GTK_PRINT_BACKENDS=file,papi,cups
@@ -108,7 +108,7 @@ endif
 
 libgtkincludedir = $(includedir)/gtk-3.0/gtk
 libadd = \
-       $(top_builddir)/gdk/libgdk-3.0.la       \
+       $(top_builddir)/gdk/libgdk-3.la \
        $(GTK_DEP_LIBS)
 deps =
 
@@ -143,6 +143,7 @@ endif
 # by configure)
 gtk_public_h_sources =                 \
        gtk.h                   \
+       gtkx.h                  \
        gtkaboutdialog.h        \
        gtkaccelgroup.h         \
        gtkaccellabel.h         \
@@ -173,7 +174,6 @@ gtk_public_h_sources =              \
        gtkcellarea.h           \
        gtkcellareacontext.h    \
        gtkcellareabox.h        \
-       gtkcellareaboxcontext.h \
        gtkcelleditable.h       \
        gtkcelllayout.h         \
        gtkcellrenderer.h       \
@@ -241,6 +241,7 @@ gtk_public_h_sources =              \
        gtklayout.h             \
        gtklinkbutton.h         \
        gtkliststore.h          \
+       gtklockbutton.h         \
        gtkmain.h               \
        gtkmenu.h               \
        gtkmenubar.h            \
@@ -252,8 +253,10 @@ gtk_public_h_sources =             \
        gtkmodules.h            \
        gtkmountoperation.h     \
        gtknotebook.h           \
+       gtknumerableicon.h      \
        gtkoffscreenwindow.h    \
        gtkorientable.h         \
+       gtkoverlay.h            \
        gtkpagesetup.h          \
        gtkpaned.h              \
        gtkpapersize.h          \
@@ -304,6 +307,7 @@ gtk_public_h_sources =              \
        gtktable.h              \
        gtktearoffmenuitem.h    \
        gtktestutils.h          \
+       gtktextattributes.h     \
        gtktextbuffer.h         \
        gtktextbufferrichtext.h \
        gtktextchild.h          \
@@ -333,7 +337,6 @@ gtk_public_h_sources =              \
        gtktreestore.h          \
        gtktreeview.h           \
        gtktreeviewcolumn.h     \
-       gtktypeutils.h          \
        gtkuimanager.h          \
        gtkvbbox.h              \
        gtkvbox.h               \
@@ -373,14 +376,22 @@ endif
 
 # GTK+ header files that don't get installed
 gtk_private_h_sources =                \
-       gtk9slice.h             \
        gtkaccelgroupprivate.h  \
+       gtkaccessibleprivate.h  \
        gtkanimationdescription.h \
        gtkappchooserprivate.h  \
        gtkappchoosermodule.h   \
        gtkappchooseronline.h   \
+       gtkbindingsprivate.h    \
+       gtkborderimageprivate.h \
        gtkbuilderprivate.h     \
        gtkbuttonprivate.h      \
+       gtkcellareaboxcontextprivate.h  \
+       gtkcontainerprivate.h   \
+       gtkcssparserprivate.h   \
+       gtkcssproviderprivate.h \
+       gtkcssselectorprivate.h \
+       gtkcsstypesprivate.h    \
        gtkcustompaperunixdialog.h \
        gtkdndcursors.h         \
        gtkentryprivate.h       \
@@ -392,18 +403,21 @@ gtk_private_h_sources =           \
        gtkfilesystem.h         \
        gtkfilesystemmodel.h    \
        gtkiconcache.h          \
+       gtkimageprivate.h       \
        gtkimcontextsimpleseqs.h \
        gtkintl.h               \
        gtkkeyhash.h            \
+       gtkmainprivate.h        \
        gtkmenuprivate.h        \
        gtkmenuitemprivate.h    \
        gtkmenushellprivate.h   \
        gtkmnemonichash.h       \
        gtkmodifierstyle.h      \
        gtkmountoperationprivate.h \
+       gtknumerableiconprivate.h \
+       gtkorientableprivate.h  \
        gtkpango.h              \
        gtkpathbar.h            \
-       gtkplugprivate.h        \
        gtkprintoperation-private.h \
        gtkprintutils.h         \
        gtkprivate.h            \
@@ -412,12 +426,18 @@ gtk_private_h_sources =           \
        gtkrecentchooserdefault.h \
        gtkrecentchooserprivate.h \
        gtkrecentchooserutils.h \
+       gtkroundedboxprivate.h  \
+       gtkscaleprivate.h       \
        gtksearchengine.h       \
        gtksearchenginesimple.h \
        gtkselectionprivate.h   \
        gtksettingsprivate.h    \
+       gtkshadowprivate.h      \
        gtksizegroup-private.h  \
        gtksocketprivate.h      \
+       gtkstylecontextprivate.h \
+       gtkstylepropertiesprivate.h \
+       gtkstylepropertyprivate.h \
        gtktextbtree.h          \
        gtktextbufferserialize.h \
        gtktextchildprivate.h   \
@@ -427,6 +447,7 @@ gtk_private_h_sources =             \
        gtktexttagprivate.h     \
        gtktexttypes.h          \
        gtktextutil.h           \
+       gtkthemingengineprivate.h \
        gtktimeline.h           \
        gtktoolpaletteprivate.h \
        gtktreedatalist.h       \
@@ -439,7 +460,6 @@ gtk_private_h_sources =             \
 
 # GTK+ C sources to build the library from
 gtk_base_c_sources =           \
-       gtk9slice.c             \
        gtkquery.c              \
        gtksearchengine.c       \
        gtksearchenginesimple.c \
@@ -469,6 +489,7 @@ gtk_base_c_sources =                \
        gtkbin.c                \
        gtkbindings.c           \
        gtkborder.c             \
+       gtkborderimage.c        \
        gtkbox.c                \
        gtkbuildable.c          \
        gtkbuilder.c            \
@@ -499,7 +520,10 @@ gtk_base_c_sources =               \
        gtkcombobox.c           \
        gtkcomboboxtext.c       \
        gtkcontainer.c          \
+       gtkcssparser.c          \
        gtkcssprovider.c        \
+       gtkcssselector.c        \
+       gtkcsstypes.c           \
        gtkdialog.c             \
        gtkdrawingarea.c        \
        gtkeditable.c           \
@@ -551,6 +575,7 @@ gtk_base_c_sources =                \
        gtklayout.c             \
        gtklinkbutton.c         \
        gtkliststore.c          \
+       gtklockbutton.c         \
        gtkmain.c               \
        gtkmarshalers.c         \
        gtkmenu.c               \
@@ -565,14 +590,15 @@ gtk_base_c_sources =              \
        gtkmodules.c            \
        gtkmountoperation.c     \
        gtknotebook.c           \
+       gtknumerableicon.c      \
        gtkoffscreenwindow.c    \
        gtkorientable.c         \
+       gtkoverlay.c            \
        gtkpagesetup.c          \
        gtkpaned.c              \
        gtkpango.c              \
        gtkpapersize.c          \
        gtkpathbar.c            \
-       gtkplug.c               \
        gtkprintcontext.c       \
        gtkprintoperation.c     \
        gtkprintoperationpreview.c \
@@ -595,6 +621,7 @@ gtk_base_c_sources =                \
        gtkrecentchooser.c      \
        gtkrecentfilter.c       \
        gtkrecentmanager.c      \
+       gtkroundedbox.c         \
        gtkscale.c              \
        gtkscalebutton.c        \
        gtkscrollable.c         \
@@ -607,8 +634,8 @@ gtk_base_c_sources =                \
        gtksettings.c           \
        gtksizegroup.c          \
        gtksizerequest.c        \
+       gtkshadow.c             \
        gtkshow.c               \
-       gtksocket.c             \
        gtkspinbutton.c         \
        gtkspinner.c            \
        gtkstatusbar.c          \
@@ -616,6 +643,7 @@ gtk_base_c_sources =                \
        gtkstock.c              \
        gtkstylecontext.c       \
        gtkstyleproperties.c    \
+       gtkstyleproperty.c      \
        gtkstyleprovider.c      \
        gtkstyle.c              \
        gtkswitch.c             \
@@ -623,6 +651,7 @@ gtk_base_c_sources =                \
        gtktable.c              \
        gtktearoffmenuitem.c    \
        gtktestutils.c          \
+       gtktextattributes.c     \
        gtktextbtree.c          \
        gtktextbuffer.c         \
        gtktextbufferrichtext.c \
@@ -662,7 +691,6 @@ gtk_base_c_sources =                \
        gtktreeview.c           \
        gtktreeviewcolumn.c     \
        gtktypebuiltins.c       \
-       gtktypeutils.c          \
        gtkuimanager.c          \
        gtkvbbox.c              \
        gtkvbox.c               \
@@ -718,25 +746,19 @@ gtk_c_sources += $(gtk_os_win32_c_sources)
 endif
 
 gtk_use_x11_c_sources =        \
-       gtkplug-x11.c           \
-       gtksocket-x11.c         \
+       gtkplug.c               \
+       gtksocket.c             \
        gtkxembed.c             \
        gtktrayicon-x11.c       \
        gtkmountoperation-x11.c
 gtk_use_win32_c_sources =      \
-       gtkplug-win32.c         \
-       gtksocket-win32.c       \
        gtkwin32embed.c         \
        gtkwin32embedwidget.c   \
        gtkmountoperation-stub.c
 gtk_use_quartz_c_sources =     \
        gtksearchenginequartz.c \
-       gtkplug-stub.c          \
-       gtksocket-stub.c        \
        gtkmountoperation-stub.c
 gtk_use_stub_c_sources =       \
-       gtkplug-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
@@ -867,17 +889,17 @@ gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.c.template
        && cp xgen-gtbc gtktypebuiltins.c  \
        && rm -f xgen-gtbc
 
-gtktypefuncs.c: @REBUILD@ $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
-       $(AM_V_GEN) echo '#include <gtk/gtk.h>' > xgen-gtfsrc.c && \
-         ${CPP} $(DEFS) $(INCLUDES) -DGTK_ENABLE_BROKEN $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
+gtktypefuncs.c: @REBUILD@ stamp-gtktypebuiltins.h $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
+       $(AM_V_GEN) echo '#include <gtk/gtkx.h>' > xgen-gtfsrc.c && \
+         ${CPP} $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
          $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
          sort | uniq | \
-         $(SED) '{ s/^/*tp++ = /; s/$$/();/; }' > xgen-gtf \
+         $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\|gtk_plug_\|gtk_socket_\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; }' > xgen-gtf \
        && cp xgen-gtf $@ && rm -f xgen-gtf
 gtktestutils.c: gtktypefuncs.c
 
 # target platform:
-lib_LTLIBRARIES = libgtk-3.0.la
+lib_LTLIBRARIES = libgtk-3.la
 
 gtkincludedir = $(includedir)/gtk-3.0/gtk
 gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h
@@ -885,36 +907,35 @@ gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk
 gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk
 gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
 
-libgtk_3_0_la_SOURCES = $(gtk_c_sources)
-libgtk_3_0_la_LDFLAGS = $(libtool_opts)
-libgtk_3_0_la_LIBADD = $(libadd)
-libgtk_3_0_la_DEPENDENCIES = $(deps)
-
-#libgtk_win32_3_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
-#libgtk_win32_3_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
-#libgtk_win32_3_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps)
+libgtk_3_la_SOURCES = $(gtk_c_sources)
+libgtk_3_la_LDFLAGS = $(libtool_opts)
+libgtk_3_la_LIBADD = $(libadd)
+libgtk_3_la_DEPENDENCIES = $(deps)
 
 if USE_WIN32
+libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
+libgtk_3_la_LDFLAGS += -Wl,-luuid
+libgtk_3_la_DEPENDENCIES += $(gtk_def) $(gtk_win32_res) $(deps)
 libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
 endif
 
 install-exec-hook:
 if DISABLE_EXPLICIT_DEPS
-       $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-3.0.la
+       $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-3.la
 endif
 
 if USE_QUARTZ
 install-mac-key-theme:
-       $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0-key
-       $(INSTALL_DATA) $(srcdir)/gtkrc.key.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0-key/gtkrc
+       $(mkdir_p) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0
+       $(INSTALL_DATA) $(srcdir)/gtk-keys.css.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
 uninstall-mac-key-theme:
-       rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0-key/gtkrc
+       rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
 else
 install-mac-key-theme:
 uninstall-mac-key-theme:
 endif
 
-dist-hook: ../build/win32/vs9/gtk.vcproj
+dist-hook: ../build/win32/vs9/gtk.vcproj ../build/win32/vs10/gtk.vcxproj ../build/win32/vs10/gtk.vcxproj.filters
 
 ../build/win32/vs9/gtk.vcproj: ../build/win32/vs9/gtk.vcprojin
        for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
@@ -925,20 +946,40 @@ dist-hook: ../build/win32/vs9/gtk.vcproj
        done >libgtk.sourcefiles
        $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk.vcprojin >$@
        rm libgtk.sourcefiles
+       
+../build/win32/vs10/gtk.vcxproj: ../build/win32/vs10/gtk.vcxprojin
+       for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
+               case $$F in \
+               *.c) echo '   <ClCompile Include="..\..\..\gtk\'$$F'" />' \
+                    ;; \
+               esac; \
+       done >libgtk.vs10.sourcefiles
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk.vcxprojin >$@
+       rm libgtk.vs10.sourcefiles
+       
+../build/win32/vs10/gtk.vcxproj.filters: ../build/win32/vs10/gtk.vcxproj.filtersin
+       for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
+               case $$F in \
+               *.c) echo '   <ClCompile Include="..\..\..\gtk\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
+                    ;; \
+               esac; \
+       done >libgtk.vs10.sourcefiles.filters
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk.vcxproj.filtersin >$@
+       rm libgtk.vs10.sourcefiles.filters
 
 # Install a RC file for the default GTK+ theme, and key themes
 install-data-local: install-ms-lib install-def-file install-mac-key-theme
-       $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0
-       $(INSTALL_DATA) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtkrc
-       $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0-key
-       $(INSTALL_DATA) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Default/gtk-3.0-key/gtkrc
-       $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0-key
-       $(INSTALL_DATA) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0-key/gtkrc
+       $(mkdir_p) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0
+       $(INSTALL_DATA) $(srcdir)/gtk.css.raleigh $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtk.css
+       $(mkdir_p) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0
+       $(INSTALL_DATA) $(srcdir)/gtk-keys.css.default $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css
+       $(mkdir_p) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0
+       $(INSTALL_DATA) $(srcdir)/gtk-keys.css.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css
 
 uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-mac-key-theme
-       rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtkrc
-       rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-3.0-key/gtkrc
-       rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0-key/gtkrc
+       rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtk.css
+       rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css
+       rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css
 
 # if srcdir!=builddir, clean out maintainer-clean files from builddir
 # this allows dist to pass.
@@ -947,35 +988,40 @@ distclean-local:
          rm -f $(MAINTAINERCLEANFILES); \
        fi
 
-DEPS = libgtk-3.0.la $(top_builddir)/gdk/libgdk-3.0.la
+DEPS = libgtk-3.la $(top_builddir)/gdk/libgdk-3.la
 
 TEST_DEPS = $(DEPS) immodules.cache
 
 LDADDS =                                                               \
-       libgtk-3.0.la                                                   \
-       $(top_builddir)/gdk/libgdk-3.0.la                               \
+       libgtk-3.la                                                     \
+       $(top_builddir)/gdk/libgdk-3.la                         \
        $(GTK_DEP_LIBS)
 
 if HAVE_INTROSPECTION
 introspection_files = \
-    $(filter-out %private.h gtktextlayout.h, $(gtkinclude_HEADERS)) \
+    $(filter-out %private.h gtktextdisplay.h gtktextlayout.h, $(gtkinclude_HEADERS)) \
     $(gtk_base_c_sources) \
+    gtkprintoperation-unix.c \
     gtktypebuiltins.h \
     gtktypebuiltins.c
 
-Gtk-3.0.gir: $(INTROSPECTION_SCANNER) libgtk-3.0.la $(top_builddir)/gdk/Gdk-3.0.gir Makefile
-Gtk_3_0_gir_SCANNERFLAGS = --warn-all --add-include-path=$(top_builddir)/gdk
+Gtk-3.0.gir: $(INTROSPECTION_SCANNER) libgtk-3.la $(top_builddir)/gdk/Gdk-3.0.gir Makefile
+Gtk_3_0_gir_SCANNERFLAGS =                     \
+       --add-include-path=$(top_builddir)/gdk  \
+       --include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
 if USE_X11
 Gtk_3_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
 endif
-Gtk_3_0_gir_INCLUDES = Atk-1.0 Gdk-3.0
+Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h"
+Gtk_3_0_gir_INCLUDES = Atk-1.0
 Gtk_3_0_gir_CFLAGS = \
                $(INCLUDES) \
                -UGDK_DISABLE_DEPRECATED \
                -UGTK_DISABLE_DEPRECATED \
                -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
-Gtk_3_0_gir_LIBS = libgtk-3.0.la
+Gtk_3_0_gir_LIBS = libgtk-3.la
 Gtk_3_0_gir_FILES = $(introspection_files)
+Gtk_3_0_gir_EXPORT_PACKAGES = gtk+-3.0
 INTROSPECTION_GIRS += Gtk-3.0.gir
 
 girdir = $(datadir)/gir-1.0
@@ -991,10 +1037,10 @@ endif
 # Installed tools
 #
 bin_PROGRAMS = \
-       gtk-query-immodules-3.0 \
-       gtk-update-icon-cache
+       gtk-query-immodules-3.0
 
-bin_SCRIPTS = gtk-builder-convert
+if BUILD_ICON_CACHE
+bin_PROGRAMS += gtk-update-icon-cache
 
 if OS_WIN32
 
@@ -1005,8 +1051,7 @@ if OS_WIN32
 
 GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
 
-bin_SCRIPTS += \
-       $(GTK_UPDATE_ICON_CACHE_MANIFEST)
+bin_SCRIPTS = $(GTK_UPDATE_ICON_CACHE_MANIFEST)
 
 $(GTK_UPDATE_ICON_CACHE_MANIFEST):
        (echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' ; \
@@ -1028,13 +1073,16 @@ $(GTK_UPDATE_ICON_CACHE_MANIFEST):
         echo '</assembly>' ) >$@
 
 endif
+endif
 
 gtk_query_immodules_3_0_DEPENDENCIES = $(DEPS)
 gtk_query_immodules_3_0_LDADD = $(LDADDS)
 gtk_query_immodules_3_0_SOURCES = queryimmodules.c
 
+if BUILD_ICON_CACHE
 gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
 gtk_update_icon_cache_SOURCES = updateiconcache.c
+endif
 
 .PHONY: files test test-debug
 
@@ -1051,6 +1099,7 @@ STOCK_ICONS = \
        stock-icons/16/window-close.png                 \
        stock-icons/16/gtk-connect.png                  \
        stock-icons/16/gtk-convert.png                  \
+       stock-icons/16/edit-clear.png                   \
        stock-icons/16/edit-copy.png                    \
        stock-icons/16/edit-cut.png                     \
        stock-icons/16/edit-delete.png                  \
@@ -1058,7 +1107,7 @@ STOCK_ICONS = \
        stock-icons/16/gtk-disconnect.png               \
        stock-icons/16/gtk-edit.png                     \
        stock-icons/16/system-run.png                   \
-       stock-icons/16/document-x-generic.png           \
+       stock-icons/16/text-x-generic.png               \
        stock-icons/16/edit-find-replace.png            \
        stock-icons/16/edit-find.png                    \
        stock-icons/16/media-floppy.png                 \
@@ -1071,6 +1120,8 @@ STOCK_ICONS = \
        stock-icons/16/go-last-ltr.png                  \
        stock-icons/16/go-top.png                       \
        stock-icons/16/go-up.png                        \
+       stock-icons/16/gtk-caps-lock-warning.png        \
+       stock-icons/16/gtk-color-picker.png             \
        stock-icons/16/drive-harddisk.png               \
        stock-icons/16/help-contents.png                \
        stock-icons/16/go-home.png                      \
@@ -1098,6 +1149,10 @@ STOCK_ICONS = \
        stock-icons/16/network-idle.png                 \
        stock-icons/16/document-new.png                 \
        stock-icons/16/document-open.png                \
+       stock-icons/16/gtk-orientation-landscape.png    \
+       stock-icons/16/gtk-orientation-portrait.png     \
+       stock-icons/16/gtk-orientation-reverse-landscape.png \
+       stock-icons/16/gtk-orientation-reverse-portrait.png \
        stock-icons/16/gtk-page-setup.png               \
        stock-icons/16/edit-paste.png                   \
        stock-icons/16/gtk-preferences.png              \
@@ -1155,6 +1210,7 @@ STOCK_ICONS = \
        stock-icons/24/media-optical.png                \
        stock-icons/24/edit-clear.png                   \
        stock-icons/24/window-close.png                 \
+       stock-icons/24/gtk-caps-lock-warning.png        \
        stock-icons/24/gtk-color-picker.png             \
        stock-icons/24/gtk-connect.png                  \
        stock-icons/24/gtk-convert.png                  \
@@ -1164,7 +1220,7 @@ STOCK_ICONS = \
        stock-icons/24/gtk-disconnect.png               \
        stock-icons/24/gtk-edit.png                     \
        stock-icons/24/system-run.png                   \
-       stock-icons/24/document-x-generic.png           \
+       stock-icons/24/text-x-generic.png               \
        stock-icons/24/edit-find-replace.png            \
        stock-icons/24/edit-find.png                    \
        stock-icons/24/gtk-font.png                     \
@@ -1287,7 +1343,7 @@ GENERATED_ICONS = \
 # need to copy the icons so that we can replace the generated ones with
 # symlinks, even in the readonly srcdir case
 stamp-icons: $(STOCK_ICONS)
-       if [ ! -d stock-icons ]; then                                   \
+       $(AM_V_GEN) if [ ! -d stock-icons ]; then                       \
          for d in 16 20 24 32 48; do                                   \
            mkdir -p stock-icons/$$d;                                   \
          done;                                                         \
@@ -1322,20 +1378,19 @@ stamp-icons: $(STOCK_ICONS)
           && $(LN_S) folder.png user-home.png                          \
           && $(RM) user-desktop.png                                    \
           && $(LN_S) folder.png user-desktop.png                       \
-          && $(RM) text-x-generic.png                                  \
-          && $(LN_S) document-x-generic.png text-x-generic.png         \
        ) done                                                          \
        && touch stamp-icons
 
-if CROSS_COMPILING
+if USE_EXTERNAL_ICON_CACHE
 gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
 else
-gtk_update_icon_cache_program =                                                        \
-          ./gtk-update-icon-cache
+gtk_update_icon_cache_program = ./gtk-update-icon-cache
 endif
 
 gtkbuiltincache.h: @REBUILD@ stamp-icons
+if !USE_EXTERNAL_ICON_CACHE
        $(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
+endif
        $(AM_V_GEN) $(gtk_update_icon_cache_program) --quiet --force --ignore-theme-index               \
           --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
        mv gtkbuiltincache.h.tmp gtkbuiltincache.h
@@ -1343,14 +1398,7 @@ gtkbuiltincache.h: @REBUILD@ stamp-icons
 EXTRA_DIST +=                   \
        $(STOCK_ICONS)          \
        $(GENERATED_ICONS)      \
-       line-arrow.xbm          \
-       line-wrap.xbm           \
-       tree_plus.xbm           \
-       tree_minus.xbm          \
-       tree_minus.xpm          \
-       tree_plus.xpm           \
        gtk.def                 \
-       gtk-builder-convert     \
        gtk-win32.rc            \
        gtk-win32.rc.in         \
        gtkwin32embed.h         \
@@ -1359,10 +1407,10 @@ EXTRA_DIST +=                   \
        gtkprint-win32.h        \
        gtkprint-win32.c        \
        gtksearchenginequartz.h \
-       gtkrc.default           \
-       gtkrc.key.default       \
-       gtkrc.key.emacs         \
-       gtkrc.key.mac           \
+       gtk.css.raleigh         \
+       gtk-keys.css.default    \
+       gtk-keys.css.emacs      \
+       gtk-keys.css.mac        \
        makefile.msc            \
        makefile.msc.in         \
        abicheck.sh             \