define -DGDK_PIXBUF_DISABLE_DEPRECATED in the global CFLAGS.

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

diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index a943a3e6e506301cd11cddc604d8a38528af6b8a..a8b0fede64e464d7ad2e7876c28cd735c769e25d 100644 (file)
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -1,65 +1,97 @@
 ## Makefile.am for gtk+/demos
+include $(top_srcdir)/Makefile.decl
 
 democodedir=$(datadir)/gtk-2.0/demo
 
-demos = @STRIP_BEGIN@  \
-       button_box.c    \
-       item_factory.c  \
-       menus.c         \
-       panes.c         \
-       textview.c      \
-@STRIP_END@
+## These should be in the order you want them to appear in the 
+## demo app, which means alphabetized by demo title, not filename
+demos =                                                \
+       appwindow.c                             \
+       assistant.c                             \
+       builder.c                               \
+       button_box.c                            \
+       changedisplay.c                         \
+       clipboard.c                             \
+       colorsel.c                              \
+       combobox.c                              \
+       dialog.c                                \
+       drawingarea.c                           \
+       editable_cells.c                        \
+       entry_completion.c                      \
+       expander.c                              \
+       hypertext.c                             \
+       iconview.c                              \
+       iconview_edit.c                         \
+       images.c                                \
+       list_store.c                            \
+       menus.c                                 \
+       panes.c                                 \
+       pickers.c                               \
+       pixbufs.c                               \
+       printing.c                              \
+       rotated_text.c                          \
+       sizegroup.c                             \
+       stock_browser.c                         \
+       textview.c                              \
+       textscroll.c                            \
+       tree_store.c                            \
+       ui_manager.c
 
-INCLUDES = @STRIP_BEGIN@ \
-       -DDEMOCODEDIR="\"$(democodedir)\""              \
-       -I$(top_srcdir)                                 \
-       -I$(top_builddir)/gdk                           \
-       -DGDK_DISABLE_COMPAT_H                          \
-       -DGDK_DISABLE_DEPRECATED                        \
-       -DGTK_DISABLE_COMPAT_H                          \
-       -DGTK_DISABLE_DEPRECATED                        \
-       @GTK_DEBUG_FLAGS@                               \
-       @GTK_XIM_FLAGS@                                 \
-       @GTK_LOCALE_FLAGS@                              \
-       @PANGO_CFLAGS@                                  \
-       @GLIB_CFLAGS@                                   \
-       @more_cflags@                                   \
-@STRIP_END@
+INCLUDES = \
+       -DDEMOCODEDIR="\"$(democodedir)\""      \
+       -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-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@              \
-       @more_ldflags@                                  \
-       @more_libs@                                     \
-       @GDK_WLIBS@                                     \
-       @PANGO_LIBS@                                    \
-       @GLIB_LIBS@                                     \
-       @GTK_LIBS_EXTRA@                                \
-       -lm                                             \
-@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
+EXTRA_DIST +=          \
+       $(IMAGEFILES)   \
+       demo.ui
 
-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
 
 gtk_demo_DEPENDENCIES = $(DEPS)
 gtk_demo_LDADD = $(LDADDS)
+gtk_demo_LDFLAGS = -export-dynamic
 
-democode_DATA = $(demos)
+IMAGEFILES=    alphatest.png           \
+               apple-red.png           \
+               background.jpg          \
+               floppybuddy.gif         \
+               gnome-applets.png       \
+               gnome-calendar.png      \
+               gnome-fs-directory.png  \
+               gnome-fs-regular.png    \
+               gnome-foot.png          \
+               gnome-gimp.png          \
+               gnome-gmush.png         \
+               gnome-gsame.png         \
+               gnu-keys.png            \
+               gtk-logo-rgb.gif                
+
+democode_DATA = $(demos) $(IMAGEFILES) demo.ui
+
+DISTCLEANFILES = demos.h