Fix up linker flags

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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index dfef128eadbb2bf19a0a67a1a5f2b0719bb52e60..e9da96d6975a478342eedd8498a1131d69e28bab 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,7 +18,8 @@ DEPS =                                                                        \
 LDADDS =                                                               \
        $(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)
 
 if USE_X11
 testsocket_programs = testsocket testsocket_child
@@ -26,10 +27,12 @@ endif
 
 noinst_PROGRAMS =  $(TEST_PROGS)       \
        simple                          \
+       flicker                         \
        print-editor                    \
        testaccel                       \
        testassistant                   \
        testbbox                        \
+       testbuttons                     \
        testcairo                       \
        testcalendar                    \
        testcombo                       \
@@ -39,6 +42,7 @@ noinst_PROGRAMS =  $(TEST_PROGS)      \
        testdnd                         \
        testellipsise                   \
        testentrycompletion             \
+       testentryicons                  \
        testfilechooser                 \
        testfilechooserbutton           \
        testframe                       \
@@ -54,11 +58,14 @@ noinst_PROGRAMS =  $(TEST_PROGS)    \
        testmultiscreen                 \
        testnotebookdnd                 \
        testnouiprint                   \
+       testoffscreen                   \
+       testorientable                  \
        testprint                       \
        testrgb                         \
        testrecentchooser               \
        testrecentchoosermenu           \
        testrichtext                    \
+       testscale                       \
        testselection                   \
        $(testsocket_programs)          \
        testspinbutton                  \
@@ -76,6 +83,7 @@ noinst_PROGRAMS =  $(TEST_PROGS)      \
        testtreesort                    \
        treestoretest                   \
        testxinerama                    \
+       testwindows                     \
        pixbuf-read                     \
        pixbuf-lowmem                   \
        pixbuf-randomly-modified        \
@@ -95,12 +103,12 @@ autotestkeywords_SOURCES = autotestkeywords.cc
 autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers
 
 if HAVE_OBJC
-autotestkeywords_CPPFLAGS += -DHAVE_OBJC=1
-autotestkeywords_CXXFLAGS = -x objective-c++
+autotestkeywords_CPPFLAGS += -DHAVE_OBJC=1 -x objective-c++
 endif
 
 endif
 
+flicker_DEPENDENCIES = $(TEST_DEPS)
 simple_DEPENDENCIES = $(TEST_DEPS)
 print_editor_DEPENDENCIES = $(TEST_DEPS)
 testicontheme_DEPENDENCIES = $(TEST_DEPS)
@@ -108,6 +116,7 @@ testiconview_DEPENDENCIES = $(TEST_DEPS)
 testaccel_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)
@@ -118,6 +127,7 @@ testclientmessage_DEPENDENCIES = $(TEST_DEPS)
 testdnd_DEPENDENCIES = $(TEST_DEPS)
 testellipsise_DEPENDENCIES = $(TEST_DEPS)
 testentrycompletion_DEPENDENCIES = $(TEST_DEPS)
+testentryicons_DEPENDENCIES = $(TEST_DEPS)
 testfilechooser_DEPENDENCIES = $(TEST_DEPS)
 testfilechooserbutton_DEPENDENCIES = $(TEST_DEPS)
 testgtk_DEPENDENCIES = $(TEST_DEPS)
@@ -130,11 +140,14 @@ testmultidisplay_DEPENDENCIES = $(TEST_DEPS)
 testmultiscreen_DEPENDENCIES = $(TEST_DEPS)
 testnotebookdnd_DEPENDENCIES = $(TEST_DEPS)
 testnouiprint_DEPENDENCIES = $(TEST_DEPS)
+testoffscreen_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)
 testsocket_DEPENDENCIES = $(DEPS)
 testsocket_child_DEPENDENCIES = $(DEPS)
@@ -156,12 +169,15 @@ testactions_DEPENDENCIES = $(TEST_DEPS)
 testgrouping_DEPENDENCIES = $(TEST_DEPS)
 testtooltips_DEPENDENCIES = $(TEST_DEPS)
 testvolumebutton_DEPENDENCIES = $(TEST_DEPS)
+testwindows_DEPENDENCIES = $(TEST_DEPS)
 
+flicker_LDADD = $(LDADDS)
 simple_LDADD = $(LDADDS)
 print_editor_LDADD = $(LDADDS)
 testaccel_LDADD = $(LDADDS)
 testassistant_LDADD = $(LDADDS)
 testbbox_LDADD = $(LDADDS)
+testbuttons_LDADD = $(LDADDS)
 testframe_LDADD = $(LDADDS)
 testcairo_LDADD = $(LDADDS)
 testcalendar_LDADD = $(LDADDS)
@@ -172,6 +188,7 @@ testclientmessage_LDADD = $(LDADDS)
 testdnd_LDADD = $(LDADDS)
 testellipsise_LDADD = $(LDADDS)
 testentrycompletion_LDADD = $(LDADDS)
+testentryicons_LDADD = $(LDADDS)
 testfilechooser_LDADD = $(LDADDS)
 testfilechooserbutton_LDADD = $(LDADDS)
 testgtk_LDADD = $(LDADDS)
@@ -186,11 +203,14 @@ testmultidisplay_LDADD = $(LDADDS)
 testmultiscreen_LDADD = $(LDADDS)
 testnotebookdnd_LDADD = $(LDADDS)
 testnouiprint_LDADD = $(LDADDS)
+testoffscreen_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)
 testsocket_LDADD = $(LDADDS)
 testsocket_child_LDADD = $(LDADDS)
@@ -219,12 +239,17 @@ testactions_LDADD = $(LDADDS)
 testgrouping_LDADD = $(LDADDS)
 testtooltips_LDADD = $(LDADDS)
 testvolumebutton_LDADD = $(LDADDS)
+testwindows_LDADD = $(LDADDS)
 
 
 testentrycompletion_SOURCES =  \
        prop-editor.c           \
        testentrycompletion.c
 
+testentryicons_SOURCES =       \
+       prop-editor.c           \
+       testentryicons.c
+
 testfilechooser_SOURCES =      \
        prop-editor.c           \
        testfilechooser.c       
@@ -284,6 +309,9 @@ testactions_SOURCES =               \
 testbbox_SOURCES =             \
        testbbox.c
 
+testbuttons_SOURCES =          \
+       testbuttons.c
+
 testframe_SOURCES =            \
        testframe.c
 
@@ -307,6 +335,14 @@ testrecentchoosermenu_SOURCES =    \
 testvolumebutton_SOURCES =     \
        testvolumebutton.c
 
+testoffscreen_SOURCES =        \
+       gtkoffscreenbox.c       \
+       gtkoffscreenbox.h       \
+       testoffscreen.c
+
+testwindow_SOURCES =   \
+       testwindows.c
+
 EXTRA_DIST +=                  \
        prop-editor.h           \
        testgtk.1               \
@@ -331,3 +367,5 @@ EXTRA_DIST +=                       \
        file-chooser-test-dir/empty \
        file-chooser-test-dir/text.txt
 
+
+-include $(top_srcdir)/git.mk