Merge libgdk and libgtk

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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f6f33ebadd8a477d908bd83b0ddb780dce7b1555..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
@@ -30,6 +28,9 @@ noinst_PROGRAMS =  $(TEST_PROGS)      \
        flicker                         \
        print-editor                    \
        testaccel                       \
+       testadjustsize                  \
+       testappchooser                  \
+       testappchooserbutton            \
        testassistant                   \
        testbbox                        \
        testbuttons                     \
@@ -46,6 +47,9 @@ noinst_PROGRAMS =  $(TEST_PROGS)      \
        testfilechooser                 \
        testfilechooserbutton           \
        testframe                       \
+       testgeometry                    \
+       testgiconpixbuf                 \
+       testgrid                        \
        testgtk                         \
        testheightforwidth              \
        testiconview                    \
@@ -63,7 +67,6 @@ noinst_PROGRAMS =  $(TEST_PROGS)      \
        testoffscreenwindow             \
        testorientable                  \
        testprint                       \
-       testrgb                         \
        testrecentchooser               \
        testrecentchoosermenu           \
        testrichtext                    \
@@ -82,6 +85,7 @@ noinst_PROGRAMS =  $(TEST_PROGS)      \
        testtreecolumns                 \
        testtreecolumnsizing            \
        testtreesort                    \
+       testverticalcells                       \
        treestoretest                   \
        testxinerama                    \
        testwindows                     \
@@ -89,11 +93,16 @@ noinst_PROGRAMS =  $(TEST_PROGS)    \
        testactions                     \
        testgrouping                    \
        testtooltips                    \
+       testexpand                      \
        testexpander                    \
-       testvolumebutton
+       testvolumebutton                \
+       testscrolledwindow              \
+       testcellarea                    \
+       testswitch                      \
+       styleexamples
 
-if OS_UNIX
-noinst_PROGRAMS += testapplication
+if USE_X11
+noinst_PROGRAMS += testerrors
 endif
 
 if HAVE_CXX
@@ -116,11 +125,10 @@ testheightforwidth_DEPENDENCIES = $(TEST_DEPS)
 testicontheme_DEPENDENCIES = $(TEST_DEPS)
 testiconview_DEPENDENCIES = $(TEST_DEPS)
 testaccel_DEPENDENCIES = $(TEST_DEPS)
-testapplication_DEPENDENCIES = $(TEST_DEPS)
+testadjustsize_DEPENDENCIES = $(TEST_DEPS)
 testassistant_DEPENDENCIES = $(TEST_DEPS)
 testbbox_DEPENDENCIES = $(TEST_DEPS)
 testbuttons_DEPENDENCIES = $(TEST_DEPS)
-testframe_DEPENDENCIES = $(TEST_DEPS)
 testcairo_DEPENDENCIES = $(TEST_DEPS)
 testcalendar_DEPENDENCIES = $(TEST_DEPS)
 testcombo_DEPENDENCIES = $(TEST_DEPS)
@@ -131,8 +139,13 @@ testdnd_DEPENDENCIES = $(TEST_DEPS)
 testellipsise_DEPENDENCIES = $(TEST_DEPS)
 testentrycompletion_DEPENDENCIES = $(TEST_DEPS)
 testentryicons_DEPENDENCIES = $(TEST_DEPS)
+testerrors_DEPENDENCIES = $(TEST_DEPS)
 testfilechooser_DEPENDENCIES = $(TEST_DEPS)
 testfilechooserbutton_DEPENDENCIES = $(TEST_DEPS)
+testframe_DEPENDENCIES = $(TEST_DEPS)
+testgeometry_DEPENDENCIES = $(TEST_DEPS)
+testgiconpixbuf = $(TEST_DEPS)
+testgrid_DEPENDENCIES = $(TEST_DEPS)
 testgtk_DEPENDENCIES = $(TEST_DEPS)
 testinput_DEPENDENCIES = $(TEST_DEPS)
 testimage_DEPENDENCIES = $(TEST_DEPS)
@@ -144,11 +157,12 @@ testnotebookdnd_DEPENDENCIES = $(TEST_DEPS)
 testnouiprint_DEPENDENCIES = $(TEST_DEPS)
 testoffscreen_DEPENDENCIES = $(TEST_DEPS)
 testoffscreenwindow_DEPENDENCIES = $(TEST_DEPS)
+testappchooser_DEPENDENCIES = $(TEST_DEPS)
+testappchooserbutton_DEPENDENCIES = $(TEST_DEPS)
 testorientable_DEPENDENCIES = $(TEST_DEPS)
 testprint_DEPENDENCIES = $(TEST_DEPS)
 testrecentchooser_DEPENDENCIES = $(TEST_DEPS)
 testrecentchoosermenu_DEPENDENCIES = $(TEST_DEPS)
