Bump the version to 3.0.0

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

diff --git a/demos/Makefile.am b/demos/Makefile.am
index a0fcc3d67385cdbb8ee5631f92f02e2e495635fc..dfe3a7d7524a24ce8fff178c229e94f75b53879a 100644 (file)
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -1,58 +1,59 @@
 ## Makefile.am for gtk+/demos
+include $(top_srcdir)/Makefile.decl
 
-INCLUDES = @STRIP_BEGIN@ \
-       -I$(top_srcdir)                                 \
-       -I$(top_builddir)/gdk-pixbuf                    \
-       -I$(top_builddir)/gdk                           \
-       -I$(top_builddir)/gtk                           \
-       -DGTK_DISABLE_COMPAT_H                          \
-       @GTK_DEBUG_FLAGS@                               \
-       @GTK_XIM_FLAGS@                                 \
-       @GTK_LOCALE_FLAGS@                              \
-       @PANGO_CFLAGS@                                  \
-       @GLIB_CFLAGS@                                   \
-       @more_cflags@                                   \
-@STRIP_END@
+SUBDIRS = gtk-demo
+
+INCLUDES =                             \
+       -I$(top_srcdir)                 \
+       -I$(top_builddir)/gdk           \
+       -DGDK_DISABLE_DEPRECATED        \
+       -DGTK_DISABLE_DEPRECATED        \
+       $(GTK_DEBUG_FLAGS)              \
+       $(GTK_DEP_CFLAGS)
 
 DEPS = \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf.la     \
-       $(top_builddir)/gdk/@gdktargetlib@              \
-       $(top_builddir)/gtk/@gtktargetlib@
-
-LDADDS = @STRIP_BEGIN@                                         \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf.la     \
-       $(top_builddir)/gdk/@gdktargetlib@              \
-       $(top_builddir)/gtk/@gtktargetlib@              \
-       @more_ldflags@                                  \
-       @more_libs@                                     \
-       @GDK_WLIBS@                                     \
-       @PANGO_LIBS@                                    \
-       @GLIB_LIBS@                                     \
-       @GTK_LIBS_EXTRA@                                \
-       -lm                                             \
-@STRIP_END@
+       $(top_builddir)/gtk/libgtk-3.la
+
+LDADDS = \
+       $(top_builddir)/gtk/libgtk-3.la \
+       $(top_builddir)/gdk/libgdk-3.la \
+       $(GTK_DEP_LIBS)                         \
+       $(MATH_LIB)
 
 noinst_PROGRAMS =              \
-       testpixbuf              \
-       testpixbuf-drawable     \
        testanimation           \
+       testpixbuf-color        \
+       testpixbuf-save         \
        testpixbuf-scale        \
        pixbuf-demo
 
-testpixbuf_DEPENDENCIES = $(DEPS)
-testpixbuf_drawable_DEPENDENCIES = $(DEPS)
+testpixbuf_save_DEPENDENCIES = $(DEPS)
+testpixbuf_color_DEPENDENCIES = $(DEPS)
 testpixbuf_scale_DEPENDENCIES = $(DEPS)
 testanimation_DEPENDENCIES = $(DEPS)
 pixbuf_demo_DEPENDENCIES = $(DEPS)
 
-testpixbuf_LDADD = $(LDADDS) -lgmodule
-testpixbuf_drawable_LDADD = $(LDADDS)
+testpixbuf_save_LDADD = $(LDADDS)
+testpixbuf_color_LDADD = $(LDADDS)
 testpixbuf_scale_LDADD = $(LDADDS)
-testanimation_LDADD = $(LDADDS) -lgmodule
-pixbuf_demo_LDADD = $(LDADDS) -lgmodule
+testanimation_LDADD = $(LDADDS)
+pixbuf_demo_LDADD = $(LDADDS)
 
-testpixbuf_SOURCES = testpixbuf.c pixbuf-init.c
-testpixbuf_drawable_SOURCES = testpixbuf-drawable.c pixbuf-init.c
+testpixbuf_save_SOURCES = testpixbuf-save.c
+testpixbuf_color_SOURCES = testpixbuf-color.c
 testpixbuf_scale_SOURCES = testpixbuf-scale.c pixbuf-init.c
 testanimation_SOURCES = testanimation.c pixbuf-init.c
 pixbuf_demo_SOURCES = pixbuf-demo.c pixbuf-init.c
+
+EXTRA_DIST +=                  \
+       apple-red.png           \
+       background.jpg          \
+       gnome-applets.png       \
+       gnome-calendar.png      \
+       gnome-foot.png          \
+       gnome-gimp.png          \
+       gnome-gmush.png         \
+       gnome-gsame.png         \
+       gnu-keys.png
+
+-include $(top_srcdir)/git.mk