projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Optional autogen.sh flag --enable-kdbus-transport added allowing to compile...
[platform/upstream/dbus.git]
/
bus
/
Makefile.am
diff --git
a/bus/Makefile.am
b/bus/Makefile.am
index
4ccf79b
..
55c73b5
100644
(file)
--- a/
bus/Makefile.am
+++ b/
bus/Makefile.am
@@
-28,8
+28,6
@@
AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
EFENCE=
EFENCE=
-DBUS_SESSION_SERVICE_DIRS = <standard_session_servicedirs />
-
CONFIG_IN_FILES= \
session.conf.in \
system.conf.in \
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
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
XML_SOURCES=config-loader-expat.c
-endif
if DBUS_BUS_ENABLE_KQUEUE
DIR_WATCH_SOURCE=dir-watch-kqueue.c
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_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
DIR_WATCH_SOURCE=dir-watch-default.c
endif
endif
-endif
BUS_SOURCES= \
activation.c \
BUS_SOURCES= \
activation.c \
@@
-103,6
+92,13
@@
BUS_SOURCES= \
utils.h \
$(XML_SOURCES)
utils.h \
$(XML_SOURCES)
+if ENABLE_KDBUS_TRANSPORT
+BUS_SOURCES+= \
+ kdbus-d.c \
+ kdbus-d.h
+endif
+
+
dbus_daemon_SOURCES= \
$(BUS_SOURCES) \
main.c
dbus_daemon_SOURCES= \
$(BUS_SOURCES) \
main.c
@@
-175,7
+171,7
@@
endif DBUS_UNIX
## compiled, so we don't put them in TESTS here; we run them in test/
## instead.
## compiled, so we don't put them in TESTS here; we run them in test/
## instead.
-if DBUS_
BUIL
D_TESTS
+if DBUS_
ENABLE_EMBEDDE
D_TESTS
## we use noinst_PROGRAMS not check_PROGRAMS so that we build
## even when not doing "make check"
## we use noinst_PROGRAMS not check_PROGRAMS so that we build
## even when not doing "make check"
@@
-189,7
+185,7
@@
noinst_PROGRAMS += bus-test-launch-helper
noinst_PROGRAMS += dbus-daemon-launch-helper-test
endif DBUS_UNIX
noinst_PROGRAMS += dbus-daemon-launch-helper-test
endif DBUS_UNIX
-endif DBUS_
BUIL
D_TESTS
+endif DBUS_
ENABLE_EMBEDDE
D_TESTS
bus_test_system_SOURCES= \
$(XML_SOURCES) \
bus_test_system_SOURCES= \
$(XML_SOURCES) \