Merge libgdk and libgtk

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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4d63c1106551fe414555029c13de92f60dbb7cb5..744796bb79523a62f525fe0e4295fef123340fd9 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,14 +11,12 @@ INCLUDES =                          \
        $(GTK_DEP_CFLAGS)               \
        $(GDK_DEP_CFLAGS)
 
-DEPS =                                                                 \
-       $(top_builddir)/gdk/$(gdktargetlib)                             \
-       $(top_builddir)/gtk/$(gtktargetlib)
-
-LDADDS =                                                               \
-       $(top_builddir)/gdk/$(gdktargetlib)                             \
-       $(top_builddir)/gtk/$(gtktargetlib)                             \
-       $(GTK_DEP_LIBS)                                                 \
+DEPS = \
+       $(top_builddir)/gtk/libgtk-3.0.la
+
+LDADDS = \
+       $(top_builddir)/gtk/libgtk-3.0.la       \
+       $(GTK_DEP_LIBS)                         \
        -lm
 
 if USE_X11
@@ -87,6 +85,7 @@ noinst_PROGRAMS =  $(TEST_PROGS)      \
        testtreecolumns                 \
        testtreecolumnsizing            \
        testtreesort                    \
+       testverticalcells                       \
        treestoretest                   \
        testxinerama                    \
        testwindows                     \
@@ -98,7 +97,9 @@ noinst_PROGRAMS =  $(TEST_PROGS)      \
        testexpander                    \
        testvolumebutton                \
        testscrolledwindow              \
-       testswitch
+       testcellarea                    \
+       testswitch                      \
+       styleexamples
 
 if USE_X11
 noinst_PROGRAMS += testerrors
@@ -169,7 +170,6 @@ testsocket_DEPENDENCIES = $(DEPS)
 testsocket_child_DEPENDENCIES = $(DEPS)
 testspinbutton_DEPENDENCIES = $(TEST_DEPS)
 teststatusicon_DEPENDENCIES = $(TEST_DEPS)
-#testtext_DEPENDENCIES = $(TEST_DEPS)
 testtreeedit_DEPENDENCIES = $(DEPS)
 testtreemodel_DEPENDENCIES = $(DEPS)
 testtreeview_DEPENDENCIES = $(DEPS)
@@ -178,6 +178,7 @@ testtreeflow_DEPENDENCIES = $(DEPS)
 testtreecolumns_DEPENDENCIES = $(DEPS)
 testtreecolumnsizing_DEPENDENCIES = $(DEPS)
 testtreesort_DEPENDENCIES = $(DEPS)
+testverticalcells_DEPENDENCIES = $(DEPS)
 treestoretest_DEPENDENCIES = $(TEST_DEPS)
 testxinerama_DEPENDENCIES = $(TEST_DEPS)
 testmerge_DEPENDENCIES = $(TEST_DEPS)
@@ -186,10 +187,12 @@ testgrouping_DEPENDENCIES = $(TEST_DEPS)
 testtooltips_DEPENDENCIES = $(TEST_DEPS)
 testvolumebutton_DEPENDENCIES = $(TEST_DEPS)
 testscrolledwindow_DEPENDENCIES = $(TEST_DEPS)
+testcellarea_DEPENDENCIES = $(TEST_DEPS)
 testwindows_DEPENDENCIES = $(TEST_DEPS)
 testexpand_DEPENDENCIES = $(TEST_DEPS)
 testexpander_DEPENDENCIES = $(TEST_DEPS)
 testswitch_DEPENDENCIES = $(TEST_DEPS)
+styleexamples_DEPENDENCIES = $(TEST_DEPS)
 
 flicker_LDADD = $(LDADDS)
 simple_LDADD = $(LDADDS)
@@ -254,7 +257,7 @@ testtreeflow_LDADD = $(LDADDS)
 testtreecolumns_LDADD = $(LDADDS)
 testtreecolumnsizing_LDADD = $(LDADDS)
 testtreesort_LDADD = $(LDADDS)
-#testtext_LDADD = $(LDADDS)
+testverticalcells_LDADD = $(LDADDS)
 treestoretest_LDADD = $(LDADDS)
 testxinerama_LDADD = $(LDADDS)
 testmerge_LDADD = $(LDADDS)
@@ -263,10 +266,12 @@ testgrouping_LDADD = $(LDADDS)
 testtooltips_LDADD = $(LDADDS)
 testvolumebutton_LDADD = $(LDADDS)
 testscrolledwindow_LDADD = $(LDADDS)
+testcellarea_LDADD = $(LDADDS)
 testwindows_LDADD = $(LDADDS)
 testexpand_LDADD = $(LDADDS)
 testexpander_LDADD = $(LDADDS)
 testswitch_LDADD = $(LDADDS)
+styleexamples_LDADD = $(LDADDS)
 
 testentrycompletion_SOURCES =  \
        prop-editor.c           \
@@ -301,10 +306,6 @@ testtreeview_SOURCES =     \
        prop-editor.c   \
        testtreeview.c
 
-#testtext_SOURCES =    \
-#      prop-editor.c   \
-#      testtext.c
-
 testtoolbar_SOURCES =  \
        testtoolbar.c   \
        prop-editor.c
@@ -376,6 +377,11 @@ testvolumebutton_SOURCES = \
 testscrolledwindow_SOURCES =   \
        testscrolledwindow.c
 
+testcellarea_SOURCES =         \
+       testcellarea.c          \
+       cellareascaffold.c      \
+       cellareascaffold.h
+
 testoffscreen_SOURCES =        \
        gtkoffscreenbox.c       \
        gtkoffscreenbox.h       \
@@ -398,12 +404,13 @@ testexpand_SOURCES = testexpand.c
 testexpander_SOURCES = testexpander.c
 
 testswitch_SOURCES = testswitch.c
+styleexamples_SOURCES = styleexamples.c
 
 EXTRA_DIST +=                  \
        prop-editor.h           \
        testgtk.1               \
-       testgtkrc               \
-       testgtkrc2              \
+       testgtk.css             \
+       testgtk2.css            \
        3DRings.xpm             \
        FilesQueue.xpm          \
        Modeller.xpm            \