Merge branch 'bgo593793-filechooser-recent-folders-master'

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

diff --git a/perf/Makefile.am b/perf/Makefile.am
index d466f6ddf89c59d0589b40119708b77017254dbd..e76f605bc3880d02a98cd0c0dedc7334c780acb4 100644 (file)
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -1,24 +1,22 @@
 ## Makefile.am for gtk+/perf
-
-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)                      \
+include $(top_srcdir)/Makefile.decl
+
+AM_CPPFLAGS =                          \
+       -I$(top_srcdir)                 \
+       -I$(top_builddir)/gdk           \
+       -I$(top_srcdir)/gdk             \
+       -DGDK_DISABLE_DEPRECATED        \
+       -DGTK_DISABLE_DEPRECATED        \
+       $(GTK_DEBUG_FLAGS)              \
        $(GTK_DEP_CFLAGS)
 
-DEPS =                                                                 \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
-       $(top_builddir)/gdk/$(gdktargetlib)                             \
-       $(top_builddir)/gtk/$(gtktargetlib)
+DEPS = \
+       $(top_builddir)/gtk/libgtk-3.la
 
-LDADDS =                                                               \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
-       $(top_builddir)/gdk/$(gdktargetlib)                             \
-       $(top_builddir)/gtk/$(gtktargetlib)
+LDADDS = \
+       $(top_builddir)/gtk/libgtk-3.la \
+       $(top_builddir)/gdk/libgdk-3.la \
+       $(GTK_DEP_LIBS)
 
 noinst_PROGRAMS        =       \
        testperf
@@ -32,8 +30,6 @@ testperf_SOURCES =            \
        gtkwidgetprofiler.c     \
        gtkwidgetprofiler.h     \
        main.c                  \
-       marshalers.c            \
-       marshalers.h            \
        textview.c              \
        treeview.c              \
        typebuiltins.c          \
@@ -41,13 +37,10 @@ testperf_SOURCES =          \
        widgets.h
 
 BUILT_SOURCES =                        \
-       marshalers.c            \
-       marshalers.h            \
        typebuiltins.c          \
        typebuiltins.h
 
 stamp_files =                  \
-       stamp-marshalers.h      \
        stamp-typebuiltins.h
 
 headers_with_enums =           \
@@ -55,47 +48,26 @@ headers_with_enums =                \
 
 MAINTAINERCLEANFILES = $(BUILT_SOURCES) $(stamp_files)
 
-marshalers.h: stamp-marshalers.h
-       @true
-
-stamp-marshalers.h: @REBUILD@ marshalers.list
-       $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/marshalers.list --header >> xgen-gmlh \
-       && (cmp -s xgen-gmlh marshalers.h || cp xgen-gmlh marshalers.h) \
-       && rm -f xgen-gmlh \
-       && echo timestamp > $(@F)       
-marshalers.c: @REBUILD@ marshalers.list
-       $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/marshalers.list --body >> xgen-gmlc \
-       && cp xgen-gmlc marshalers.c \
-       && rm -f xgen-gmlc
 
 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
 
 
-EXTRA_DIST =           \
+EXTRA_DIST +=          \
        README          \
-       marshalers.list \
+       typebuiltins.c.template \
+       typebuiltins.h.template \
        $(BUILT_SOURCES)
 
 # if srcdir!=builddir, clean out maintainer-clean files from builddir
@@ -104,3 +76,5 @@ distclean-local:
        if test $(srcdir) != .; then \
          rm -f $(MAINTAINERCLEANFILES); \
        fi
+
+-include $(top_srcdir)/git.mk