summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAndreas Volz <andreas.volz@tux-style.com>2011-11-29 23:48:04 +0100
committerAndreas Volz <andreas.volz@tux-style.com>2011-11-29 23:48:04 +0100
commit2b8cfc887ef678c9ade0dcefc7da05acb0dafefa (patch)
tree5023b4cd6380c77499d109ac4dfeb3f275b66062 /test
parent7a3242b77ff1dea057daf62b453e9d079768ce42 (diff)
downloaddbus-c++-2b8cfc887ef678c9ade0dcefc7da05acb0dafefa.tar.gz
- dbus-c++ passes now compiling on ubuntu 8.10 machine (-lrt addded for Test1/TestApp)
- identified a potential problem in pipe.cpp and marked it with FIXME - changed version to 0.9.0-pre1 to inform it's near to 1.0 stable release
Diffstat (limited to 'test')
-rw-r--r--test/functional/Test1/Makefile.am6
-rw-r--r--test/generator/Makefile.am8
2 files changed, 8 insertions, 6 deletions
diff --git a/test/functional/Test1/Makefile.am b/test/functional/Test1/Makefile.am
index f8a1818..3269751 100644
--- a/test/functional/Test1/Makefile.am
+++ b/test/functional/Test1/Makefile.am
@@ -28,8 +28,10 @@ TestApp_SOURCES = \
TestAppIntro.h \
TestAppIntroProvider.h
-TestApp_LDFLAGS = \
- $(top_builddir)/src/libdbus-c++-1.la
+TestApp_LDADD = \
+ $(top_builddir)/src/libdbus-c++-1.la \
+ $(PTHREAD_LIBS) \
+ $(RT_LIBS)
TestApp_CXXFLAGS = \
-I$(top_srcdir)/include
diff --git a/test/generator/Makefile.am b/test/generator/Makefile.am
index 6065cab..6c2403d 100644
--- a/test/generator/Makefile.am
+++ b/test/generator/Makefile.am
@@ -8,8 +8,8 @@ dbuscxx_test_generator_server_SOURCES = dbuscxx_test_generator-server-glue.h \
dbuscxx_test_generator-server.h \
dbuscxx_test_generator-server.cpp
-dbuscxx_test_generator_server_LDADD = $(top_builddir)/src/libdbus-c++-1.la @PTHREAD_LIBS@
-dbuscxx_test_generator_server_CXXFLAGS = @PTHREAD_CFLAGS@
+dbuscxx_test_generator_server_LDADD = $(top_builddir)/src/libdbus-c++-1.la
+dbuscxx_test_generator_server_CXXFLAGS =
dbuscxx_test_generator-server-glue.h: dbuscxx_test_generator.xml
$(top_builddir)/tools/dbusxx-xml2cpp $^ --adaptor=$@
@@ -22,8 +22,8 @@ dbuscxx_test_generator_client_SOURCES = dbuscxx_test_generator-client-glue.h \
dbuscxx_test_generator-client.h \
dbuscxx_test_generator-client.cpp
-dbuscxx_test_generator_client_LDADD = $(top_builddir)/src/libdbus-c++-1.la @PTHREAD_LIBS@
-dbuscxx_test_generator_client_CXXFLAGS = @PTHREAD_CFLAGS@
+dbuscxx_test_generator_client_LDADD = $(top_builddir)/src/libdbus-c++-1.la
+dbuscxx_test_generator_client_CXXFLAGS =
dbuscxx_test_generator-client-glue.h: dbuscxx_test_generator.xml
$(top_builddir)/tools/dbusxx-xml2cpp $^ --proxy=$@