chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tmpfiles: fix permissions on new journal files
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 6c7d6e54d671ee6a32f93707bd1dea99732d8117..451e53ace343d69ccaf320224d21695eae93b23a 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1176,8
+1176,12
@@
manual_tests += \
test-install \
test-watchdog \
test-log \
test-install \
test-watchdog \
test-log \
- test-ipcrm \
+ test-ipcrm
+
+if HAVE_KMOD
+manual_tests += \
test-rtnl-manual
test-rtnl-manual
+endif
tests += \
test-job-type \
tests += \
test-job-type \
@@
-1402,10
+1406,14
@@
test_ipcrm_LDADD = \
test_rtnl_manual_SOURCES = \
src/test/test-rtnl-manual.c
test_rtnl_manual_SOURCES = \
src/test/test-rtnl-manual.c
+test_rtnl_manual_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(KMOD_CFLAGS)
+
test_rtnl_manual_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la \
test_rtnl_manual_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la \
- -lkmod
+ $(KMOD_LIBS)
test_ellipsize_SOURCES = \
src/test/test-ellipsize.c
test_ellipsize_SOURCES = \
src/test/test-ellipsize.c
@@
-1961,6
+1969,7
@@
systemd_cgls_SOURCES = \
src/cgls/cgls.c
systemd_cgls_LDADD = \
src/cgls/cgls.c
systemd_cgls_LDADD = \
+ libsystemd-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
libsystemd-shared.la
# ------------------------------------------------------------------------------
@@
-2586,8
+2595,7
@@
noinst_LTLIBRARIES += \
libudev_internal_la_SOURCES =\
$(libudev_la_SOURCES) \
libudev_internal_la_SOURCES =\
$(libudev_la_SOURCES) \
- src/libudev/libudev-device-private.c \
- src/libudev/libudev-queue-private.c
+ src/libudev/libudev-device-private.c
libudev_internal_la_CFLAGS = \
$(AM_CFLAGS) \
libudev_internal_la_CFLAGS = \
$(AM_CFLAGS) \
@@
-3879,12
+3887,10
@@
nodist_userunit_DATA += \
units/user/systemd-bus-driverd.service
USER_BUSNAMES_TARGET_WANTS += \
units/user/systemd-bus-driverd.service
USER_BUSNAMES_TARGET_WANTS += \
- org.freedesktop.DBus.busname \
- org.freedesktop.systemd1.busname
+ org.freedesktop.DBus.busname
USER_UNIT_ALIASES += \
USER_UNIT_ALIASES += \
- $(systemunitdir)/org.freedesktop.DBus.busname org.freedesktop.DBus.busname \
- $(systemunitdir)/org.freedesktop.systemd1.busname org.freedesktop.systemd1.busname
+ $(systemunitdir)/org.freedesktop.DBus.busname org.freedesktop.DBus.busname
endif
EXTRA_DIST += \
endif
EXTRA_DIST += \
@@
-5053,7
+5059,7
@@
hwdb-update:
.PHONY: kdbus-update
kdbus-update:
.PHONY: kdbus-update
kdbus-update:
- ( cd $(top_srcdir)/src/libsystemd/ && \
+ ( cd $(top_srcdir)/src/libsystemd/
sd-bus/
&& \
wget -N https://d-bus.googlecode.com/git/kdbus.h )
.PHONY: git-tag
wget -N https://d-bus.googlecode.com/git/kdbus.h )
.PHONY: git-tag
@@
-5170,6
+5176,9
@@
test_libsystemd_sym_LDADD = \
test_libudev_sym_SOURCES = \
test-libudev-sym.c
test_libudev_sym_SOURCES = \
test-libudev-sym.c
+test_libudev_sym_CFLAGS = \
+ $(AM_CFLAGS) \
+ -Wno-deprecated-declarations
test_libudev_sym_LDADD = \
libudev.la
test_libudev_sym_LDADD = \
libudev.la