Add git.mk to generate .gitignore files

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

diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index f043ee0f4eabaedd1d2c8d15e301edcd9a30b8c9..e9c51d0b95274ddfedde0f21b15d34eb8071d2c8 100644 (file)
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -1,4 +1,5 @@
 ## Makefile.am for gtk+/demos
+include $(top_srcdir)/Makefile.decl
 
 democodedir=$(datadir)/gtk-2.0/demo
 
@@ -7,6 +8,7 @@ democodedir=$(datadir)/gtk-2.0/demo
 demos =                                                \
        appwindow.c                             \
        assistant.c                             \
+       builder.c                               \
        button_box.c                            \
        changedisplay.c                         \
        clipboard.c                             \
@@ -28,6 +30,7 @@ demos =                                               \
        pixbufs.c                               \
        printing.c                              \
        rotated_text.c                          \
+       search_entry.c                          \
        sizegroup.c                             \
        stock_browser.c                         \
        textview.c                              \
@@ -36,13 +39,12 @@ demos =                                             \
        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 = \
@@ -59,8 +61,9 @@ bin_PROGRAMS = gtk-demo
 
 BUILT_SOURCES = demos.h
 
-EXTRA_DIST =           \
-       $(IMAGEFILES)
+EXTRA_DIST +=          \
+       $(IMAGEFILES)   \
+       demo.ui
 
 demos.h: @REBUILD@ $(demos) geninclude.pl
        (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
@@ -73,6 +76,7 @@ gtk_demo_SOURCES =            \
 
 gtk_demo_DEPENDENCIES = $(DEPS)
 gtk_demo_LDADD = $(LDADDS)
+gtk_demo_LDFLAGS = -export-dynamic
 
 IMAGEFILES=    alphatest.png           \
                apple-red.png           \
@@ -89,6 +93,8 @@ IMAGEFILES=   alphatest.png           \
                gnu-keys.png            \
                gtk-logo-rgb.gif                
 
-democode_DATA = $(demos) $(IMAGEFILES)
+democode_DATA = $(demos) $(IMAGEFILES) demo.ui
 
 DISTCLEANFILES = demos.h
+
+-include $(top_srcdir)/git.mk