Fix up linker flags

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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 66f9aad030c679f796aaafe5f05c2b08e5725ed7..d8b4ea8bd2f3e539f92fed6be48427d49ab41042 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                       \
@@ -40,6 +43,7 @@ noinst_PROGRAMS =  $(TEST_PROGS)      \
        testellipsise                   \
        testentrycompletion             \
        testentryicons                  \
+       testextendedlayout              \
        testfilechooser                 \
        testfilechooserbutton           \
        testframe                       \
@@ -56,6 +60,7 @@ noinst_PROGRAMS =  $(TEST_PROGS)      \
        testnotebookdnd                 \
        testnouiprint                   \
        testoffscreen                   \
+       testorientable                  \
        testprint                       \
        testrgb                         \
        testrecentchooser               \
@@ -79,6 +84,7 @@ noinst_PROGRAMS =  $(TEST_PROGS)      \
        testtreesort                    \
        treestoretest                   \
        testxinerama                    \
+       testwindows                     \
        pixbuf-read                     \
        pixbuf-lowmem                   \
        pixbuf-randomly-modified        \
@@ -98,12 +104,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)
@@ -111,6 +117,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)
@@ -122,6 +129,7 @@ testdnd_DEPENDENCIES = $(TEST_DEPS)
 testellipsise_DEPENDENCIES = $(TEST_DEPS)
 testentrycompletion_DEPENDENCIES = $(TEST_DEPS)
 testentryicons_DEPENDENCIES = $(TEST_DEPS)
+testextendedlayout_DEPENDENCIES = $(TEST_DEPS)
 testfilechooser_DEPENDENCIES = $(TEST_DEPS)
 testfilechooserbutton_DEPENDENCIES = $(TEST_DEPS)
 testgtk_DEPENDENCIES = $(TEST_DEPS)
@@ -135,6 +143,7 @@ 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)
@@ -162,12 +171,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)
@@ -179,6 +191,7 @@ testdnd_LDADD = $(LDADDS)
 testellipsise_LDADD = $(LDADDS)
 testentrycompletion_LDADD = $(LDADDS)
 testentryicons_LDADD = $(LDADDS)
+testextendedlayout_LDADD = $(LDADDS)
 testfilechooser_LDADD = $(LDADDS)
 testfilechooserbutton_LDADD = $(LDADDS)
 testgtk_LDADD = $(LDADDS)
@@ -194,6 +207,7 @@ testmultiscreen_LDADD = $(LDADDS)
 testnotebookdnd_LDADD = $(LDADDS)
 testnouiprint_LDADD = $(LDADDS)
 testoffscreen_LDADD = $(LDADDS)
+testorientable_LDADD = $(LDADDS)
 testprint_LDADD = $(LDADDS)
 testrecentchooser_LDADD = $(LDADDS)
 testrecentchoosermenu_LDADD = $(LDADDS)
@@ -228,6 +242,7 @@ testactions_LDADD = $(LDADDS)
 testgrouping_LDADD = $(LDADDS)
 testtooltips_LDADD = $(LDADDS)
 testvolumebutton_LDADD = $(LDADDS)
+testwindows_LDADD = $(LDADDS)
 
 
 testentrycompletion_SOURCES =  \
@@ -297,6 +312,9 @@ testactions_SOURCES =               \
 testbbox_SOURCES =             \
        testbbox.c
 
+testbuttons_SOURCES =          \
+       testbuttons.c
+
 testframe_SOURCES =            \
        testframe.c
 
@@ -325,6 +343,9 @@ testoffscreen_SOURCES =     \
        gtkoffscreenbox.h       \
        testoffscreen.c
 
+testwindow_SOURCES =   \
+       testwindows.c
+
 EXTRA_DIST +=                  \
        prop-editor.h           \
        testgtk.1               \
@@ -349,3 +370,5 @@ EXTRA_DIST +=                       \
        file-chooser-test-dir/empty \
        file-chooser-test-dir/text.txt
 
+
+-include $(top_srcdir)/git.mk