X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bus%2FMakefile.am;h=9a646af1a8c762057ff560dba09e99f293ecb3cd;hb=1200c464b6c9051340960e07f0d61a51dad71286;hp=4ccf79b424a6bdf2bdd894922cd21a7d00839f79;hpb=01f6419ecc89623283d2f728ab1d390b85fb2c59;p=platform%2Fupstream%2Fdbus.git

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 4ccf79b..9a646af 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -28,8 +28,6 @@ AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
 
 EFENCE=
 
-DBUS_SESSION_SERVICE_DIRS = <standard_session_servicedirs />
-
 CONFIG_IN_FILES=				\
 	session.conf.in				\
 	system.conf.in				\
@@ -44,12 +42,7 @@ agentdir=$(LAUNCHD_AGENT_DIR)
 agent_DATA=org.freedesktop.dbus-session.plist
 endif
 
-if DBUS_USE_LIBXML
-XML_SOURCES=config-loader-libxml.c
-endif
-if DBUS_USE_EXPAT
 XML_SOURCES=config-loader-expat.c
-endif
 
 if DBUS_BUS_ENABLE_KQUEUE
 DIR_WATCH_SOURCE=dir-watch-kqueue.c
@@ -57,13 +50,9 @@ else
 if DBUS_BUS_ENABLE_INOTIFY
 DIR_WATCH_SOURCE=dir-watch-inotify.c
 else
-if DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX
-DIR_WATCH_SOURCE=dir-watch-dnotify.c
-else
 DIR_WATCH_SOURCE=dir-watch-default.c
 endif
 endif
-endif
 
 BUS_SOURCES=					\
 	activation.c				\
@@ -87,6 +76,8 @@ BUS_SOURCES=					\
 	driver.h				\
 	expirelist.c				\
 	expirelist.h				\
+	kdbus-d.c					\
+	kdbus-d.h					\	
 	policy.c				\
 	policy.h				\
 	selinux.h				\
@@ -175,7 +166,7 @@ endif DBUS_UNIX
 ## compiled, so we don't put them in TESTS here; we run them in test/
 ## instead.
 
-if DBUS_BUILD_TESTS
+if DBUS_ENABLE_EMBEDDED_TESTS
 ## we use noinst_PROGRAMS not check_PROGRAMS so that we build
 ## even when not doing "make check"
 
@@ -189,7 +180,7 @@ noinst_PROGRAMS += bus-test-launch-helper
 noinst_PROGRAMS += dbus-daemon-launch-helper-test
 endif DBUS_UNIX
 
-endif DBUS_BUILD_TESTS
+endif DBUS_ENABLE_EMBEDDED_TESTS
 
 bus_test_system_SOURCES=			\
 	$(XML_SOURCES)				\