]> git.ipfire.org Git - thirdparty/systemd.git/blobdiff - Makefile.am
projects / thirdparty / systemd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge pull request #1071 from phomes/master
[thirdparty/systemd.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 4bf8362640988e2bc5b8760234fe223d662b2dae..003308e58066bd5ce12d7c5aa88eb1ae6f909966 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@ LIBUDEV_REVISION=4
 LIBUDEV_AGE=6
 
 LIBSYSTEMD_CURRENT=10
-LIBSYSTEMD_REVISION=0
+LIBSYSTEMD_REVISION=2
 LIBSYSTEMD_AGE=10
 
 # The following four libraries only exist for compatibility reasons,
@@ -414,6 +414,7 @@ systemgenerator_PROGRAMS = \
        systemd-system-update-generator \
        systemd-debug-generator
 
+if ENABLE_BASH_COMPLETION
 dist_bashcompletion_DATA = \
        shell-completion/bash/busctl \
        shell-completion/bash/journalctl \
@@ -430,7 +431,9 @@ dist_bashcompletion_DATA = \
 
 nodist_bashcompletion_DATA = \
        shell-completion/bash/systemctl
+endif
 
+if ENABLE_ZSH_COMPLETION
 dist_zshcompletion_DATA = \
        shell-completion/zsh/_busctl \
        shell-completion/zsh/_journalctl \
@@ -447,6 +450,7 @@ dist_zshcompletion_DATA = \
 
 nodist_zshcompletion_DATA = \
        shell-completion/zsh/_systemctl
+endif
 
 EXTRA_DIST += \
        shell-completion/bash/systemctl.in \
@@ -1392,6 +1396,7 @@ tests += \
        test-utf8 \
        test-ellipsize \
        test-util \
+       test-hostname-util \
        test-process-util \
        test-terminal-util \
        test-path-lookup \
@@ -1437,6 +1442,8 @@ tests += \
        test-cap-list \
        test-sigbus \
        test-verbs \
+       test-af-list \
+       test-arphrd-list \
        test-dns-domain
 
 EXTRA_DIST += \
@@ -1670,6 +1677,12 @@ test_util_SOURCES = \
 test_util_LDADD = \
        libshared.la
 
+test_hostname_util_SOURCES = \
+       src/test/test-hostname-util.c
+
+test_hostname_util_LDADD = \
+       libshared.la
+
 test_process_util_SOURCES = \
        src/test/test-process-util.c
 
@@ -2047,6 +2060,18 @@ test_bus_policy_LDADD = \
        libbus-proxy-core.la \
        libshared.la
 
+test_af_list_SOURCES = \
+       src/test/test-af-list.c
+
+test_af_list_LDADD = \
+       libbasic.la
+
+test_arphrd_list_SOURCES = \
+       src/test/test-arphrd-list.c
+
+test_arphrd_list_LDADD = \
+       libbasic.la
+
 # ------------------------------------------------------------------------------
 ## .PHONY so it always rebuilds it
 .PHONY: coverage lcov-run lcov-report coverage-sync
@@ -2214,8 +2239,10 @@ SYSINIT_TARGET_WANTS += \
        systemd-tmpfiles-setup-dev.service \
        systemd-tmpfiles-setup.service
 
+if ENABLE_ZSH_COMPLETION
 dist_zshcompletion_DATA += \
        shell-completion/zsh/_systemd-tmpfiles
+endif
 
 TIMERS_TARGET_WANTS += \
        systemd-tmpfiles-clean.timer
@@ -2426,16 +2453,6 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 if ENABLE_EFI
-systemgenerator_PROGRAMS +=  \
-       systemd-efi-boot-generator
-
-systemd_efi_boot_generator_SOURCES = \
-       src/efi-boot-generator/efi-boot-generator.c
-
-systemd_efi_boot_generator_LDADD = \
-       libshared.la
-
-# ------------------------------------------------------------------------------
 if HAVE_BLKID
 bootctl_SOURCES = \
        src/boot/bootctl.c
@@ -2456,12 +2473,16 @@ bootctl_LDADD = \
 bin_PROGRAMS += \
        bootctl
 
+if ENABLE_BASH_COMPLETION
 dist_bashcompletion_DATA += \
        shell-completion/bash/bootctl
+endif
 
+if ENABLE_ZSH_COMPLETION
 dist_zshcompletion_DATA += \
        shell-completion/zsh/_bootctl
 endif
+endif
 
 # ------------------------------------------------------------------------------
 if HAVE_GNUEFI
@@ -2529,13 +2550,15 @@ systemd_boot_headers = \
        src/boot/efi/util.h \
        src/boot/efi/console.h \
        src/boot/efi/graphics.h \
-       src/boot/efi/pefile.h
+       src/boot/efi/pefile.h \
+       src/boot/efi/disk.h
 
 systemd_boot_sources = \
        src/boot/efi/util.c \
        src/boot/efi/console.c \
        src/boot/efi/graphics.c \
        src/boot/efi/pefile.c \
+       src/boot/efi/disk.c \
        src/boot/efi/boot.c
 
 EXTRA_DIST += $(systemd_boot_sources) $(systemd_boot_headers)
@@ -2568,6 +2591,7 @@ endif
 stub_headers = \
        src/boot/efi/util.h \
        src/boot/efi/pefile.h \
+       src/boot/efi/disk.h \
        src/boot/efi/graphics.h \
        src/boot/efi/splash.h \
        src/boot/efi/linux.h
@@ -2575,6 +2599,7 @@ stub_headers = \
 stub_sources = \
        src/boot/efi/util.c \
        src/boot/efi/pefile.c \
+       src/boot/efi/disk.c \
        src/boot/efi/graphics.c \
        src/boot/efi/splash.c \
        src/boot/efi/linux.c \
@@ -4239,11 +4264,15 @@ test_coredump_vacuum_SOURCES = \
 test_coredump_vacuum_LDADD = \
        libshared.la
 
+if ENABLE_BASH_COMPLETION
 dist_bashcompletion_DATA += \
        shell-completion/bash/coredumpctl
+endif
 
+if ENABLE_ZSH_COMPLETION
 dist_zshcompletion_DATA += \
        shell-completion/zsh/_coredumpctl
+endif
 
 nodist_sysctl_DATA = \
        sysctl.d/50-coredump.conf
@@ -4491,12 +4520,15 @@ hostnamectl_LDADD = \
 bin_PROGRAMS += \
        hostnamectl
 
+if ENABLE_BASH_COMPLETION
 dist_bashcompletion_DATA += \
        shell-completion/bash/hostnamectl
+endif
 
+if ENABLE_ZSH_COMPLETION
 dist_zshcompletion_DATA += \
        shell-completion/zsh/_hostnamectl
-
+endif
 endif
 
 polkitpolicy_in_files += \
@@ -4562,12 +4594,15 @@ localectl_LDADD = \
 bin_PROGRAMS += \
        localectl
 
+if ENABLE_BASH_COMPLETION
 dist_bashcompletion_DATA += \
        shell-completion/bash/localectl
+endif
 
+if ENABLE_ZSH_COMPLETION
 dist_zshcompletion_DATA += \
        shell-completion/zsh/_localectl
-
+endif
 endif
 
 .PHONY: update-kbd-model-map
@@ -4619,12 +4654,16 @@ timedatectl_LDADD = \
 bin_PROGRAMS += \
        timedatectl
 
+if ENABLE_BASH_COMPLETION
 dist_bashcompletion_DATA += \
        shell-completion/bash/timedatectl
+endif
 
+if ENABLE_ZSH_COMPLETION
 dist_zshcompletion_DATA += \
        shell-completion/zsh/_timedatectl
 endif
+endif
 
 polkitpolicy_in_files += \
        src/timedate/org.freedesktop.timedate1.policy.in
@@ -4730,8 +4769,10 @@ machinectl_LDADD = \
 rootbin_PROGRAMS += \
        machinectl
 
+if ENABLE_BASH_COMPLETION
 dist_bashcompletion_DATA += \
        shell-completion/bash/machinectl
+endif
 
 test_machine_tables_SOURCES = \
        src/machine/test-machine-tables.c
@@ -4760,9 +4801,11 @@ dist_dbuspolicy_DATA += \
 polkitpolicy_files += \
        src/machine/org.freedesktop.machine1.policy
 
+if ENABLE_ZSH_COMPLETION
 dist_zshcompletion_DATA += \
        shell-completion/zsh/_machinectl \
        shell-completion/zsh/_sd_machines
+endif
 
 SYSTEM_UNIT_ALIASES += \
        systemd-machined.service dbus-org.freedesktop.machine1.service
@@ -5124,41 +5167,48 @@ libnetworkd_core_la_SOURCES = \
        src/libsystemd-network/network-internal.h \
        src/network/networkd.h \
        src/network/networkd-link.h \
+       src/network/networkd-link.c \
        src/network/networkd-netdev.h \
-       src/network/networkd-netdev-tunnel.h \
-       src/network/networkd-netdev-veth.h \
-       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 \
-       src/network/networkd-netdev-bridge.h \
        src/network/networkd-netdev.c \
+       src/network/networkd-netdev-tunnel.h \
        src/network/networkd-netdev-tunnel.c \
+       src/network/networkd-netdev-veth.h \
        src/network/networkd-netdev-veth.c \
+       src/network/networkd-netdev-vxlan.h \
        src/network/networkd-netdev-vxlan.c \
+       src/network/networkd-netdev-vlan.h \
        src/network/networkd-netdev-vlan.c \
+       src/network/networkd-netdev-macvlan.h \
        src/network/networkd-netdev-macvlan.c \
+       src/network/networkd-netdev-ipvlan.h \
        src/network/networkd-netdev-ipvlan.c \
+       src/network/networkd-netdev-dummy.h \
        src/network/networkd-netdev-dummy.c \
+       src/network/networkd-netdev-tuntap.h \
        src/network/networkd-netdev-tuntap.c \
+       src/network/networkd-netdev-bond.h \
        src/network/networkd-netdev-bond.c \
+       src/network/networkd-netdev-bridge.h \
        src/network/networkd-netdev-bridge.c \
-       src/network/networkd-link.c \
        src/network/networkd-link-bus.c \
        src/network/networkd-ipv4ll.c \
        src/network/networkd-dhcp4.c \
        src/network/networkd-dhcp6.c \
+       src/network/networkd-network.h \
        src/network/networkd-network.c \
        src/network/networkd-network-bus.c \
+       src/network/networkd-address.h \
        src/network/networkd-address.c \
+       src/network/networkd-route.h \
        src/network/networkd-route.c \
        src/network/networkd-manager.c \
        src/network/networkd-manager-bus.c \
+       src/network/networkd-fdb.h \
        src/network/networkd-fdb.c \
-       src/network/networkd-address-pool.c
+       src/network/networkd-address-pool.h \
+       src/network/networkd-address-pool.c \
+       src/network/networkd-util.h \
+       src/network/networkd-util.c
 
 nodist_libnetworkd_core_la_SOURCES = \
        src/network/networkd-network-gperf.c \
@@ -5322,12 +5372,16 @@ loginctl_LDADD = \
 rootbin_PROGRAMS += \
        loginctl
 
+if ENABLE_BASH_COMPLETION
 dist_bashcompletion_DATA += \
        shell-completion/bash/loginctl
+endif
 
+if ENABLE_ZSH_COMPLETION
 dist_zshcompletion_DATA += \
        shell-completion/zsh/_loginctl \
        shell-completion/zsh/_systemd-inhibit
+endif
 
 systemd_inhibit_SOURCES = \
        src/login/inhibit.c
@@ -6009,10 +6063,11 @@ dist: dist-check-python dist-check-compat-libs
 .PHONY: hwdb-update
 hwdb-update:
        ( cd $(top_srcdir)/hwdb && \
-       wget -N http://www.linux-usb.org/usb.ids \
-               http://pci-ids.ucw.cz/v2.2/pci.ids \
-               http://standards.ieee.org/develop/regauth/oui/oui.txt \
-               http://standards.ieee.org/develop/regauth/iab/iab.txt && \
+       wget -O usb.ids 'http://www.linux-usb.org/usb.ids' && \
+       wget -O pci.ids 'http://pci-ids.ucw.cz/v2.2/pci.ids' && \
+       wget -O ma-large.txt 'https://services13.ieee.org/RST/standards-ra-web/rest/assignments/download/?registry=MA-L&format=txt' && \
+       wget -O ma-medium.txt 'https://services13.ieee.org/RST/standards-ra-web/rest/assignments/download/?registry=MA-M&format=txt' && \
+       wget -O ma-small.txt 'https://services13.ieee.org/RST/standards-ra-web/rest/assignments/download/?registry=MA-S&format=txt' && \
        ./ids-update.pl )
 
 .PHONY: built-sources
@@ -6029,7 +6084,7 @@ git-tar:
 www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
 
 .PHONY: doc-sync
-doc-sync: all destdir-sphinx
+doc-sync: all
        rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
 
 .PHONY: gardel
Unnamed repository; edit this file 'description' to name the repository.