GtkStatusIcon: Remove get/set_blinking() declarations from header.

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

diff --git a/perf/Makefile.am b/perf/Makefile.am
index f3cee2cfb0e972b57563cbb9aa49921383ee381a..6b95b16b48c8d11341d3f952f79f259ff9b21682 100644 (file)
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -1,25 +1,23 @@
 ## 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 =                                                                 \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
        $(top_builddir)/gdk/$(gdktargetlib)                             \
        $(top_builddir)/gtk/$(gtktargetlib)
 
 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
@@ -63,7 +61,7 @@ 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)       
+       && echo timestamp > $(@F)
 marshalers.c: @REBUILD@ marshalers.list
        $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/marshalers.list --body >> xgen-gmlc \
        && cp xgen-gmlc marshalers.c \
@@ -97,3 +95,5 @@ distclean-local:
        if test $(srcdir) != .; then \
          rm -f $(MAINTAINERCLEANFILES); \
        fi
+
+-include $(top_srcdir)/git.mk