Merge branch 'master' into client-side-windows

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

diff --git a/perf/Makefile.am b/perf/Makefile.am
index 8e7ae186116bad1e883daaf48ddd07e4d47bdcd8..934cf24da9e6f1e5078764d989a199a01701d28b 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                     \
-       -DG_DISABLE_DEPRECATED                  \
-       -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 =                                                                 \
@@ -28,12 +27,74 @@ testperf_DEPENDENCIES = $(TEST_DEPS)
 
 testperf_LDADD = $(LDADDS)
 
-testperf_SOURCES =     \
-       appwindow.c     \
-       appwindow.h     \
-       main.c          \
-       timers.c        \
-       timers.h
+testperf_SOURCES =             \
+       appwindow.c             \
+       gtkwidgetprofiler.c     \
+       gtkwidgetprofiler.h     \
+       main.c                  \
+       marshalers.c            \
+       marshalers.h            \
+       textview.c              \
+       treeview.c              \
+       typebuiltins.c          \
+       typebuiltins.h          \
+       widgets.h
 
-EXTRA_DIST =   \
-       README
+BUILT_SOURCES =                        \
+       marshalers.c            \
+       marshalers.h            \
+       typebuiltins.c          \
+       typebuiltins.h
+
+stamp_files =                  \
+       stamp-marshalers.h      \
+       stamp-typebuiltins.h
+
+headers_with_enums =           \
+       gtkwidgetprofiler.h
+
+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) 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) 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 +=          \
+       README          \
+       marshalers.list \
+       typebuiltins.c.template \
+       typebuiltins.h.template \
+       $(BUILT_SOURCES)
+
+# if srcdir!=builddir, clean out maintainer-clean files from builddir
+# this allows dist to pass.
+distclean-local:
+       if test $(srcdir) != .; then \
+         rm -f $(MAINTAINERCLEANFILES); \
+       fi
+
+-include $(top_srcdir)/git.mk