Merge libgdk and libgtk

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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1da067ed08929340a1223ab7b4b8dde488f0ec17..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
@@ -31,6 +29,8 @@ noinst_PROGRAMS =  $(TEST_PROGS)      \
        print-editor                    \
        testaccel                       \
        testadjustsize                  \
+       testappchooser                  \
+       testappchooserbutton            \
        testassistant                   \
        testbbox                        \
        testbuttons                     \
@@ -66,7 +66,6 @@ noinst_PROGRAMS =  $(TEST_PROGS)      \
        testoffscreen                   \
        testoffscreenwindow             \
        testorientable                  \
-       testopenwith                    \
        testprint                       \
        testrecentchooser               \
        testrecentchoosermenu           \
@@ -86,6 +85,7 @@ noinst_PROGRAMS =  $(TEST_PROGS)      \
        testtreecolumns                 \
        testtreecolumnsizing            \
        testtreesort                    \
+       testverticalcells                       \
        treestoretest                   \
        testxinerama                    \
        testwindows                     \
@@ -96,7 +96,10 @@ noinst_PROGRAMS =  $(TEST_PROGS)     \
        testexpand                      \
        testexpander                    \
        testvolumebutton                \
-       testscrolledwindow
+       testscrolledwindow              \
+       testcellarea                    \
+       testswitch                      \
+       styleexamples
 
 if USE_X11
 noinst_PROGRAMS += testerrors
@@ -154,7 +157,8 @@ testnotebookdnd_DEPENDENCIES = $(TEST_DEPS)
 testnouiprint_DEPENDENCIES = $(TEST_DEPS)
 testoffscreen_DEPENDENCIES = $(TEST_DEPS)
 testoffscreenwindow_DEPENDENCIES = $(TEST_DEPS)
-testopenwith_DEPENDENCIES = $(TEST_DEPS)
+testappchooser_DEPENDENCIES = $(TEST_DEPS)
+testappchooserbutton_DEPENDENCIES = $(TEST_DEPS)
 testorientable_DEPENDENCIES = $(TEST_DEPS)
 testprint_DEPENDENCIES = $(TEST_DEPS)
 testrecentchooser_DEPENDENCIES = $(TEST_DEPS)
@@ -166,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)
@@ -175,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)
@@ -183,9 +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)
@@ -227,7 +234,8 @@ testnotebookdnd_LDADD = $(LDADDS)
 testnouiprint_LDADD = $(LDADDS)
 testoffscreen_LDADD = $(LDADDS)
 testoffscreenwindow_LDADD = $(LDADDS)
-testopenwith_LDADD = $(LDADDS)
+testappchooser_LDADD = $(LDADDS)
+testappchooserbutton_LDADD = $(LDADDS)
 testorientable_LDADD = $(LDADDS)
 testprint_LDADD = $(LDADDS)
 testrecentchooser_LDADD = $(LDADDS)
@@ -249,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)
@@ -258,9 +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           \
@@ -295,10 +306,6 @@ testtreeview_SOURCES =     \
        prop-editor.c   \
        testtreeview.c
 
-#testtext_SOURCES =    \
-#      prop-editor.c   \
-#      testtext.c
-
 testtoolbar_SOURCES =  \
        testtoolbar.c   \
        prop-editor.c
@@ -370,6 +377,11 @@ testvolumebutton_SOURCES = \
 testscrolledwindow_SOURCES =   \
        testscrolledwindow.c
 
+testcellarea_SOURCES =         \
+       testcellarea.c          \
+       cellareascaffold.c      \
+       cellareascaffold.h
+
 testoffscreen_SOURCES =        \
        gtkoffscreenbox.c       \
        gtkoffscreenbox.h       \
@@ -378,8 +390,11 @@ testoffscreen_SOURCES =    \
 testoffscreenwindow_SOURCES =  \
        testoffscreenwindow.c
 
-testopenwith_SOURCES = \
-       testopenwith.c
+testappchooser_SOURCES = \
+       testappchooser.c
+
+testappchooserbutton_SOURCES = \
+       testappchooserbutton.c
 
 testwindows_SOURCES =  \
        testwindows.c
@@ -388,11 +403,14 @@ 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            \