Replaced calls to deprecated part of the Factory interface with the

[profile/ivi/common-api-dbus-runtime.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e73fb5c..df4a358 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,6 +48,7 @@ libCommonAPI_DBus_la_SOURCES = \
         src/CommonAPI/DBus/DBusProxy.cpp \
         src/CommonAPI/DBus/DBusFactory.cpp \
         src/CommonAPI/DBus/DBusRuntime.cpp \
+        src/CommonAPI/DBus/DBusServicePublisher.cpp \
         src/CommonAPI/DBus/DBusServiceRegistry.cpp \
         src/CommonAPI/DBus/DBusServiceStatusEvent.cpp \
         src/CommonAPI/DBus/DBusStubAdapter.cpp
@@ -83,6 +84,7 @@ CommonAPI_DBus_include_HEADERS = \
         src/CommonAPI/DBus/DBusProxyHelper.h \
         src/CommonAPI/DBus/DBusRuntime.h \
         src/CommonAPI/DBus/DBusSerializableArguments.h \
+        src/CommonAPI/DBus/DBusServicePublisher.h \
         src/CommonAPI/DBus/DBusServiceRegistry.h \
         src/CommonAPI/DBus/DBusServiceStatusEvent.h \
         src/CommonAPI/DBus/DBusStubAdapter.h \
@@ -103,6 +105,7 @@ TestInterfaceSources = \
         src/test/fakeLegacyService/fake/legacy/service/LegacyInterfaceDBusProxy.cpp
 
 check_PROGRAMS = \
+        DBusMainLoopIntegrationTest \
         DBusConnectionTest \
         DBusServiceRegistryTest \
         DBusProxyTest \
@@ -117,12 +120,20 @@ check_PROGRAMS = \
         DBusDaemonProxyTest \
         DBusCommunicationTest \
         DBusMultipleConnectionTest \
-        DBusBenchmarkingTest
+        DBusBenchmarkingTest \
+        DBusServicePublisherTest
 
 
-TESTS =        ${check_PROGRAMS}
+TESTS = ${check_PROGRAMS}
 LDADD_FOR_GTEST = libCommonAPI-DBus.la ${GTEST_LIBS} ${LDADD}
 
+DBusMainLoopIntegrationTest_SOURCES = \
+        src/test/DBusMainLoopIntegrationTest.cpp \
+        ${TestInterfaceSources}
+DBusMainLoopIntegrationTest_CPPFLAGS = ${AM_CPPFLAGS} ${GTEST_CPPFLAGS} ${GLIB_CFLAGS}
+DBusMainLoopIntegrationTest_CXXFLAGS = ${GTEST_CXXFLAGS} ${GLIB_CFLAGS}
+DBusMainLoopIntegrationTest_LDADD = ${LDADD_FOR_GTEST} ${GLIB_LIBS}
+
 DBusServiceRegistryTest_SOURCES = \
         src/test/DBusServiceRegistryTest.cpp \
         ${TestInterfaceSources}
@@ -209,6 +220,13 @@ DBusProxyTest_CPPFLAGS = ${AM_CPPFLAGS} ${GTEST_CPPFLAGS}
 DBusProxyTest_CXXFLAGS = ${GTEST_CXXFLAGS}
 DBusProxyTest_LDADD = ${LDADD_FOR_GTEST}
 
+DBusServicePublisherTest_SOURCES = \
+        src/test/DBusServicePublisherTest.cpp \
+        ${TestInterfaceSources}
+DBusServicePublisherTest_CPPFLAGS = ${AM_CPPFLAGS} ${GTEST_CPPFLAGS}
+DBusServicePublisherTest_CXXFLAGS = ${GTEST_CXXFLAGS}
+DBusServicePublisherTest_LDADD = ${LDADD_FOR_GTEST}
+
 DBusVariantTest_SOURCES = src/test/DBusVariantTest.cpp
 DBusVariantTest_CPPFLAGS = ${AM_CPPFLAGS} ${GTEST_CPPFLAGS}
 DBusVariantTest_CXXFLAGS = ${GTEST_CXXFLAGS}