-testrgb_DEPENDENCIES = $(TEST_DEPS)
 testrichtext_DEPENDENCIES = $(TEST_DEPS)
 testscale_DEPENDENCIES = $(TEST_DEPS)
 testselection_DEPENDENCIES = $(TEST_DEPS)
@@ -156,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)
@@ -165,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)
@@ -172,18 +186,22 @@ testactions_DEPENDENCIES = $(TEST_DEPS)
 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)
 print_editor_LDADD = $(LDADDS)
 testaccel_LDADD = $(LDADDS)
-testapplication_LDADD = $(LDADDS)
+testadjustsize_LDADD = $(LDADDS)
 testassistant_LDADD = $(LDADDS)
 testbbox_LDADD = $(LDADDS)
 testbuttons_LDADD = $(LDADDS)
-testframe_LDADD = $(LDADDS)
 testcairo_LDADD = $(LDADDS)
 testcalendar_LDADD = $(LDADDS)
 testcombo_LDADD = $(LDADDS)
@@ -194,8 +212,13 @@ testdnd_LDADD = $(LDADDS)
 testellipsise_LDADD = $(LDADDS)
 testentrycompletion_LDADD = $(LDADDS)
 testentryicons_LDADD = $(LDADDS)
+testerrors_LDADD = $(LDADDS)
 testfilechooser_LDADD = $(LDADDS)
 testfilechooserbutton_LDADD = $(LDADDS)
+testframe_LDADD = $(LDADDS)
+testgeometry_LDADD = $(LDADDS)
+testgiconpixbuf_LDADD = $(LDADDS)
+testgrid_LDADD = $(LDADDS)
 testgtk_LDADD = $(LDADDS)
 testheightforwidth_LDADD = $(LDADDS)
 testicontheme_LDADD = $(LDADDS)
@@ -211,11 +234,12 @@ testnotebookdnd_LDADD = $(LDADDS)
 testnouiprint_LDADD = $(LDADDS)
 testoffscreen_LDADD = $(LDADDS)
 testoffscreenwindow_LDADD = $(LDADDS)
+testappchooser_LDADD = $(LDADDS)
+testappchooserbutton_LDADD = $(LDADDS)
 testorientable_LDADD = $(LDADDS)
 testprint_LDADD = $(LDADDS)
 testrecentchooser_LDADD = $(LDADDS)
 testrecentchoosermenu_LDADD = $(LDADDS)
-testrgb_LDADD = $(LDADDS)
 testrichtext_LDADD = $(LDADDS)
 testscale_LDADD = $(LDADDS)
 testselection_LDADD = $(LDADDS)
@@ -233,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)
@@ -241,8 +265,13 @@ testactions_LDADD = $(LDADDS)
 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           \
@@ -260,6 +289,9 @@ testfilechooserbutton_SOURCES =     \
        prop-editor.c           \
        testfilechooserbutton.c
 
+testgrid_SOURCES =     \
+       testgrid.c
+
 testgtk_SOURCES =      \
        prop-editor.c   \
        testgtk.c
@@ -274,10 +306,6 @@ testtreeview_SOURCES =     \
        prop-editor.c   \
        testtreeview.c
 
-#testtext_SOURCES =    \
-#      prop-editor.c   \
-#      testtext.c
-
 testtoolbar_SOURCES =  \
        testtoolbar.c   \
        prop-editor.c
@@ -317,6 +345,12 @@ testbuttons_SOURCES =              \
 testframe_SOURCES =            \
        testframe.c
 
+testgeometry_SOURCES =                 \
+       testgeometry.c
+
+testgiconpixbuf_SOURCES =      \
+       testgiconpixbuf.c
+
 testiconview_SOURCES =                 \
        testiconview.c          \
        prop-editor.c
@@ -340,6 +374,14 @@ testrecentchoosermenu_SOURCES =    \
 testvolumebutton_SOURCES =     \
        testvolumebutton.c
 
+testscrolledwindow_SOURCES =   \
+       testscrolledwindow.c
+
+testcellarea_SOURCES =         \
+       testcellarea.c          \
+       cellareascaffold.c      \
+       cellareascaffold.h
+
 testoffscreen_SOURCES =        \
        gtkoffscreenbox.c       \
        gtkoffscreenbox.h       \
@@ -348,17 +390,27 @@ testoffscreen_SOURCES =   \
 testoffscreenwindow_SOURCES =  \
        testoffscreenwindow.c
 
+testappchooser_SOURCES = \
+       testappchooser.c
+
+testappchooserbutton_SOURCES = \
+       testappchooserbutton.c
+
 testwindows_SOURCES =  \
        testwindows.c
 
+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              \
-       circles.xbm             \
+       testgtk.css             \
+       testgtk2.css            \
        3DRings.xpm             \
        FilesQueue.xpm          \
        Modeller.xpm            \