Fix DSO link issues

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

diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index f1fc24826af6d399f460846ee9490ff5c5f5cca6..5385dcbbb4a809b82a7e8d11c5dd69337e49bd6c 100644 (file)
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -1,7 +1,7 @@
 ## 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
 ## demo app, which means alphabetized by demo title, not filename
@@ -29,6 +29,7 @@ demos =                                               \
        list_store.c                            \
        menus.c                                 \
        offscreen_window.c                      \
+       offscreen_window2.c                     \
        panes.c                                 \
        pickers.c                               \
        pixbufs.c                               \
@@ -36,9 +37,11 @@ demos =                                              \
        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
 
@@ -52,16 +55,15 @@ INCLUDES = \
        $(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       \
+       $(top_builddir)/gdk/libgdk-3.0.la       \
+       $(GTK_DEP_LIBS)                         \
+       -lm
 
-bin_PROGRAMS = gtk-demo
+bin_PROGRAMS = gtk3-demo
 
 BUILT_SOURCES = demos.h
 
@@ -72,15 +74,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           \
@@ -95,7 +97,7 @@ 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