← Back to branch summary

~ubuntu-branches/ubuntu/maverick/dbus/maverick-proposed

« back to all changes in this revision

Viewing changes to test/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-09-27 13:06:32 UTC
  • mfrom: (1.1.23 upstream)
  • Revision ID: james.westby@ubuntu.com-20100927130632-bqs145trvchd2lmf
Tags: 1.4.0-0ubuntu1
* New upstream release
 - Fixes https://bugs.freedesktop.org/show_bug.cgi?id=17754 Race condition in protected_change_timeout
 - Requested by various upstream KDE developers http://lists.kde.org/?t=128514970000004&r=1&w=2

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/Makefile.am
61
61
decode_gcov_SOURCES=                            \
62
62
        decode-gcov.c
63
63
 
64
 
TEST_LIBS=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_TEST_LIBS)
 
64
# When any programs are not linked to libdbus-internal, fix this.
 
65
AM_CPPFLAGS=-DDBUS_STATIC_BUILD
 
66
TEST_LIBS=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS)
65
67
 
66
 
test_service_LDADD=$(TEST_LIBS) libdbus-testutils.la
 
68
test_service_LDADD=libdbus-testutils.la $(TEST_LIBS)
67
69
test_service_LDFLAGS=@R_DYNAMIC_LDFLAG@
68
 
test_names_LDADD=$(TEST_LIBS) libdbus-testutils.la
 
70
test_names_LDADD=libdbus-testutils.la $(TEST_LIBS)
69
71
test_names_LDFLAGS=@R_DYNAMIC_LDFLAG@
70
72
## break_loader_LDADD= $(TEST_LIBS)
71
73
## break_loader_LDFLAGS=@R_DYNAMIC_LDFLAG@
72
 
test_shell_service_LDADD=$(TEST_LIBS) libdbus-testutils.la
 
74
test_shell_service_LDADD=libdbus-testutils.la $(TEST_LIBS)
73
75
test_shell_service_LDFLAGS=@R_DYNAMIC_LDFLAG@
74
 
shell_test_LDADD=$(TEST_LIBS) libdbus-testutils.la
 
76
shell_test_LDADD=libdbus-testutils.la $(TEST_LIBS)
75
77
shell_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
76
78
spawn_test_LDADD=$(TEST_LIBS)
77
79
spawn_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
105
107
        data/equiv-config-files/entities/basic.d
106
108
 
107
109
 
108
 
FIND_TESTS=find . -name "*.message" -o -name "*.message-raw" -o -name "*.auth-script" -o -name "*.sha1" -o -name "*.txt" -o -name "*.conf" -o -name "*.service"
 
110
FIND_TESTS=find . -type f -a \( -name "*.message" -o -name "*.message-raw" -o -name "*.auth-script" -o -name "*.sha1" -o -name "*.txt" -o -name "*.conf" -o -name "*.service" \)
109
111
 
110
112
dist-hook:
111
113
        for D in $(TESTDIRS); do                                                \