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 698c242c0dc0719f70206df2f5505957fd52aecc..1a5a6770a5fada21222b9473a203ccb4e2ee0f1f 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
@@ -55,17 +55,14 @@ 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)                             \
-       $(GTK_DEP_LIBS)
+       $(top_builddir)/gtk/libgtk-3.0.la       \
+       $(GTK_DEP_LIBS)                         \
+       -lm
 
-bin_PROGRAMS = gtk-demo
+bin_PROGRAMS = gtk3-demo
 
 BUILT_SOURCES = demos.h
 
@@ -76,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           \
@@ -99,7 +96,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