Deprecate widget flag: GTK_WIDGET_MAPPED

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

diff --git a/perf/Makefile.am b/perf/Makefile.am
index 3cb702951286eede3bac6643aaecf8bb61dff4d5..5662b32df2d2824372b3f1bbf218cbb95310dc54 100644 (file)
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -1,14 +1,13 @@
 ## Makefile.am for gtk+/perf
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES =                                     \
-       -I$(top_srcdir)                         \
-       -I$(top_builddir)/gdk                   \
-       -I$(top_srcdir)/gdk                     \
-       -DGDK_PIXBUF_DISABLE_DEPRECATED         \
-       -DGDK_DISABLE_DEPRECATED                \
-       -DGTK_DISABLE_DEPRECATED                \
-       $(GTK_DEBUG_FLAGS)                      \
+INCLUDES =                             \
+       -I$(top_srcdir)                 \
+       -I$(top_builddir)/gdk           \
+       -I$(top_srcdir)/gdk             \
+       -DGDK_DISABLE_DEPRECATED        \
+       -DGTK_DISABLE_DEPRECATED        \
+       $(GTK_DEBUG_FLAGS)              \
        $(GTK_DEP_CFLAGS)
 
 DEPS =                                                                 \
@@ -19,7 +18,8 @@ DEPS =                                                                        \
 LDADDS =                                                               \
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
        $(top_builddir)/gdk/$(gdktargetlib)                             \
-       $(top_builddir)/gtk/$(gtktargetlib)
+       $(top_builddir)/gtk/$(gtktargetlib)                             \
+       $(GTK_DEP_LIBS)
 
 noinst_PROGRAMS        =       \
        testperf
@@ -71,24 +71,14 @@ marshalers.c: @REBUILD@ marshalers.list
 
 typebuiltins.h: stamp-typebuiltins.h
        @true
-stamp-typebuiltins.h: @REBUILD@ $(headers_with_enums) Makefile
-       ( cd $(srcdir) && $(GLIB_MKENUMS) \
-                       --fhead "#ifndef __TYPE_BUILTINS_H__\n#define __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 /* __TYPE_BUILTINS_H__ */" \
+stamp-typebuiltins.h: @REBUILD@ $(headers_with_enums) typebuiltins.h.template
+       ( cd $(srcdir) && $(GLIB_MKENUMS) --template typebuiltins.h.template \
                $(headers_with_enums) ) >> xgen-gtbh \
        && (cmp -s xgen-gtbh typebuiltins.h || cp xgen-gtbh typebuiltins.h ) \
        && rm -f xgen-gtbh \
        && echo timestamp > $(@F)
-typebuiltins.c: @REBUILD@ $(headers_with_enums) Makefile
-       ( cd $(srcdir) && $(GLIB_MKENUMS) \
-                       --fhead "#include \"gtkwidgetprofiler.h\"" \
-                       --ftail "#define __TYPE_BUILTINS_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 (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
+typebuiltins.c: @REBUILD@ $(headers_with_enums) typebuiltins.c.template
+       ( cd $(srcdir) && $(GLIB_MKENUMS) --template typebuiltins.c.template \
                $(headers_with_enums) ) > xgen-gtbc \
        && cp xgen-gtbc typebuiltins.c  \
        && rm -f xgen-gtbc
@@ -97,6 +87,8 @@ typebuiltins.c: @REBUILD@ $(headers_with_enums) Makefile
 EXTRA_DIST +=          \
        README          \
        marshalers.list \
+       typebuiltins.c.template \
+       typebuiltins.h.template \
        $(BUILT_SOURCES)
 
 # if srcdir!=builddir, clean out maintainer-clean files from builddir
@@ -105,3 +97,5 @@ distclean-local:
        if test $(srcdir) != .; then \
          rm -f $(MAINTAINERCLEANFILES); \
        fi
+
+-include $(top_srcdir)/git.mk