2.13.0

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

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 79e2327320d5e115599b0442d0eba5b7967bd018..fe084074656fb6c94a363331ca5b8ea55d4f6f6b 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1,14 +1,15 @@
 # Makefile.am for gtk+/gtk
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = theme-bits . tests
+xdgmimedir =
 
 if OS_UNIX
-SUBDIRS += xdgmime
+xdgmimedir += xdgmime
 GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
 endif
 
-DIST_SUBDIRS=theme-bits xdgmime
+SUBDIRS = theme-bits $(xdgmimedir) . tests
+DIST_SUBDIRS=theme-bits xdgmime tests
 
 if HAVE_CUPS
 GTK_PRINT_BACKENDS=file,cups
@@ -28,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                             \
@@ -298,6 +300,7 @@ gtk_public_h_sources =          \
        gtktoolbar.h            \
        gtktoolbutton.h         \
        gtktoolitem.h           \
+       gtktoolshell.h          \
        gtktooltip.h            \
        gtktooltips.h           \
        gtktree.h               \
@@ -586,6 +589,7 @@ gtk_base_c_sources =            \
        gtktoolbar.c            \
        gtktoolbutton.c         \
        gtktoolitem.c           \
+       gtktoolshell.c          \
        gtktooltip.c            \
        gtktooltips.c           \
        gtktree.c               \
@@ -795,28 +799,18 @@ gtkmarshal.c: @REBUILD@ gtkmarshal.list
         echo "#define __gtk_marshal_MARSHAL_C__"; \
         echo "#include \"gtkaliasdef.c\"") >> xgen-gmc \
        && cp xgen-gmc gtkmarshal.c \
-       && rm -f xgen-gmc 
+       && rm -f xgen-gmc
 
 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__ */" \
+stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.h.template
+       ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.h.template \
                $(gtk_public_h_sources) ) >> xgen-gtbh \
        && (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h ) \
        && rm -f xgen-gtbh \
        && echo timestamp > $(@F)
-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 "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" \
+gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.c.template
+       ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.c.template \
                $(gtk_public_h_sources) ) > xgen-gtbc \
        && cp xgen-gtbc gtktypebuiltins.c  \
        && rm -f xgen-gtbc
@@ -824,8 +818,9 @@ gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile
 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 -o '\<g[td]k_[a-zA-Z0-9_]+_get_type\>' | sort | uniq | \
-         sed '{ s/^/vgt=/; s/$$/();/; }' > xgen-gtf \
+         grep -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
+         sort | uniq | \
+         sed '{ s/^/*tp++ = /; s/$$/();/; }' > xgen-gtf \
        && cp xgen-gtf $@ && rm -f xgen-gtf
 gtktestutils.c: gtktypefuncs.c
 
@@ -977,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                    \
@@ -1078,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                    \
@@ -1219,6 +1216,9 @@ EXTRA_DIST +=                   \
        makegtkalias.pl         \
        aliasfilescheck.sh      \
        abicheck.sh             \
-       pltcheck.sh
+       pltcheck.sh             \
+       gtktypebuiltins.c.template      \
+       gtktypebuiltins.h.template
+
 
 install-data-local: