]> 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
hwdb: Update database of Bluetooth company identifiers
[thirdparty/systemd.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index d21982285f2b0db6c8099666dd080620b7bc0fb2..2927757b4d9b1eef85ee6009568972dd9007c774 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,9 +42,9 @@ LIBUDEV_CURRENT=7
 LIBUDEV_REVISION=4
 LIBUDEV_AGE=6
 
-LIBSYSTEMD_CURRENT=9
-LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=9
+LIBSYSTEMD_CURRENT=10
+LIBSYSTEMD_REVISION=1
+LIBSYSTEMD_AGE=10
 
 # The following four libraries only exist for compatibility reasons,
 # their version info should not be bumped anymore
@@ -237,7 +237,6 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/libsystemd/sd-hwdb \
        -I $(top_srcdir)/src/libsystemd/sd-device \
        -I $(top_srcdir)/src/libsystemd-network \
-       -I $(top_srcdir)/src/libsystemd-terminal \
        $(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
@@ -415,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 \
@@ -431,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 \
@@ -448,6 +450,7 @@ dist_zshcompletion_DATA = \
 
 nodist_zshcompletion_DATA = \
        shell-completion/zsh/_systemctl
+endif
 
 EXTRA_DIST += \
        shell-completion/bash/systemctl.in \
@@ -1393,6 +1396,7 @@ tests += \
        test-utf8 \
        test-ellipsize \
        test-util \
+       test-hostname-util \
        test-process-util \
        test-terminal-util \
        test-path-lookup \
@@ -1438,6 +1442,8 @@ tests += \
        test-cap-list \
        test-sigbus \
        test-verbs \
+       test-af-list \
+       test-arphrd-list \
        test-dns-domain
 
 EXTRA_DIST += \
@@ -1671,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
 
@@ -2048,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
@@ -2215,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
@@ -2427,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
@@ -2457,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
@@ -2530,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)
@@ -2569,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
@@ -2576,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 \
@@ -3307,145 +3331,6 @@ tests += \
 manual_tests += \
        test-pppoe
 
-# ------------------------------------------------------------------------------
-if ENABLE_TERMINAL
-noinst_LTLIBRARIES += \
-       libsystemd-terminal.la
-
-rootlibexec_PROGRAMS += \
-       systemd-consoled
-
-noinst_PROGRAMS += \
-       systemd-evcat \
-       systemd-modeset \
-       systemd-subterm
-
-pkgdata_DATA = \
-       src/libsystemd-terminal/unifont-glyph-array.bin
-
-nodist_userunit_DATA += \
-       units/user/systemd-consoled.service
-
-USER_DEFAULT_TARGET_WANTS += \
-       systemd-consoled.service
-
-tests += \
-       test-term-page \
-       test-term-parser \
-       test-unifont
-endif
-
-EXTRA_DIST += \
-       units/user/systemd-consoled.service.in
-
-libsystemd_terminal_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(TERMINAL_CFLAGS)
-
-libsystemd_terminal_la_SOURCES = \
-       src/libsystemd-terminal/grdev.h \
-       src/libsystemd-terminal/grdev-internal.h \
-       src/libsystemd-terminal/grdev.c \
-       src/libsystemd-terminal/grdev-drm.c \
-       src/libsystemd-terminal/idev.h \
-       src/libsystemd-terminal/idev-internal.h \
-       src/libsystemd-terminal/idev.c \
-       src/libsystemd-terminal/idev-evdev.c \
-       src/libsystemd-terminal/idev-keyboard.c \
-       src/libsystemd-terminal/sysview.h \
-       src/libsystemd-terminal/sysview-internal.h \
-       src/libsystemd-terminal/sysview.c \
-       src/libsystemd-terminal/term.h \
-       src/libsystemd-terminal/term-internal.h \
-       src/libsystemd-terminal/term-charset.c \
-       src/libsystemd-terminal/term-page.c \
-       src/libsystemd-terminal/term-parser.c \
-       src/libsystemd-terminal/term-screen.c \
-       src/libsystemd-terminal/term-wcwidth.c \
-       src/libsystemd-terminal/unifont.h \
-       src/libsystemd-terminal/unifont-def.h \
-       src/libsystemd-terminal/unifont.c
-
-libsystemd_terminal_la_LIBADD = \
-       libshared.la \
-       $(TERMINAL_LIBS)
-
-systemd_consoled_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(TERMINAL_CFLAGS)
-
-systemd_consoled_SOURCES = \
-       src/console/consoled.h \
-       src/console/consoled.c \
-       src/console/consoled-display.c \
-       src/console/consoled-manager.c \
-       src/console/consoled-session.c \
-       src/console/consoled-terminal.c \
-       src/console/consoled-workspace.c
-
-systemd_consoled_LDADD = \
-       libsystemd-terminal.la \
-       libshared.la \
-       $(TERMINAL_LIBS)
-
-systemd_evcat_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(TERMINAL_CFLAGS)
-
-systemd_evcat_SOURCES = \
-       src/libsystemd-terminal/evcat.c
-
-systemd_evcat_LDADD = \
-       libsystemd-terminal.la \
-       libshared.la \
-       $(TERMINAL_LIBS)
-
-systemd_modeset_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(TERMINAL_CFLAGS)
-
-systemd_modeset_SOURCES = \
-       src/libsystemd-terminal/modeset.c
-
-systemd_modeset_LDADD = \
-       libsystemd-terminal.la \
-       libshared.la \
-       $(TERMINAL_LIBS)
-
-systemd_subterm_SOURCES = \
-       src/libsystemd-terminal/subterm.c
-
-systemd_subterm_LDADD = \
-       libsystemd-terminal.la \
-       libshared.la
-
-test_term_page_SOURCES = \
-       src/libsystemd-terminal/test-term-page.c
-
-test_term_page_LDADD = \
-       libsystemd-terminal.la \
-       libshared.la
-
-test_term_parser_SOURCES = \
-       src/libsystemd-terminal/test-term-parser.c
-
-test_term_parser_LDADD = \
-       libsystemd-terminal.la \
-       libshared.la
-
-test_unifont_SOURCES = \
-       src/libsystemd-terminal/test-unifont.c
-
-test_unifont_LDADD = \
-       libsystemd-terminal.la \
-       libshared.la
-
-src/libsystemd-terminal/unifont-glyph-array.bin: tools/compile-unifont.py $(UNIFONT)
-       $(AM_V_GEN)$(PYTHON) $< <$(UNIFONT) >$@
-
-EXTRA_DIST += \
-       tools/compile-unifont.py
-
 # ------------------------------------------------------------------------------
 include_HEADERS += \
        src/libudev/libudev.h
@@ -4379,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
@@ -4631,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 += \
@@ -4702,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
@@ -4759,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
@@ -4870,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
@@ -4900,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
@@ -5462,12 +5365,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
@@ -6164,12 +6071,12 @@ git-tag:
 
 .PHONY: git-tar
 git-tar:
-       git archive --format=tar --prefix=systemd-$(VERSION)/ HEAD | xz > systemd-$(VERSION).tar.xz
+       git archive --format=tar --prefix=systemd-$(VERSION)/ HEAD | gzip > systemd-$(VERSION).tar.gz
 
 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.