A new demo.

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

diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index 7d199e09c50957b972fca9579f2c3c010e3a1831..c139feb3dadf9405f5c3149570e095b099dbc6b2 100644 (file)
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -4,55 +4,62 @@ democodedir=$(datadir)/gtk-2.0/demo
 
 ## These should be in the order you want them to appear in the 
 ## demo app, which means alphabetized by demo title, not filename
-demos = @STRIP_BEGIN@  \
-       button_box.c    \
-       colorsel.c      \
-       dialog.c        \
-       drawingarea.c   \
-       images.c        \
-       item_factory.c  \
-       menus.c         \
-       panes.c         \
-       pixbufs.c       \
-       textview.c      \
-@STRIP_END@
+demos =                                                \
+       appwindow.c                             \
+       button_box.c                            \
+       changedisplay.c                         \
+       colorsel.c                              \
+       dialog.c                                \
+       drawingarea.c                           \
+       editable_cells.c                        \
+       entry_completion.c                      \
+       expander.c                              \
+       hypertext.c                             \
+       images.c                                \
+       list_store.c                            \
+       menus.c                                 \
+       panes.c                                 \
+       pixbufs.c                               \
+       sizegroup.c                             \
+       stock_browser.c                         \
+       textview.c                              \
+       tree_store.c                            \
+       ui_manager.c
 
-INCLUDES = @STRIP_BEGIN@ \
+INCLUDES = \
        -DDEMOCODEDIR="\"$(democodedir)\""              \
        -I$(top_srcdir)                                 \
        -I$(top_builddir)/gdk                           \
-       -DGDK_DISABLE_COMPAT_H                          \
+       -DG_DISABLE_DEPRECATED                          \
+       -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
        -DGDK_DISABLE_DEPRECATED                        \
-       -DGTK_DISABLE_COMPAT_H                          \
        -DGTK_DISABLE_DEPRECATED                        \
-       @GTK_DEBUG_FLAGS@                               \
-       @GTK_DEP_CFLAGS@                                \
-@STRIP_END@
+       $(GTK_DEBUG_FLAGS)                              \
+       $(GTK_DEP_CFLAGS)
 
 DEPS = \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
-       $(top_builddir)/gdk/@gdktargetlib@              \
-       $(top_builddir)/gtk/@gtktargetlib@
+       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
+       $(top_builddir)/gdk/$(gdktargetlib)                             \
+       $(top_builddir)/gtk/$(gtktargetlib)
 
-LDADDS = @STRIP_BEGIN@                                         \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
-       $(top_builddir)/gdk/@gdktargetlib@              \
-       $(top_builddir)/gtk/@gtktargetlib@              \
-@STRIP_END@
+LDADDS = \
+       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
+       $(top_builddir)/gdk/$(gdktargetlib)                             \
+       $(top_builddir)/gtk/$(gtktargetlib)
 
 bin_PROGRAMS = gtk-demo
 
 BUILT_SOURCES = demos.h
 
 EXTRA_DIST =           \
-       geninclude.pl   \
        $(IMAGEFILES)
 
-demos.h: $(demos) geninclude.pl
-       (cd $(srcdir) && ./geninclude.pl $(demos) > demos.h)
+demos.h: @REBUILD@ $(demos) geninclude.pl
+       (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
 
 gtk_demo_SOURCES =             \
        $(demos)                \
+       demo-common.h           \
        main.c                  \
        demos.h
 
@@ -73,3 +80,5 @@ IMAGEFILES=   alphatest.png           \
                gtk-logo-rgb.gif
 
 democode_DATA = $(demos) $(IMAGEFILES)
+
+DISTCLEANFILES = demos.h