chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hostnamed: port over from libdbus to libsystemd-bus
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 287718413b513f1769734373a8a781ec7411bcbc..b337f4f09b8be515903e7604fa5971acd51dbb40 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-300,7
+300,7
@@
bin_PROGRAMS = \
systemd-delta \
systemd-analyze \
systemd-run \
systemd-delta \
systemd-analyze \
systemd-run \
- systemd-sa
bridge
+ systemd-sa
proxy
dist_bin_SCRIPTS = \
src/kernel-install/kernel-install
dist_bin_SCRIPTS = \
src/kernel-install/kernel-install
@@
-1983,7
+1983,10
@@
libsystemd_bus_la_SOURCES = \
src/libsystemd-bus/bus-convenience.c \
src/libsystemd-bus/kdbus.h \
src/libsystemd-bus/sd-memfd.c \
src/libsystemd-bus/bus-convenience.c \
src/libsystemd-bus/kdbus.h \
src/libsystemd-bus/sd-memfd.c \
- src/libsystemd-bus/sd-event.c
+ src/libsystemd-bus/sd-event.c \
+ src/libsystemd-bus/bus-util.c \
+ src/libsystemd-bus/bus-util.h \
+ src/libsystemd-bus/event-util.h
libsystemd_bus_la_LIBADD = \
libsystemd-id128-internal.la \
libsystemd_bus_la_LIBADD = \
libsystemd-id128-internal.la \
@@
-2956,6
+2959,7
@@
test_catalog_LDADD = \
libsystemd_journal_la_SOURCES = \
src/journal/sd-journal.c \
src/systemd/sd-journal.h \
libsystemd_journal_la_SOURCES = \
src/journal/sd-journal.c \
src/systemd/sd-journal.h \
+ src/systemd/_sd-common.h \
src/journal/journal-file.c \
src/journal/journal-file.h \
src/journal/journal-vacuum.c \
src/journal/journal-file.c \
src/journal/journal-file.h \
src/journal/journal-vacuum.c \
@@
-3119,7
+3123,8
@@
tests += \
pkginclude_HEADERS += \
src/systemd/sd-journal.h \
pkginclude_HEADERS += \
src/systemd/sd-journal.h \
- src/systemd/sd-messages.h
+ src/systemd/sd-messages.h \
+ src/systemd/_sd-common.h
lib_LTLIBRARIES += \
libsystemd-journal.la
lib_LTLIBRARIES += \
libsystemd-journal.la
@@
-3210,10
+3215,10
@@
EXTRA_DIST += \
# ------------------------------------------------------------------------------
# ------------------------------------------------------------------------------
-systemd_sa
bridge
_SOURCES = \
- src/sa
bridge/sabridge
.c
+systemd_sa
proxy
_SOURCES = \
+ src/sa
proxy/saproxy
.c
-systemd_sa
bridge
_LDADD = \
+systemd_sa
proxy
_LDADD = \
libsystemd-shared.la \
libsystemd-logs.la \
libsystemd-journal-internal.la \
libsystemd-shared.la \
libsystemd-logs.la \
libsystemd-journal-internal.la \
@@
-3221,7
+3226,7
@@
systemd_sabridge_LDADD = \
libsystemd-daemon.la \
libsystemd-bus.la
libsystemd-daemon.la \
libsystemd-bus.la
-systemd_sa
bridge
_CFLAGS = \
+systemd_sa
proxy
_CFLAGS = \
$(AM_CFLAGS)
# ------------------------------------------------------------------------------
$(AM_CFLAGS)
# ------------------------------------------------------------------------------
@@
-3506,15
+3511,11
@@
if ENABLE_HOSTNAMED
systemd_hostnamed_SOURCES = \
src/hostname/hostnamed.c
systemd_hostnamed_SOURCES = \
src/hostname/hostnamed.c
-systemd_hostnamed_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
-
systemd_hostnamed_LDADD = \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-daemon.la \
systemd_hostnamed_LDADD = \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-
d
bus.la
+ libsystemd-bus.la
rootlibexec_PROGRAMS += \
systemd-hostnamed
rootlibexec_PROGRAMS += \
systemd-hostnamed
@@
-3655,15
+3656,11
@@
if ENABLE_TIMEDATED
systemd_timedated_SOURCES = \
src/timedate/timedated.c
systemd_timedated_SOURCES = \
src/timedate/timedated.c
-systemd_timedated_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
-
systemd_timedated_LDADD = \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-daemon.la \
systemd_timedated_LDADD = \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-
d
bus.la
+ libsystemd-bus.la
rootlibexec_PROGRAMS += \
systemd-timedated
rootlibexec_PROGRAMS += \
systemd-timedated