chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shared: rework env file reader
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 07f43627914bf1d04c9723644121f92f317e93b7..9341e28175600d018ef5dfcd45b7edf079060b8c 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-167,6
+167,7
@@
AM_CPPFLAGS = \
-I $(top_srcdir)/src/core \
-I $(top_srcdir)/src/libudev \
-I $(top_srcdir)/src/udev \
-I $(top_srcdir)/src/core \
-I $(top_srcdir)/src/libudev \
-I $(top_srcdir)/src/udev \
+ -I $(top_srcdir)/src/libsystemd-bus \
$(OUR_CPPFLAGS)
AM_CFLAGS = $(OUR_CFLAGS)
$(OUR_CPPFLAGS)
AM_CFLAGS = $(OUR_CFLAGS)
@@
-1086,7
+1087,8
@@
noinst_tests += \
test-calendarspec \
test-strip-tab-ansi \
test-cgroup-util \
test-calendarspec \
test-strip-tab-ansi \
test-cgroup-util \
- test-prioq
+ test-prioq \
+ test-fileio
EXTRA_DIST += \
test/sched_idle_bad.service \
EXTRA_DIST += \
test/sched_idle_bad.service \
@@
-1186,6
+1188,15
@@
test_prioq_CFLAGS = \
test_prioq_LDADD = \
libsystemd-core.la
test_prioq_LDADD = \
libsystemd-core.la
+test_fileio_SOURCES = \
+ src/test/test-fileio.c
+
+test_fileio_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_fileio_LDADD = \
+ libsystemd-core.la
+
test_log_SOURCES = \
src/test/test-log.c
test_log_SOURCES = \
src/test/test-log.c
@@
-1611,7
+1622,9
@@
systemd_stdio_bridge_SOURCES = \
src/stdio-bridge/stdio-bridge.c
systemd_stdio_bridge_LDADD = \
src/stdio-bridge/stdio-bridge.c
systemd_stdio_bridge_LDADD = \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-bus.la \
+ libsystemd-daemon.la
# ------------------------------------------------------------------------------
systemd_tty_ask_password_agent_SOURCES = \
# ------------------------------------------------------------------------------
systemd_tty_ask_password_agent_SOURCES = \
@@
-1666,9
+1679,9
@@
EXTRA_DIST += \
# ------------------------------------------------------------------------------
libsystemd_bus_la_SOURCES = \
# ------------------------------------------------------------------------------
libsystemd_bus_la_SOURCES = \
+ src/systemd/sd-bus.h \
+ src/systemd/sd-bus-protocol.h \
src/libsystemd-bus/sd-bus.c \
src/libsystemd-bus/sd-bus.c \
- src/libsystemd-bus/sd-bus.h \
- src/libsystemd-bus/sd-bus-protocol.h \
src/libsystemd-bus/bus-control.c \
src/libsystemd-bus/bus-control.h \
src/libsystemd-bus/bus-error.c \
src/libsystemd-bus/bus-control.c \
src/libsystemd-bus/bus-control.h \
src/libsystemd-bus/bus-error.c \
@@
-1688,7
+1701,8
@@
libsystemd_bus_la_SOURCES = \
libsystemd_bus_la_LIBADD = \
libsystemd-id128-internal.la \
libsystemd_bus_la_LIBADD = \
libsystemd-id128-internal.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-daemon.la
noinst_LTLIBRARIES += \
libsystemd-bus.la
noinst_LTLIBRARIES += \
libsystemd-bus.la
@@
-2867,6
+2881,7
@@
systemd_journal_gatewayd_LDADD = \
libsystemd-journal-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon.la \
libsystemd-journal-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon.la \
+ libsystemd-bus.la \
$(MICROHTTPD_LIBS)
systemd_journal_gatewayd_CFLAGS = \
$(MICROHTTPD_LIBS)
systemd_journal_gatewayd_CFLAGS = \