X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=14f682755ac2a0209aade804af8b88e4626b925f;hp=20f760c5b694aeda15bac2ae242910a8eab375bd;hb=320814811417146cfa1e416f69f1101eed630c36;hpb=f299e3e430a26188106ce15abf05f3ae7e54ef59 diff --git a/Makefile.am b/Makefile.am index 20f760c5b..14f682755 100644 --- a/Makefile.am +++ b/Makefile.am @@ -148,6 +148,8 @@ check_PROGRAMS = check_DATA = tests= manual_tests = +TEST_EXTENSIONS = .py +PY_LOG_COMPILER = $(PYTHON) if ENABLE_TESTS noinst_PROGRAMS = $(manual_tests) $(tests) TESTS = $(tests) @@ -368,6 +370,7 @@ bin_PROGRAMS = \ systemd-delta \ systemd-analyze \ systemd-run \ + systemd-stdio-bridge \ systemd-path dist_bin_SCRIPTS = \ @@ -391,7 +394,6 @@ rootlibexec_PROGRAMS = \ systemd-sysctl \ systemd-sleep \ systemd-bus-proxyd \ - systemd-stdio-bridge \ systemd-socket-proxyd \ systemd-update-done @@ -900,7 +902,9 @@ libsystemd_shared_la_SOURCES = \ src/shared/verbs.h \ src/shared/sigbus.c \ src/shared/sigbus.h \ - src/shared/build.h + src/shared/build.h \ + src/shared/import-util.c \ + src/shared/import-util.h if HAVE_UTMP libsystemd_shared_la_SOURCES += \ @@ -1429,7 +1433,7 @@ EXTRA_DIST += \ test/c.service \ test/daughter.service \ test/d.service \ - test/end.service \ + test/end.service.in \ test/e.service \ test/f.service \ test/grandchild.service \ @@ -2189,6 +2193,11 @@ systemd_tmpfiles_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la +if HAVE_ACL +systemd_tmpfiles_LDADD += \ + libsystemd-acl.la +endif + rootbin_PROGRAMS += \ systemd-tmpfiles @@ -2692,6 +2701,10 @@ libsystemd_proxy_la_SOURCES = \ src/bus-proxyd/synthesize.c \ src/bus-proxyd/synthesize.h +libsystemd_proxy_la_CFLAGS = \ + $(AM_CFLAGS) \ + -pthread + libsystemd_proxy_la_LIBADD = \ libsystemd-internal.la \ libsystemd-shared.la @@ -2699,6 +2712,10 @@ libsystemd_proxy_la_LIBADD = \ systemd_bus_proxyd_SOURCES = \ src/bus-proxyd/bus-proxyd.c +systemd_bus_proxyd_CFLAGS = \ + $(AM_CFLAGS) \ + -pthread + systemd_bus_proxyd_LDADD = \ libsystemd-proxy.la \ libsystemd-internal.la \ @@ -2714,24 +2731,24 @@ systemd_stdio_bridge_LDADD = \ if ENABLE_KDBUS nodist_systemunit_DATA += \ - units/systemd-bus-proxyd@.service + units/systemd-bus-proxyd.service dist_systemunit_DATA += \ units/systemd-bus-proxyd.socket nodist_userunit_DATA += \ - units/user/systemd-bus-proxyd@.service + units/user/systemd-bus-proxyd.service dist_userunit_DATA += \ units/user/systemd-bus-proxyd.socket endif EXTRA_DIST += \ - units/systemd-bus-proxyd@.service.m4.in \ - units/user/systemd-bus-proxyd@.service.in + units/systemd-bus-proxyd.service.m4.in \ + units/user/systemd-bus-proxyd.service.in CLEANFILES += \ - units/systemd-bus-proxyd@.service.m4 + units/systemd-bus-proxyd.service.m4 if HAVE_SMACK bus-proxyd-set-cap-hook: @@ -3177,6 +3194,8 @@ libsystemd_network_la_SOURCES = \ src/libsystemd-network/dhcp6-option.c \ src/libsystemd-network/dhcp6-lease-internal.h \ src/libsystemd-network/sd-dhcp6-lease.c \ + src/libsystemd-network/dhcp-identifier.h \ + src/libsystemd-network/dhcp-identifier.c \ src/libsystemd-network/lldp.h \ src/libsystemd-network/lldp-tlv.h \ src/libsystemd-network/lldp-tlv.c \ @@ -3249,7 +3268,9 @@ test_icmp6_rs_SOURCES = \ src/systemd/sd-dhcp6-client.h \ src/systemd/sd-icmp6-nd.h \ src/libsystemd-network/dhcp6-internal.h \ - src/libsystemd-network/test-icmp6-rs.c + src/libsystemd-network/test-icmp6-rs.c \ + src/libsystemd-network/dhcp-identifier.h \ + src/libsystemd-network/dhcp-identifier.c test_icmp6_rs_LDADD = \ libsystemd-network.la \ @@ -3259,7 +3280,9 @@ test_icmp6_rs_LDADD = \ test_dhcp6_client_SOURCES = \ src/systemd/sd-dhcp6-client.h \ src/libsystemd-network/dhcp6-internal.h \ - src/libsystemd-network/test-dhcp6-client.c + src/libsystemd-network/test-dhcp6-client.c \ + src/libsystemd-network/dhcp-identifier.h \ + src/libsystemd-network/dhcp-identifier.c test_dhcp6_client_LDADD = \ libsystemd-network.la \ @@ -3303,7 +3326,7 @@ noinst_PROGRAMS += \ systemd-subterm dist_pkgdata_DATA += \ - src/libsystemd-terminal/unifont-glyph-array.bin + src/libsystemd-terminal/unifont-glyph-array.bin nodist_userunit_DATA += \ units/user/systemd-consoled.service @@ -3431,12 +3454,8 @@ test_unifont_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la -.PHONY: update-unifont -update-unifont: tools/compile-unifont.py - $(AM_V_GEN)$(PYTHON) $< \ - <$(top_srcdir)/src/libsystemd-terminal/unifont.hex \ - >$(top_srcdir)/src/libsystemd-terminal/unifont-glyph-array.bin - @echo "unifont-glyph-array.bin has been regenerated" +src/libsystemd-terminal/unifont-glyph-array.bin: tools/compile-unifont.py $(UNIFONT) + $(AM_V_GEN)$(PYTHON) $< <$(UNIFONT) >$@ # ------------------------------------------------------------------------------ if ENABLE_GTK_DOC @@ -3534,13 +3553,14 @@ dist_udevrules_DATA += \ rules/50-udev-default.rules \ rules/60-drm.rules \ rules/60-keyboard.rules \ - rules/70-mouse.rules \ rules/60-persistent-storage-tape.rules \ rules/60-persistent-serial.rules \ rules/60-persistent-input.rules \ rules/60-persistent-alsa.rules \ rules/60-persistent-storage.rules \ rules/64-btrfs.rules \ + rules/70-mouse.rules \ + rules/70-touchpad.rules \ rules/75-net-description.rules \ rules/75-tty-description.rules \ rules/78-sound-card.rules \ @@ -3732,7 +3752,8 @@ dist_udevhwdb_DATA = \ hwdb/20-OUI.hwdb \ hwdb/20-net-ifname.hwdb \ hwdb/60-keyboard.hwdb \ - hwdb/70-mouse.hwdb + hwdb/70-mouse.hwdb \ + hwdb/70-touchpad.hwdb EXTRA_DIST += \ units/systemd-hwdb-update.service.in @@ -3758,7 +3779,14 @@ endif # ------------------------------------------------------------------------------ TESTS += \ test/udev-test.pl \ - test/rules-test.sh + $(NULL) + +if HAVE_PYTHON +TESTS += \ + test/rule-syntax-check.py \ + test/sysv-generator-test.py \ + $(NULL) +endif manual_tests += \ test-libudev \ @@ -3802,8 +3830,10 @@ DISTCLEAN_LOCAL_HOOKS += test-sys-distclean EXTRA_DIST += \ test/sys.tar.xz \ test/udev-test.pl \ - test/rules-test.sh \ - test/rule-syntax-check.py + test/rule-syntax-check.py \ + test/sysv-generator-test.py \ + $(NULL) + # ------------------------------------------------------------------------------ ata_id_SOURCES = \ @@ -5228,17 +5258,45 @@ libnss_mymachines_la_LIBADD = \ lib_LTLIBRARIES += \ libnss_mymachines.la +endif + +# ------------------------------------------------------------------------------ +if ENABLE_IMPORTD + if HAVE_LIBCURL +if HAVE_XZ +if HAVE_ZLIB +if HAVE_BZIP2 +if HAVE_GCRYPT -bin_PROGRAMS += \ - systemd-import +rootlibexec_PROGRAMS += \ + systemd-importd \ + systemd-pull + +systemd_importd_SOURCES = \ + src/import/importd.c + +systemd_importd_CFLAGS = \ + $(AM_CFLAGS) \ + -D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\" + +systemd_importd_LDADD = \ + libsystemd-internal.la \ + libsystemd-label.la \ + libsystemd-shared.la -systemd_import_SOURCES = \ - src/import/import.c \ +systemd_pull_SOURCES = \ + src/import/pull.c \ src/import/import-raw.c \ src/import/import-raw.h \ + src/import/import-tar.c \ + src/import/import-tar.h \ src/import/import-dkr.c \ src/import/import-dkr.h \ + src/import/import-job.c \ + src/import/import-job.h \ + src/import/import-common.c \ + src/import/import-common.h \ src/import/curl-util.c \ src/import/curl-util.h \ src/import/aufs-util.c \ @@ -5246,23 +5304,55 @@ systemd_import_SOURCES = \ src/import/qcow2-util.c \ src/import/qcow2-util.h -systemd_import_CFLAGS = \ +systemd_pull_CFLAGS = \ $(AM_CFLAGS) \ $(LIBCURL_CFLAGS) \ $(XZ_CFLAGS) \ - $(ZLIB_CFLAGS) + $(ZLIB_CFLAGS) \ + $(GCRYPT_CFLAGS) \ + -D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \ + -D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\" -systemd_import_LDADD = \ +systemd_pull_LDADD = \ libsystemd-internal.la \ libsystemd-label.la \ libsystemd-shared.la \ $(LIBCURL_LIBS) \ $(XZ_LIBS) \ - $(ZLIB_LIBS) + $(ZLIB_LIBS) \ + -lbz2 \ + $(GCRYPT_LIBS) -endif +dist_rootlibexec_DATA = \ + src/import/import-pubring.gpg + +nodist_systemunit_DATA += \ + units/systemd-importd.service + +EXTRA_DIST += \ + units/systemd-importd.service.in + +dist_systemunit_DATA_busnames += \ + units/org.freedesktop.import1.busname + +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.import1.busname + +SYSTEM_UNIT_ALIASES += \ + systemd-importd.service dbus-org.freedesktop.import1.service + +dist_dbussystemservice_DATA += \ + src/import/org.freedesktop.import1.service + +dist_dbuspolicy_DATA += \ + src/import/org.freedesktop.import1.conf + +polkitpolicy_files += \ + src/import/org.freedesktop.import1.policy + +polkitpolicy_in_files += \ + src/import/org.freedesktop.import1.policy.in -if HAVE_ZLIB manual_tests += \ test-qcow2 @@ -5277,8 +5367,14 @@ test_qcow2_CFLAGS = \ test_qcow2_LDADD = \ libsystemd-internal.la \ + libsystemd-label.la \ libsystemd-shared.la \ $(ZLIB_LIBS) + +endif +endif +endif +endif endif endif @@ -5472,6 +5568,7 @@ libsystemd_networkd_core_la_SOURCES = \ src/network/networkd-netdev-vxlan.h \ src/network/networkd-netdev-vlan.h \ src/network/networkd-netdev-macvlan.h \ + src/network/networkd-netdev-ipvlan.h \ src/network/networkd-netdev-dummy.h \ src/network/networkd-netdev-tuntap.h \ src/network/networkd-netdev-bond.h \ @@ -5482,6 +5579,7 @@ libsystemd_networkd_core_la_SOURCES = \ src/network/networkd-netdev-vxlan.c \ src/network/networkd-netdev-vlan.c \ src/network/networkd-netdev-macvlan.c \ + src/network/networkd-netdev-ipvlan.c \ src/network/networkd-netdev-dummy.c \ src/network/networkd-netdev-tuntap.c \ src/network/networkd-netdev-bond.c \ @@ -5568,11 +5666,15 @@ tests += \ test-network \ test-network-tables +dist_systemunit_DATA += \ + units/systemd-networkd.socket + nodist_systemunit_DATA += \ units/systemd-networkd.service \ units/systemd-networkd-wait-online.service GENERAL_ALIASES += \ + $(systemunitdir)/systemd-networkd.socket $(pkgsysconfdir)/system/sockets.target.wants/systemd-networkd.socket \ $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \ $(systemunitdir)/systemd-networkd-wait-online.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service @@ -6120,6 +6222,7 @@ substitutions = \ '|rootprefix=$(rootprefix)|' \ '|udevlibexecdir=$(udevlibexecdir)|' \ '|SUSHELL=$(SUSHELL)|' \ + '|SULOGIN=$(SULOGIN)|' \ '|DEBUGTTY=$(DEBUGTTY)|' \ '|KILL=$(KILL)|' \ '|KMOD=$(KMOD)|' \ @@ -6459,7 +6562,7 @@ endif # # Require python when making dist # -.PHONY: dist-check-python +.PHONY: dist-check-python dist-check-compat-libs dist-check-help dist-check-python: if !HAVE_PYTHON @echo "*** python and python-lxml module must be installed and enabled in order to make dist" @@ -6472,6 +6575,14 @@ if !ENABLE_COMPAT_LIBS @false endif +dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS) + for i in $(abspath $^); do \ + if $$i --help | grep -v 'default:' | grep -E -q '.{80}.' ; then \ + echo "$(basename $$i) --help output is too wide:"; \ + $$i --help | awk 'length > 80' | grep -E --color=yes '.{80}'; \ + exit 1; \ + fi; done + dist: dist-check-python dist-check-compat-libs # check "broken" platforms limited toolchains for link breakage before we release @@ -6639,3 +6750,9 @@ git-contrib: EXTRA_DIST += \ tools/gdb-sd_dump_hashmaps.py + +list-keys: + gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --list-keys + +add-key: + gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --import -