chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cgroup: always keep access mode of 'tasks' and 'cgroup.procs' files in cgroup directo...
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 07f43627914bf1d04c9723644121f92f317e93b7..342116761e23b8b426ae4d939621f70ea4ac1209 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)
@@
-221,7
+222,7
@@
define add-wants
$(MKDIR_P) -m 0755 $$dir && \
cd $$dir && \
rm -f $$what && \
$(MKDIR_P) -m 0755 $$dir && \
cd $$dir && \
rm -f $$what && \
- for i in $$what; do
ln -s
../$$i . || exit $$? ; done )
+ for i in $$what; do
$(LN_S)
../$$i . || exit $$? ; done )
endef
install-directories-hook:
endef
install-directories-hook:
@@
-239,7
+240,7
@@
define install-aliases
$(MKDIR_P) /$(DESTDIR)$$dir && \
while [ -n "$$1" ]; do \
rm -f $(DESTDIR)$$dir/$$2 && \
$(MKDIR_P) /$(DESTDIR)$$dir && \
while [ -n "$$1" ]; do \
rm -f $(DESTDIR)$$dir/$$2 && \
-
ln -s
$$1 $(DESTDIR)$$dir/$$2 && \
+
$(LN_S)
$$1 $(DESTDIR)$$dir/$$2 && \
shift 2 || exit $$?; \
done
endef
shift 2 || exit $$?; \
done
endef
@@
-1086,7
+1087,9
@@
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 \
+ test-time
EXTRA_DIST += \
test/sched_idle_bad.service \
EXTRA_DIST += \
test/sched_idle_bad.service \
@@
-1186,6
+1189,24
@@
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_time_SOURCES = \
+ src/test/test-time.c
+
+test_time_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_time_LDADD = \
+ libsystemd-core.la
+
test_log_SOURCES = \
src/test/test-log.c
test_log_SOURCES = \
src/test/test-log.c
@@
-1611,7
+1632,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
+1689,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
+1711,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
@@
-2465,7
+2489,8
@@
libsystemd_id128_la_LDFLAGS = \
-Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
libsystemd_id128_la_LIBADD = \
-Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
libsystemd_id128_la_LIBADD = \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-daemon-internal.la
libsystemd_id128_internal_la_SOURCES = \
$(libsystemd_id128_la_SOURCES)
libsystemd_id128_internal_la_SOURCES = \
$(libsystemd_id128_la_SOURCES)
@@
-2867,6
+2892,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 = \
@@
-3526,7
+3552,6
@@
pam_systemd_la_LDFLAGS = \
-export-symbols-regex '^pam_sm_.*'
pam_systemd_la_LIBADD = \
-export-symbols-regex '^pam_sm_.*'
pam_systemd_la_LIBADD = \
- libsystemd-daemon.la \
libsystemd-audit.la \
libsystemd-dbus.la \
libsystemd-shared.la \
libsystemd-audit.la \
libsystemd-dbus.la \
libsystemd-shared.la \