X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=demos%2Fgtk-demo%2FMakefile.am;h=a8b0fede64e464d7ad2e7876c28cd735c769e25d;hb=e0d30ee141c3a269ee4f74769e48c722633c324c;hp=b1dc0205980484e6d0559373b13ab0a857dcccba;hpb=a2d60d44b170d403f26444081113be8d60afe8a3;p=~andy%2Fgtk

diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index b1dc02059..a8b0fede6 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -1,65 +1,81 @@
 ## Makefile.am for gtk+/demos
+include $(top_srcdir)/Makefile.decl
 
 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@	\
-	appwindow.c	\
-	button_box.c	\
-	colorsel.c	\
-	dialog.c	\
-	drawingarea.c	\
-	images.c	\
-	item_factory.c	\
-	menus.c		\
-	panes.c		\
-	pixbufs.c	\
-	sizegroup.c	\
-	stock_browser.c	\
-	textview.c	\
-@STRIP_END@
+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				\
-	-DG_DISABLE_DEPRECATED	 			\
-	-DGDK_DISABLE_DEPRECATED			\
-	-DGTK_DISABLE_DEPRECATED 			\
-	@GTK_DEBUG_FLAGS@				\
-	@GTK_DEP_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@ 		\
-@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)
+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
 
 IMAGEFILES=	alphatest.png		\
 	        apple-red.png		\
@@ -67,11 +83,15 @@ IMAGEFILES=	alphatest.png		\
 		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
+		gtk-logo-rgb.gif		
 
-democode_DATA = $(demos) $(IMAGEFILES)
+democode_DATA = $(demos) $(IMAGEFILES) demo.ui
+
+DISTCLEANFILES = demos.h