Fix up linker flags

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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3efd3eb3ecc5edccbb737cae223d090a72e64169..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
@@ -31,6 +32,7 @@ noinst_PROGRAMS =  $(TEST_PROGS)      \
        testaccel                       \
        testassistant                   \
        testbbox                        \
+       testbuttons                     \
        testcairo                       \
        testcalendar                    \
        testcombo                       \
@@ -57,6 +59,7 @@ noinst_PROGRAMS =  $(TEST_PROGS)      \
        testnotebookdnd                 \
        testnouiprint                   \
        testoffscreen                   \
+       testorientable                  \
        testprint                       \
        testrgb                         \
        testrecentchooser               \
@@ -100,8 +103,7 @@ 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
@@ -114,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)
@@ -138,6 +141,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)
@@ -173,6 +177,7 @@ 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)
@@ -199,6 +204,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)
@@ -303,6 +309,9 @@ testactions_SOURCES =               \
 testbbox_SOURCES =             \
        testbbox.c
 
+testbuttons_SOURCES =          \
+       testbuttons.c
+
 testframe_SOURCES =            \
        testframe.c
 
@@ -358,3 +367,5 @@ EXTRA_DIST +=                       \
        file-chooser-test-dir/empty \
        file-chooser-test-dir/text.txt
 
+
+-include $(top_srcdir)/git.mk