Merge libgdk and libgtk

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

diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index 964f8130bc59c56e79d4383935dc0085921d4180..1a5a6770a5fada21222b9473a203ccb4e2ee0f1f 100644 (file)
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -1,9 +1,9 @@
 ## Makefile.am for gtk+/demos
 include $(top_srcdir)/Makefile.decl
 
-democodedir=$(datadir)/gtk-2.0/demo
+democodedir=$(datadir)/gtk-$(GTK_API_VERSION)/demo
 
-## These should be in the order you want them to appear in the 
+## 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                             \
@@ -17,47 +17,52 @@ demos =                                             \
        dialog.c                                \
        drawingarea.c                           \
        editable_cells.c                        \
+       entry_buffer.c                          \
        entry_completion.c                      \
        expander.c                              \
        hypertext.c                             \
        iconview.c                              \
        iconview_edit.c                         \
        images.c                                \
+       infobar.c                               \
+       links.c                                 \
        list_store.c                            \
        menus.c                                 \
+       offscreen_window.c                      \
+       offscreen_window2.c                     \
        panes.c                                 \
        pickers.c                               \
        pixbufs.c                               \
        printing.c                              \
        rotated_text.c                          \
+       search_entry.c                          \
        sizegroup.c                             \
+       spinner.c                               \
        stock_browser.c                         \
        textview.c                              \
        textscroll.c                            \
+       toolpalette.c                           \
        tree_store.c                            \
        ui_manager.c
 
 INCLUDES = \
-       -DDEMOCODEDIR="\"$(democodedir)\""              \
-       -I$(top_srcdir)                                 \
-       -I$(top_builddir)/gdk                           \
-       -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
-       -DGDK_DISABLE_DEPRECATED                        \
-       -DGTK_DISABLE_DEPRECATED                        \
-       $(GTK_DEBUG_FLAGS)                              \
+       -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-$(GTK_API_VERSION).la  \
-       $(top_builddir)/gdk/$(gdktargetlib)                             \
-       $(top_builddir)/gtk/$(gtktargetlib)
+       $(top_builddir)/gtk/libgtk-3.0.la
 
 LDADDS = \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
-       $(top_builddir)/gdk/$(gdktargetlib)                             \
-       $(top_builddir)/gtk/$(gtktargetlib)
+       $(top_builddir)/gtk/libgtk-3.0.la       \
+       $(GTK_DEP_LIBS)                         \
+       -lm
 
-bin_PROGRAMS = gtk-demo
+bin_PROGRAMS = gtk3-demo
 
 BUILT_SOURCES = demos.h
 
@@ -68,15 +73,15 @@ EXTRA_DIST +=               \
 demos.h: @REBUILD@ $(demos) geninclude.pl
        (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
 
-gtk_demo_SOURCES =             \
+gtk3_demo_SOURCES =            \
        $(demos)                \
        demo-common.h           \
        main.c                  \
        demos.h
 
-gtk_demo_DEPENDENCIES = $(DEPS)
-gtk_demo_LDADD = $(LDADDS)
-gtk_demo_LDFLAGS = -export-dynamic
+gtk3_demo_DEPENDENCIES = $(DEPS)
+gtk3_demo_LDADD = $(LDADDS)
+gtk3_demo_LDFLAGS = -export-dynamic
 
 IMAGEFILES=    alphatest.png           \
                apple-red.png           \
@@ -91,8 +96,10 @@ IMAGEFILES=  alphatest.png           \
                gnome-gmush.png         \
                gnome-gsame.png         \
                gnu-keys.png            \
-               gtk-logo-rgb.gif                
+               gtk-logo-rgb.gif
 
 democode_DATA = $(demos) $(IMAGEFILES) demo.ui
 
 DISTCLEANFILES = demos.h
+
+-include $(top_srcdir)/git.mk