chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mount: don't creat local-fs.target links for mount units when runnin in user mode
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 3f47bc8e5d094ddffb655ebaf6eb0c7c34e018ef..aed8c326a7041d408aba556e32524ccd329d986e 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-460,6
+460,7
@@
nodist_systemunit_DATA = \
units/systemd-nspawn@.service
dist_userunit_DATA = \
units/systemd-nspawn@.service
dist_userunit_DATA = \
+ units/user/basic.target \
units/user/default.target \
units/user/exit.target
units/user/default.target \
units/user/exit.target
@@
-489,7
+490,7
@@
EXTRA_DIST += \
units/user/systemd-exit.service.in \
units/systemd-fsck@.service.in \
units/systemd-fsck-root.service.in \
units/user/systemd-exit.service.in \
units/systemd-fsck@.service.in \
units/systemd-fsck-root.service.in \
- units/user@.service.in \
+ units/user@.service.
m4.
in \
units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
@@
-508,7
+509,8
@@
CLEANFILES += \
units/console-shell.service.m4 \
units/console-getty.service.m4 \
units/container-getty@.service.m4 \
units/console-shell.service.m4 \
units/console-getty.service.m4 \
units/container-getty@.service.m4 \
- units/rescue.service.m4
+ units/rescue.service.m4 \
+ units/user@.service.m4
if HAVE_SYSV_COMPAT
nodist_systemunit_DATA += \
if HAVE_SYSV_COMPAT
nodist_systemunit_DATA += \
@@
-694,6
+696,8
@@
libsystemd_shared_la_SOURCES = \
src/shared/time-util.h \
src/shared/hashmap.c \
src/shared/hashmap.h \
src/shared/time-util.h \
src/shared/hashmap.c \
src/shared/hashmap.h \
+ src/shared/siphash24.c \
+ src/shared/siphash24.h \
src/shared/set.c \
src/shared/set.h \
src/shared/fdset.c \
src/shared/set.c \
src/shared/set.h \
src/shared/fdset.c \
@@
-753,8
+757,8
@@
libsystemd_shared_la_SOURCES = \
src/shared/fileio.c \
src/shared/fileio.h \
src/shared/output-mode.h \
src/shared/fileio.c \
src/shared/fileio.h \
src/shared/output-mode.h \
- src/shared/MurmurHash
3
.c \
- src/shared/MurmurHash
3
.h \
+ src/shared/MurmurHash
2
.c \
+ src/shared/MurmurHash
2
.h \
src/shared/acpi-fpdt.h \
src/shared/acpi-fpdt.c \
src/shared/boot-timestamps.h \
src/shared/acpi-fpdt.h \
src/shared/acpi-fpdt.c \
src/shared/boot-timestamps.h \
@@
-776,7
+780,9
@@
libsystemd_shared_la_SOURCES = \
src/shared/syscall-list.c \
src/shared/syscall-list.h \
src/shared/audit.c \
src/shared/syscall-list.c \
src/shared/syscall-list.h \
src/shared/audit.c \
- src/shared/audit.h
+ src/shared/audit.h \
+ src/shared/xml.c \
+ src/shared/xml.h
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
@@
-1153,7
+1159,8
@@
tests += \
test-hashmap \
test-list \
test-tables \
test-hashmap \
test-list \
test-tables \
- test-device-nodes
+ test-device-nodes \
+ test-xml
EXTRA_DIST += \
test/sched_idle_bad.service \
EXTRA_DIST += \
test/sched_idle_bad.service \
@@
-1255,6
+1262,12
@@
test_hashmap_SOURCES = \
test_hashmap_LDADD = \
libsystemd-core.la
test_hashmap_LDADD = \
libsystemd-core.la
+test_xml_SOURCES = \
+ src/test/test-xml.c
+
+test_xml_LDADD = \
+ libsystemd-shared.la
+
test_list_SOURCES = \
src/test/test-list.c
test_list_SOURCES = \
src/test/test-list.c
@@
-1582,6
+1595,7
@@
nodist_systemunit_DATA += \
dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
+ tmpfiles.d/systemd-nologin.conf \
tmpfiles.d/tmp.conf \
tmpfiles.d/x11.conf
tmpfiles.d/tmp.conf \
tmpfiles.d/x11.conf
@@
-1891,7
+1905,7
@@
systemd_bus_proxyd_LDADD = \
libsystemd-shared.la
bus-proxyd-install-hook:
libsystemd-shared.la
bus-proxyd-install-hook:
- $(AM_V_LN)$(LN_S) -f ../
../
lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
+ $(AM_V_LN)$(LN_S) -f ../lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
bus-proxyd-uninstall-hook:
rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
bus-proxyd-uninstall-hook:
rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
@@
-2024,6
+2038,9
@@
libsystemd_bus_la_SOURCES = \
src/libsystemd-bus/event-util.h \
src/libsystemd-bus/bus-protocol.h
src/libsystemd-bus/event-util.h \
src/libsystemd-bus/bus-protocol.h
+nodist_libsystemd_bus_la_SOURCES = \
+ src/libsystemd-bus/bus-error-mapping.c
+
libsystemd_bus_la_LIBADD = \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd_bus_la_LIBADD = \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
@@
-2042,16
+2059,23
@@
pkgconfiglib_DATA += \
src/libsystemd-bus/libsystemd-bus.pc
EXTRA_DIST += \
src/libsystemd-bus/libsystemd-bus.pc
EXTRA_DIST += \
+ src/libsystemd-bus/bus-error-mapping.gperf \
src/libsystemd-bus/libsystemd-bus.pc.in \
src/libsystemd-bus/DIFFERENCES \
src/libsystemd-bus/GVARIANT-SERIALIZATION
src/libsystemd-bus/libsystemd-bus.pc.in \
src/libsystemd-bus/DIFFERENCES \
src/libsystemd-bus/GVARIANT-SERIALIZATION
+CLEANFILES += \
+ src/libsystemd-bus/bus-error-mapping.c
+
lib_LTLIBRARIES += \
libsystemd-bus.la
libsystemd_bus_internal_la_SOURCES = \
$(libsystemd_bus_la_SOURCES)
lib_LTLIBRARIES += \
libsystemd-bus.la
libsystemd_bus_internal_la_SOURCES = \
$(libsystemd_bus_la_SOURCES)
+nodist_libsystemd_bus_internal_la_SOURCES = \
+ $(nodist_libsystemd_bus_la_SOURCES)
+
libsystemd_bus_internal_la_CFLAGS = \
$(libsystemd_bus_la_CFLAGS)
libsystemd_bus_internal_la_CFLAGS = \
$(libsystemd_bus_la_CFLAGS)
@@
-2412,6
+2436,8
@@
dist_udevhwdb_DATA = \
hwdb/20-pci-classes.hwdb \
hwdb/20-usb-vendor-model.hwdb \
hwdb/20-usb-classes.hwdb \
hwdb/20-pci-classes.hwdb \
hwdb/20-usb-vendor-model.hwdb \
hwdb/20-usb-classes.hwdb \
+ hwdb/20-sdio-vendor-model.hwdb \
+ hwdb/20-sdio-classes.hwdb \
hwdb/20-bluetooth-vendor-product.hwdb \
hwdb/20-acpi-vendor.hwdb \
hwdb/20-OUI.hwdb \
hwdb/20-bluetooth-vendor-product.hwdb \
hwdb/20-acpi-vendor.hwdb \
hwdb/20-OUI.hwdb \
@@
-3718,8
+3744,21
@@
systemd_bus_driverd_LDADD = \
rootlibexec_PROGRAMS += \
systemd-bus-driverd
rootlibexec_PROGRAMS += \
systemd-bus-driverd
+
+nodist_systemunit_DATA += \
+ units/systemd-bus-driverd.service
+
+dist_systemunit_DATA += \
+ units/org.freedesktop.DBus.busname
+
+BUSNAMES_TARGET_WANTS += \
+ org.freedesktop.DBus.busname
+
endif
endif
+EXTRA_DIST += \
+ units/systemd-bus-driverd.service.in
+
# ------------------------------------------------------------------------------
if ENABLE_LOCALED
systemd_localed_SOURCES = \
# ------------------------------------------------------------------------------
if ENABLE_LOCALED
systemd_localed_SOURCES = \
@@
-3888,8
+3927,8
@@
noinst_LTLIBRARIES += \
libsystemd-dhcp.la
libsystemd_dhcp_la_LIBADD = \
libsystemd-dhcp.la
libsystemd_dhcp_la_LIBADD = \
- libsystemd-
shared
.la \
- libsystemd-
bus
.la
+ libsystemd-
bus-internal
.la \
+ libsystemd-
shared
.la
test_dhcp_option_SOURCES = \
src/libsystemd-dhcp/dhcp-protocol.h \
test_dhcp_option_SOURCES = \
src/libsystemd-dhcp/dhcp-protocol.h \
@@
-3907,9
+3946,11
@@
test_dhcp_client_SOURCES = \
src/libsystemd-dhcp/test-dhcp-client.c
test_dhcp_client_LDADD = \
src/libsystemd-dhcp/test-dhcp-client.c
test_dhcp_client_LDADD = \
+ libsystemd-bus-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-id128-internal.la \
libsystemd-dhcp.la \
libsystemd-dhcp.la \
- libsystemd-shared.la \
- libsystemd-bus.la
+ libsystemd-shared.la
tests += \
test-dhcp-option \
tests += \
test-dhcp-option \
@@
-4016,6
+4057,7
@@
systemd_networkd_LDADD = \
libsystemd-bus-internal.la \
libsystemd-id128-internal.la \
libsystemd-rtnl.la \
libsystemd-bus-internal.la \
libsystemd-id128-internal.la \
libsystemd-rtnl.la \
+ libsystemd-dhcp.la \
libsystemd-shared.la
nodist_systemunit_DATA += \
libsystemd-shared.la
nodist_systemunit_DATA += \
@@
-4041,6
+4083,7
@@
test_network_LDADD = \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-rtnl.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-rtnl.la \
+ libsystemd-dhcp.la \
libsystemd-shared.la
tests += \
libsystemd-shared.la
tests += \
@@
-4584,11
+4627,11
@@
src/%: src/%.m4
$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
units/%: units/%.m4
$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
units/%: units/%.m4
- $(AM_V_
M4
)$(MKDIR_P) $(dir $@)
+ $(AM_V_
at
)$(MKDIR_P) $(dir $@)
$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
units/user/%: units/%.m4
$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
units/user/%: units/%.m4
- $(AM_V_
M4
)$(MKDIR_P) $(dir $@)
+ $(AM_V_
at
)$(MKDIR_P) $(dir $@)
$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
if ENABLE_POLKIT
$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
if ENABLE_POLKIT
@@
-4860,8
+4903,11
@@
install-tree: all
# exclude the one perl script we have in there
valgrind-tests: $(TESTS)
$(AM_V_GEN)for f in $(filter-out %.pl, $^); do \
# exclude the one perl script we have in there
valgrind-tests: $(TESTS)
$(AM_V_GEN)for f in $(filter-out %.pl, $^); do \
- echo "Running $$f"; \
- libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=4194400 --error-exitcode=55 $(builddir)/$$f ; \
+ if file $$f | grep -q shell; then \
+ echo -e "$${x}Skipping non-binary $$f"; else \
+ echo -e "$${x}Running $$f"; \
+ libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=4194400 --error-exitcode=55 $(builddir)/$$f ; fi; \
+ x="\n\n"; \
done
exported-%: %
done
exported-%: %
@@
-4985,4
+5031,4
@@
tests += \
test-libudev-sym
cppcheck:
test-libudev-sym
cppcheck:
- cppcheck --enable=all $(top_srcdir)
+ cppcheck --enable=all
-q
$(top_srcdir)