2.13.0

[~andy/gtk] / gtk / Makefile.am

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 7e1395365d3f27686ac1a6eab49cffc72d526a0c..fe084074656fb6c94a363331ca5b8ea55d4f6f6b 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -9,7 +9,7 @@ GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %
 endif
 
 SUBDIRS = theme-bits $(xdgmimedir) . tests
-DIST_SUBDIRS=theme-bits xdgmime
+DIST_SUBDIRS=theme-bits xdgmime tests
 
 if HAVE_CUPS
 GTK_PRINT_BACKENDS=file,cups
@@ -29,6 +29,7 @@ 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                             \
@@ -299,6 +300,7 @@ gtk_public_h_sources =          \
        gtktoolbar.h            \
        gtktoolbutton.h         \
        gtktoolitem.h           \
+       gtktoolshell.h          \
        gtktooltip.h            \
        gtktooltips.h           \
        gtktree.h               \
@@ -587,6 +589,7 @@ gtk_base_c_sources =            \
        gtktoolbar.c            \
        gtktoolbutton.c         \
        gtktoolitem.c           \
+       gtktoolshell.c          \
        gtktooltip.c            \
        gtktooltips.c           \
        gtktree.c               \
@@ -817,7 +820,7 @@ gtktypefuncs.c: @REBUILD@ $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
          ${CPP} $(DEFS) $(INCLUDES) -DGTK_ENABLE_BROKEN $(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/^/vgt=/; s/$$/();/; }' > xgen-gtf \
+         sed '{ s/^/*tp++ = /; s/$$/();/; }' > xgen-gtf \
        && cp xgen-gtf $@ && rm -f xgen-gtf
 gtktestutils.c: gtktypefuncs.c
 
@@ -969,6 +972,7 @@ 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                    \
@@ -1070,6 +1074,7 @@ 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                    \