Update grid tests to match

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

diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index 34367ee4dbaa2922aeef03b78fbb0865ec88f206..b4d224cc0ae1d8c2dd38f3b8a39f90fa54e3f3c7 100644 (file)
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -1,6 +1,8 @@
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = \
+SUBDIRS =
+
+AM_CPPFLAGS = \
        -I$(top_srcdir)                 \
        -I$(top_builddir)/gdk           \
        -I$(top_srcdir)/gdk             \
@@ -11,27 +13,32 @@ INCLUDES = \
        $(GTK_DEP_CFLAGS)
 
 DEPS = \
-       $(top_builddir)/gtk/libgtk-3.0.la
+       $(top_builddir)/gtk/libgtk-3.la
 
 progs_ldadd = \
-       $(top_builddir)/gtk/libgtk-3.0.la       \
-       $(top_builddir)/gdk/libgdk-3.0.la       \
+       $(top_builddir)/gtk/libgtk-3.la \
+       $(top_builddir)/gdk/libgdk-3.la \
        $(GTK_DEP_LIBS)
 
-noinst_PROGRAMS = $(TEST_PROGS) $(SAMPLE_PROGS)
+noinst_PROGRAMS = $(TEST_PROGS)
 
 
 TEST_PROGS                     += testing
 testing_SOURCES                         = testing.c
 testing_LDADD                   = $(progs_ldadd)
 
-TEST_PROGS                     += liststore
-liststore_SOURCES               = liststore.c
-liststore_LDADD                         = $(progs_ldadd)
-
-TEST_PROGS                     += treestore
-treestore_SOURCES               = treestore.c
-treestore_LDADD                         = $(progs_ldadd)
+TEST_PROGS                     += treemodel
+treemodel_SOURCES               = \
+                               treemodel.h \
+                               treemodel.c \
+                               liststore.c \
+                               treestore.c \
+                               filtermodel.c \
+                               sortmodel.c \
+                               modelrefcount.c \
+                               gtktreemodelrefcount.h \
+                               gtktreemodelrefcount.c
+treemodel_LDADD                         = $(progs_ldadd)
 
 TEST_PROGS                     += treeview
 treeview_SOURCES                = treeview.c
@@ -39,7 +46,7 @@ treeview_LDADD                         = $(progs_ldadd)
 
 TEST_PROGS                     += treeview-scrolling
 treeview_scrolling_SOURCES      = treeview-scrolling.c
-treeview_scrolling_LDADD        = $(progs_ldadd)
+treeview_scrolling_LDADD        = $(progs_ldadd) -lm
 
 TEST_PROGS                     += recentmanager
 recentmanager_SOURCES           = recentmanager.c
@@ -57,8 +64,8 @@ floating_LDADD                         = $(progs_ldadd)
 # on a naked X server creates slightly different event
 # sequences than running on a normal desktop
 # TEST_PROGS                   += crossingevents
-crossingevents_SOURCES          = crossingevents.c
-crossingevents_LDADD            = $(progs_ldadd)
+#crossingevents_SOURCES                 = crossingevents.c
+#crossingevents_LDADD           = $(progs_ldadd)
 
 # Should be ported to new API's
 #TEST_PROGS                    += filechooser
@@ -72,9 +79,9 @@ builder_LDFLAGS                        = -export-dynamic
 
 if OS_UNIX
 #TEST_PROGS                    += defaultvalue
+#defaultvalue_SOURCES           = defaultvalue.c pixbuf-init.c
+#defaultvalue_LDADD             = $(progs_ldadd)
 endif
-defaultvalue_SOURCES            = defaultvalue.c pixbuf-init.c
-defaultvalue_LDADD              = $(progs_ldadd)
 
 TEST_PROGS                     += textbuffer
 textbuffer_SOURCES              = textbuffer.c pixbuf-init.c
@@ -84,27 +91,41 @@ TEST_PROGS                  += textiter
 textiter_SOURCES                = textiter.c
 textiter_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)
+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)
-
 TEST_PROGS                     += stylecontext
 stylecontext_SOURCES            = stylecontext.c
 stylecontext_LDADD              = $(progs_ldadd)
-EXTRA_DIST += test.css test.png
 
+TEST_PROGS                     += papersize
+papersize_SOURCES               = papersize.c
+papersize_LDADD                         = $(progs_ldadd)
+
+TEST_PROGS                     += cellarea
+cellarea_SOURCES                = cellarea.c
+cellarea_LDADD                  = $(progs_ldadd)
+
+TEST_PROGS                     += treepath
+treepath_SOURCES                = treepath.c
+treepath_LDADD                  = $(progs_ldadd)
+
+TEST_PROGS                     += accessible
+accessible_SOURCES              = accessible.c
+accessible_LDADD                = $(progs_ldadd)
+
+TEST_PROGS                     += entry
+entry_SOURCES                   = entry.c
+entry_LDADD                     = $(progs_ldadd)
+
+TEST_PROGS                     += grid
+grid_SOURCES                    = grid.c
+grid_LDADD                      = $(progs_ldadd)
 
 EXTRA_DIST +=                          \
        file-chooser-test-dir/empty     \