]> git.ipfire.org Git - thirdparty/systemd.git/blobdiff - Makefile.am
Merge branch 'hostnamectl-dot-v2'
[thirdparty/systemd.git] / Makefile.am
index a8d4d372d3832043fcdd69ee19ccdd05b174d285..a8dece23b1454c7e11c247f7011eceef9f4c594d 100644 (file)
@@ -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)
@@ -639,7 +638,6 @@ UNINSTALL_DATA_HOOKS += units-uninstall-hook
 
 dist_doc_DATA = \
        README \
-       README.md \
        NEWS \
        CODING_STYLE \
        LICENSE.LGPL2.1 \
@@ -647,7 +645,10 @@ dist_doc_DATA = \
        DISTRO_PORTING \
        src/libsystemd/sd-bus/PORTING-DBUS1 \
        src/libsystemd/sd-bus/DIFFERENCES \
-       src/libsystemd/sd-bus/GVARIANT-SERIALIZATION \
+       src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
+
+EXTRA_DIST += \
+       README.md \
        autogen.sh \
        .dir-locals.el \
        .vimrc \
@@ -789,6 +790,8 @@ libbasic_la_SOURCES = \
        src/basic/siphash24.h \
        src/basic/set.h \
        src/basic/ordered-set.h \
+       src/basic/bitmap.c \
+       src/basic/bitmap.h \
        src/basic/fdset.c \
        src/basic/fdset.h \
        src/basic/prioq.c \
@@ -1389,6 +1392,7 @@ tests += \
        test-utf8 \
        test-ellipsize \
        test-util \
+       test-hostname-util \
        test-process-util \
        test-terminal-util \
        test-path-lookup \
@@ -1410,6 +1414,7 @@ tests += \
        test-time \
        test-hashmap \
        test-set \
+       test-bitmap \
        test-list \
        test-unaligned \
        test-tables \
@@ -1433,6 +1438,8 @@ tests += \
        test-cap-list \
        test-sigbus \
        test-verbs \
+       test-af-list \
+       test-arphrd-list \
        test-dns-domain
 
 EXTRA_DIST += \
@@ -1666,6 +1673,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
 
@@ -1766,6 +1779,12 @@ test_set_SOURCES = \
 test_set_LDADD = \
        libshared.la
 
+test_bitmap_SOURCES = \
+       src/test/test-bitmap.c
+
+test_bitmap_LDADD = \
+       libshared.la
+
 test_xml_SOURCES = \
        src/test/test-xml.c
 
@@ -2037,6 +2056,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
@@ -2416,16 +2447,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
@@ -2519,13 +2540,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)
@@ -2558,6 +2581,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
@@ -2565,6 +2589,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 \
@@ -2985,6 +3010,7 @@ tests += \
        test-bus-cleanup \
        test-bus-server \
        test-bus-match \
+       test-bus-proxy \
        test-bus-kernel \
        test-bus-kernel-bloom \
        test-bus-zero-copy \
@@ -3077,6 +3103,12 @@ test_bus_match_SOURCES = \
 test_bus_match_LDADD = \
        libshared.la
 
+test_bus_proxy_SOURCES = \
+       src/libsystemd/sd-bus/test-bus-proxy.c
+
+test_bus_proxy_LDADD = \
+       libshared.la
+
 test_bus_kernel_SOURCES = \
        src/libsystemd/sd-bus/test-bus-kernel.c
 
@@ -3289,145 +3321,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
@@ -5100,6 +4993,8 @@ systemd_resolved_SOURCES = \
        src/resolve/resolved-bus.h \
        src/resolve/resolved-link.h \
        src/resolve/resolved-link.c \
+       src/resolve/resolved-llmnr.h \
+       src/resolve/resolved-llmnr.c \
        src/resolve/resolved-def.h \
        src/resolve/resolved-dns-rr.h \
        src/resolve/resolved-dns-rr.c \
@@ -6135,18 +6030,21 @@ hwdb-update:
                http://standards.ieee.org/develop/regauth/iab/iab.txt && \
        ./ids-update.pl )
 
+.PHONY: built-sources
+built-sources: $(BUILT_SOURCES)
+
 .PHONY: git-tag
 git-tag:
        git tag -s "v$(VERSION)" -m "systemd $(VERSION)"
 
 .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