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 branch 'socket-set-33337'
[platform/upstream/dbus.git]
/
dbus
/
Makefile.am
diff --git
a/dbus/Makefile.am
b/dbus/Makefile.am
index
d3d1b95
..
1c8fe8c
100644
(file)
--- a/
dbus/Makefile.am
+++ b/
dbus/Makefile.am
@@
-111,6
+111,10
@@
DBUS_UTIL_arch_sources = \
dbus-spawn.c
endif
dbus-spawn.c
endif
+if HAVE_LINUX_EPOLL
+DBUS_UTIL_arch_sources += dbus-socket-set-epoll.c
+endif
+
dbusinclude_HEADERS= \
dbus.h \
dbus-address.h \
dbusinclude_HEADERS= \
dbus.h \
dbus-address.h \
@@
-239,6
+243,9
@@
DBUS_UTIL_SOURCES= \
dbus-shell.c \
dbus-shell.h \
$(DBUS_UTIL_arch_sources) \
dbus-shell.c \
dbus-shell.h \
$(DBUS_UTIL_arch_sources) \
+ dbus-socket-set.h \
+ dbus-socket-set.c \
+ dbus-socket-set-poll.c \
dbus-spawn.h \
dbus-string-util.c \
dbus-sysdeps-util.c \
dbus-spawn.h \
dbus-string-util.c \
dbus-sysdeps-util.c \