Make GTK+ use an external gdk-pixbuf

[~andy/gtk] / gtk / tests / Makefile.am

diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index f36d5e53837a45c68ea6372aa654cb663a05a57d..0ba7225210d49350bbeb85bc7a96e03ce11bbd88 100644 (file)
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -10,16 +10,15 @@ INCLUDES = \
        $(GTK_DEP_CFLAGS)
 
 DEPS = \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
        $(top_builddir)/gdk/$(gdktargetlib)                             \
        $(top_builddir)/gtk/$(gtktargetlib)
 
 progs_ldadd = \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
        $(top_builddir)/gdk/$(gdktargetlib)                             \
-       $(top_builddir)/gtk/$(gtktargetlib)
+       $(top_builddir)/gtk/$(gtktargetlib)                             \
+       $(GTK_DEP_LIBS)
 
-noinst_PROGRAMS = $(TEST_PROGS)
+noinst_PROGRAMS = $(TEST_PROGS) $(SAMPLE_PROGS)
 
 
 TEST_PROGS                     += testing
@@ -34,6 +33,10 @@ TEST_PROGS                   += treestore
 treestore_SOURCES               = treestore.c
 treestore_LDADD                         = $(progs_ldadd)
 
+TEST_PROGS                     += treeview
+treeview_SOURCES                = treeview.c
+treeview_LDADD                  = $(progs_ldadd)
+
 TEST_PROGS                     += treeview-scrolling
 treeview_scrolling_SOURCES      = treeview-scrolling.c
 treeview_scrolling_LDADD        = $(progs_ldadd)
@@ -57,11 +60,10 @@ object_LDADD                         = $(progs_ldadd)
 crossingevents_SOURCES          = crossingevents.c
 crossingevents_LDADD            = $(progs_ldadd)
 
-# this doesn't work in make distcheck, since it doesn't
-# find file-chooser-test-dir 
-# TEST_PROGS                   += filechooser
-filechooser_SOURCES             = filechooser.c pixbuf-init.c
-filechooser_LDADD               = $(progs_ldadd)
+# Should be ported to new API's
+#TEST_PROGS                    += filechooser
+#filechooser_SOURCES            = filechooser.c pixbuf-init.c
+#filechooser_LDADD              = $(progs_ldadd)
 
 TEST_PROGS                     += builder
 builder_SOURCES                         = builder.c
@@ -71,9 +73,32 @@ builder_LDFLAGS                       = -export-dynamic
 if OS_UNIX
 TEST_PROGS                     += defaultvalue
 endif
-defaultvalue_SOURCES            = defaultvalue.c pixbuf-init.c 
+defaultvalue_SOURCES            = defaultvalue.c pixbuf-init.c
 defaultvalue_LDADD              = $(progs_ldadd)
 
 TEST_PROGS                     += textbuffer
 textbuffer_SOURCES              = textbuffer.c pixbuf-init.c
 textbuffer_LDADD                = $(progs_ldadd)
+
+TEST_PROGS                     += filtermodel
+filtermodel_SOURCES             = filtermodel.c
+filtermodel_LDADD               = $(progs_ldadd)
+
+TEST_PROGS                     += expander
+expander_SOURCES                = expander.c
+expander_LDADD          = $(progs_ldadd)
+
+TEST_PROGS                     += action
+action_SOURCES                  = action.c
+action_LDADD                    = $(progs_ldadd)
+
+SAMPLE_PROGS = gtk-example-application
+gtk_example_application_SOURCES        = gtk-example-application.c
+gtk_example_application_LDADD  = $(progs_ldadd)
+
+
+EXTRA_DIST +=                          \
+       file-chooser-test-dir/empty     \
+       file-chooser-test-dir/text.txt
+
+-include $(top_srcdir)/git.mk