call g_test_init() from gtk_test_init().

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

diff --git a/perf/Makefile.am b/perf/Makefile.am
index 96ac157d037040a84fe5354b28f9a2500fe1f5a4..3cb702951286eede3bac6643aaecf8bb61dff4d5 100644 (file)
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -1,10 +1,10 @@
 ## Makefile.am for gtk+/perf
+include $(top_srcdir)/Makefile.decl
 
 INCLUDES =                                     \
        -I$(top_srcdir)                         \
        -I$(top_builddir)/gdk                   \
        -I$(top_srcdir)/gdk                     \
-       -DG_DISABLE_DEPRECATED                  \
        -DGDK_PIXBUF_DISABLE_DEPRECATED         \
        -DGDK_DISABLE_DEPRECATED                \
        -DGTK_DISABLE_DEPRECATED                \
@@ -72,7 +72,7 @@ marshalers.c: @REBUILD@ marshalers.list
 typebuiltins.h: stamp-typebuiltins.h
        @true
 stamp-typebuiltins.h: @REBUILD@ $(headers_with_enums) Makefile
-       ( cd $(srcdir) && glib-mkenums \
+       ( 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" \
@@ -82,7 +82,7 @@ stamp-typebuiltins.h: @REBUILD@ $(headers_with_enums) Makefile
        && rm -f xgen-gtbh \
        && echo timestamp > $(@F)
 typebuiltins.c: @REBUILD@ $(headers_with_enums) Makefile
-       ( cd $(srcdir) && glib-mkenums \
+       ( cd $(srcdir) && $(GLIB_MKENUMS) \
                        --fhead "#include \"gtkwidgetprofiler.h\"" \
                        --ftail "#define __TYPE_BUILTINS_C__\n" \
                        --fprod "\n/* enumerations from \"@filename@\" */" \
@@ -94,7 +94,7 @@ typebuiltins.c: @REBUILD@ $(headers_with_enums) Makefile
        && rm -f xgen-gtbc
 
 
-EXTRA_DIST =           \
+EXTRA_DIST +=          \
        README          \
        marshalers.list \
        $(BUILT_SOURCES)