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

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

diff --git a/perf/Makefile.am b/perf/Makefile.am
index 9fcf418951db5010dac9c36f83368eeb7c362cfb..e76f605bc3880d02a98cd0c0dedc7334c780acb4 100644 (file)
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am for gtk+/perf
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES =                             \
+AM_CPPFLAGS =                          \
        -I$(top_srcdir)                 \
        -I$(top_builddir)/gdk           \
        -I$(top_srcdir)/gdk             \
@@ -10,15 +10,13 @@ INCLUDES =                          \
        $(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,18 +48,6 @@ 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
@@ -85,7 +66,6 @@ typebuiltins.c: @REBUILD@ $(headers_with_enums) typebuiltins.c.template
 
 EXTRA_DIST +=          \
        README          \
-       marshalers.list \
        typebuiltins.c.template \
        typebuiltins.h.template \
        $(BUILT_SOURCES)
@@ -96,3 +76,5 @@ distclean-local:
        if test $(srcdir) != .; then \
          rm -f $(MAINTAINERCLEANFILES); \
        fi
+
+-include $(top_srcdir)/git.mk