]> 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 #1528 from evverx/systemd-run-syslog-pri-fac
[thirdparty/systemd.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 629ed4372ac2890c2137fe12d775775a0c81f83f..8ba4e0e389d8a82a631cc0ea19c6098480ab2feb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,9 +42,9 @@ LIBUDEV_CURRENT=7
 LIBUDEV_REVISION=4
 LIBUDEV_AGE=6
 
-LIBSYSTEMD_CURRENT=10
-LIBSYSTEMD_REVISION=1
-LIBSYSTEMD_AGE=10
+LIBSYSTEMD_CURRENT=12
+LIBSYSTEMD_REVISION=0
+LIBSYSTEMD_AGE=12
 
 # The following four libraries only exist for compatibility reasons,
 # their version info should not be bumped anymore
@@ -155,6 +155,7 @@ noinst_PROGRAMS =
 TESTS =
 endif
 udevlibexec_PROGRAMS =
+gperf_gperf_sources =
 
 in_files = $(filter %.in,$(EXTRA_DIST))
 in_in_files = $(filter %.in.in, $(in_files))
@@ -220,6 +221,7 @@ AM_CPPFLAGS = \
        -I $(top_builddir)/src/journal \
        -I $(top_srcdir)/src/timedate \
        -I $(top_srcdir)/src/timesync \
+       -I $(top_srcdir)/src/nspawn \
        -I $(top_srcdir)/src/resolve \
        -I $(top_builddir)/src/resolve \
        -I $(top_srcdir)/src/systemd \
@@ -395,7 +397,6 @@ rootlibexec_PROGRAMS = \
        systemd-remount-fs \
        systemd-reply-password \
        systemd-fsck \
-       systemd-machine-id-commit \
        systemd-ac-power \
        systemd-sysctl \
        systemd-sleep \
@@ -472,6 +473,7 @@ dist_systemunit_DATA = \
        units/getty.target \
        units/halt.target \
        units/kexec.target \
+       units/exit.target \
        units/local-fs.target \
        units/local-fs-pre.target \
        units/initrd.target \
@@ -548,6 +550,7 @@ nodist_systemunit_DATA = \
        units/systemd-poweroff.service \
        units/systemd-reboot.service \
        units/systemd-kexec.service \
+       units/systemd-exit.service \
        units/systemd-fsck@.service \
        units/systemd-fsck-root.service \
        units/systemd-machine-id-commit.service \
@@ -599,6 +602,7 @@ EXTRA_DIST += \
        units/systemd-poweroff.service.in \
        units/systemd-reboot.service.in \
        units/systemd-kexec.service.in \
+       units/systemd-exit.service.in \
        units/user/systemd-exit.service.in \
        units/systemd-fsck@.service.in \
        units/systemd-fsck-root.service.in \
@@ -776,6 +780,8 @@ libbasic_la_SOURCES = \
        src/basic/refcnt.h \
        src/basic/util.c \
        src/basic/util.h \
+       src/basic/cpu-set-util.c \
+       src/basic/cpu-set-util.h \
        src/basic/lockfile-util.c \
        src/basic/lockfile-util.h \
        src/basic/path-util.c \
@@ -863,8 +869,6 @@ libbasic_la_SOURCES = \
        src/basic/xml.h \
        src/basic/json.c \
        src/basic/json.h \
-       src/basic/ring.c \
-       src/basic/ring.h \
        src/basic/barrier.c \
        src/basic/barrier.h \
        src/basic/async.c \
@@ -915,7 +919,6 @@ libbasic_la_CFLAGS = \
 libbasic_la_LIBADD = \
        $(SELINUX_LIBS) \
        $(CAP_LIBS) \
-       -ldl \
        -lrt \
        -lm
 
@@ -952,8 +955,6 @@ libshared_la_SOURCES = \
        src/shared/ima-util.h \
        src/shared/ptyfwd.c \
        src/shared/ptyfwd.h \
-       src/shared/pty.c \
-       src/shared/pty.h \
        src/shared/base-filesystem.c \
        src/shared/base-filesystem.h \
        src/shared/uid-range.c \
@@ -1227,7 +1228,7 @@ BUILT_SOURCES += \
        $(gperf_gperf_m4_sources:-gperf.gperf.m4=-gperf-nulstr.c) \
        $(gperf_gperf_sources:-gperf.gperf=-gperf.c) \
        $(gperf_txt_sources:-list.txt=-from-name.h) \
-       $(gperf_txt_sources:-list.txt=-to-name.h)
+       $(filter-out %keyboard-keys-to-name.h,$(gperf_txt_sources:-list.txt=-to-name.h))
 
 CLEANFILES += \
        $(gperf_txt_sources:-list.txt=-from-name.gperf)
@@ -1329,7 +1330,8 @@ systemd_SOURCES = \
 
 systemd_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(SECCOMP_CFLAGS) \
+       $(MOUNT_CFLAGS)
 
 systemd_LDADD = \
        libcore.la
@@ -1369,7 +1371,9 @@ manual_tests += \
        test-watchdog \
        test-log \
        test-ipcrm \
-       test-btrfs
+       test-btrfs \
+       test-acd \
+       test-ipv4ll-manual
 
 if HAVE_LIBIPTC
 manual_tests += \
@@ -1391,6 +1395,7 @@ tests += \
        test-path \
        test-path-util \
        test-strxcpyx \
+       test-siphash24 \
        test-unit-name \
        test-unit-file \
        test-utf8 \
@@ -1400,9 +1405,7 @@ tests += \
        test-process-util \
        test-terminal-util \
        test-path-lookup \
-       test-ring \
        test-barrier \
-       test-pty \
        test-tmpfiles \
        test-namespace \
        test-date \
@@ -1500,6 +1503,7 @@ EXTRA_DIST += \
        test/exec-ignoresigpipe-yes.service \
        test/exec-personality-x86-64.service \
        test/exec-personality-x86.service \
+       test/exec-personality-s390.service \
        test/exec-privatedevices-no.service \
        test/exec-privatedevices-yes.service \
        test/exec-privatetmp-no.service \
@@ -1536,7 +1540,8 @@ test_engine_SOURCES = \
 
 test_engine_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(SECCOMP_CFLAGS) \
+       $(MOUNT_CFLAGS)
 
 test_engine_LDADD = \
        libcore.la
@@ -1546,7 +1551,8 @@ test_job_type_SOURCES = \
 
 test_job_type_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(SECCOMP_CFLAGS) \
+       $(MOUNT_CFLAGS)
 
 test_job_type_LDADD = \
        libcore.la
@@ -1596,7 +1602,8 @@ test_unit_name_SOURCES = \
 
 test_unit_name_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(SECCOMP_CFLAGS) \
+       $(MOUNT_CFLAGS)
 
 test_unit_name_LDADD = \
        libcore.la
@@ -1606,7 +1613,8 @@ test_unit_file_SOURCES = \
 
 test_unit_file_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(SECCOMP_CFLAGS) \
+       $(MOUNT_CFLAGS)
 
 test_unit_file_LDADD = \
        libcore.la
@@ -1719,24 +1727,12 @@ test_socket_util_SOURCES = \
 test_socket_util_LDADD = \
        libshared.la
 
-test_ring_SOURCES = \
-       src/test/test-ring.c
-
-test_ring_LDADD = \
-       libshared.la
-
 test_barrier_SOURCES = \
        src/test/test-barrier.c
 
 test_barrier_LDADD = \
        libshared.la
 
-test_pty_SOURCES = \
-       src/test/test-pty.c
-
-test_pty_LDADD = \
-       libcore.la
-
 test_tmpfiles_SOURCES = \
        src/test/test-tmpfiles.c
 
@@ -1827,7 +1823,8 @@ test_tables_CPPFLAGS = \
 
 test_tables_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(SECCOMP_CFLAGS) \
+       $(MOUNT_CFLAGS)
 
 test_tables_LDADD = \
        libjournal-core.la \
@@ -1953,7 +1950,8 @@ test_cgroup_mask_SOURCES = \
        src/test/test-cgroup-mask.c
 
 test_cgroup_mask_CPPFLAGS = \
-       $(AM_CPPFLAGS)
+       $(AM_CPPFLAGS) \
+       $(MOUNT_CFLAGS)
 
 test_cgroup_mask_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1996,7 +1994,8 @@ test_path_SOURCES = \
        src/test/test-path.c
 
 test_path_CFLAGS = \
-       $(AM_CFLAGS)
+       $(AM_CFLAGS) \
+       $(MOUNT_CFLAGS)
 
 test_path_LDADD = \
        libcore.la
@@ -2005,11 +2004,18 @@ test_execute_SOURCES = \
        src/test/test-execute.c
 
 test_execute_CFLAGS = \
-       $(AM_CFLAGS)
+       $(AM_CFLAGS) \
+       $(MOUNT_CFLAGS)
 
 test_execute_LDADD = \
        libcore.la
 
+test_siphash24_SOURCES = \
+       src/test/test-siphash24.c
+
+test_siphash24_LDADD = \
+       libshared.la
+
 test_strxcpyx_SOURCES = \
        src/test/test-strxcpyx.c
 
@@ -2032,7 +2038,8 @@ test_sched_prio_SOURCES = \
        src/test/test-sched-prio.c
 
 test_sched_prio_CPPFLAGS = \
-       $(AM_CPPFLAGS)
+       $(AM_CPPFLAGS) \
+       $(MOUNT_CFLAGS)
 
 test_sched_prio_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2119,7 +2126,8 @@ systemd_analyze_SOURCES = \
 
 systemd_analyze_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(SECCOMP_CFLAGS) \
+       $(MOUNT_CFLAGS)
 
 systemd_analyze_LDADD = \
        libcore.la
@@ -2330,6 +2338,9 @@ systemd_machine_id_setup_SOURCES = \
 systemd_machine_id_setup_LDADD = \
        libshared.la
 
+SYSINIT_TARGET_WANTS += \
+       systemd-machine-id-commit.service
+
 # ------------------------------------------------------------------------------
 systemd_sysctl_SOURCES = \
        src/sysctl/sysctl.c
@@ -2351,18 +2362,6 @@ systemd_fsck_SOURCES = \
 systemd_fsck_LDADD = \
        libshared.la
 
-# ------------------------------------------------------------------------------
-systemd_machine_id_commit_SOURCES = \
-       src/machine-id-commit/machine-id-commit.c \
-       src/core/machine-id-setup.c \
-       src/core/machine-id-setup.h
-
-systemd_machine_id_commit_LDADD = \
-       libshared.la
-
-SYSINIT_TARGET_WANTS += \
-       systemd-machine-id-commit.service
-
 # ------------------------------------------------------------------------------
 systemd_ac_power_SOURCES = \
        src/ac-power/ac-power.c
@@ -2776,11 +2775,31 @@ systemd_cgtop_LDADD = \
 # ------------------------------------------------------------------------------
 systemd_nspawn_SOURCES = \
        src/nspawn/nspawn.c \
+       src/nspawn/nspawn-settings.c \
+       src/nspawn/nspawn-settings.h \
+       src/nspawn/nspawn-mount.c \
+       src/nspawn/nspawn-mount.h \
+       src/nspawn/nspawn-network.c \
+       src/nspawn/nspawn-network.h \
+       src/nspawn/nspawn-expose-ports.c \
+       src/nspawn/nspawn-expose-ports.h \
+       src/nspawn/nspawn-cgroup.c \
+       src/nspawn/nspawn-cgroup.h \
+       src/nspawn/nspawn-register.c \
+       src/nspawn/nspawn-register.h \
+       src/nspawn/nspawn-setuid.c \
+       src/nspawn/nspawn-setuid.h \
        src/core/mount-setup.c \
        src/core/mount-setup.h \
        src/core/loopback-setup.c \
        src/core/loopback-setup.h
 
+nodist_systemd_nspawn_SOURCES = \
+       src/nspawn/nspawn-gperf.c
+
+gperf_gperf_sources += \
+       src/nspawn/nspawn-gperf.gperf
+
 systemd_nspawn_CFLAGS = \
        $(AM_CFLAGS) \
        $(BLKID_CFLAGS) \
@@ -3194,6 +3213,7 @@ libsystemd_network_la_SOURCES = \
        src/systemd/sd-dhcp-server.h \
        src/systemd/sd-dhcp-lease.h \
        src/systemd/sd-ipv4ll.h \
+       src/systemd/sd-ipv4acd.h \
        src/systemd/sd-icmp6-nd.h \
        src/systemd/sd-dhcp6-client.h \
        src/systemd/sd-dhcp6-lease.h \
@@ -3210,9 +3230,9 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/dhcp-lease-internal.h \
        src/libsystemd-network/sd-dhcp-lease.c \
        src/libsystemd-network/sd-ipv4ll.c \
-       src/libsystemd-network/ipv4ll-network.c \
-       src/libsystemd-network/ipv4ll-packet.c \
-       src/libsystemd-network/ipv4ll-internal.h \
+       src/libsystemd-network/sd-ipv4acd.c \
+       src/libsystemd-network/arp-util.h \
+       src/libsystemd-network/arp-util.c \
        src/libsystemd-network/sd-pppoe.c \
        src/libsystemd-network/network-internal.c \
        src/libsystemd-network/network-internal.h \
@@ -3269,13 +3289,29 @@ test_dhcp_server_LDADD = \
 
 test_ipv4ll_SOURCES = \
        src/systemd/sd-ipv4ll.h \
-       src/libsystemd-network/ipv4ll-internal.h \
+       src/libsystemd-network/arp-util.h \
        src/libsystemd-network/test-ipv4ll.c
 
 test_ipv4ll_LDADD = \
        libsystemd-network.la \
        libshared.la
 
+test_ipv4ll_manual_SOURCES = \
+       src/systemd/sd-ipv4ll.h \
+       src/libsystemd-network/test-ipv4ll-manual.c
+
+test_ipv4ll_manual_LDADD = \
+       libsystemd-network.la \
+       libshared.la
+
+test_acd_SOURCES = \
+       src/systemd/sd-ipv4acd.h \
+       src/libsystemd-network/test-acd.c
+
+test_acd_LDADD = \
+       libsystemd-network.la \
+       libshared.la
+
 test_pppoe_SOURCES = \
        src/systemd/sd-pppoe.h \
        src/libsystemd-network/test-pppoe.c
@@ -3446,7 +3482,7 @@ noinst_LTLIBRARIES += \
 
 src/udev/keyboard-keys-list.txt:
        $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
+       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@
 
 src/udev/keyboard-keys-from-name.gperf: src/udev/keyboard-keys-list.txt
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@
@@ -3454,9 +3490,6 @@ src/udev/keyboard-keys-from-name.gperf: src/udev/keyboard-keys-list.txt
 src/udev/keyboard-keys-from-name.h: src/udev/keyboard-keys-from-name.gperf
        $(AM_V_GPERF)$(GPERF) -L ANSI-C -t -N keyboard_lookup_key -H hash_key_name -p -C < $< > $@
 
-src/udev/keyboard-keys-to-name.h: src/udev/keyboard-keys-list.txt
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
-
 gperf_txt_sources += \
        src/udev/keyboard-keys-list.txt
 
@@ -3483,10 +3516,9 @@ libudev_core_la_SOURCES = \
 
 nodist_libudev_core_la_SOURCES = \
        src/udev/keyboard-keys-from-name.h \
-       src/udev/keyboard-keys-to-name.h \
        src/udev/net/link-config-gperf.c
 
-gperf_gperf_sources = \
+gperf_gperf_sources += \
        src/udev/net/link-config-gperf.gperf
 
 libudev_core_la_CFLAGS = \
@@ -4433,7 +4465,10 @@ rootlibexec_PROGRAMS += \
        systemd-rfkill
 
 nodist_systemunit_DATA += \
-       units/systemd-rfkill@.service
+       units/systemd-rfkill.service
+
+dist_systemunit_DATA += \
+       units/systemd-rfkill.socket
 
 systemd_rfkill_SOURCES = \
        src/rfkill/rfkill.c
@@ -4443,7 +4478,7 @@ systemd_rfkill_LDADD = \
 endif
 
 EXTRA_DIST += \
-       units/systemd-rfkill@.service.in
+       units/systemd-rfkill.service.in
 
 # ------------------------------------------------------------------------------
 if HAVE_LIBCRYPTSETUP
@@ -5108,7 +5143,8 @@ libnss_resolve_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/nss-resolve/nss-resolve.sym
 
 libnss_resolve_la_LIBADD = \
-       libshared.la
+       libshared.la \
+        -ldl
 
 lib_LTLIBRARIES += \
        libnss_resolve.la
@@ -5451,6 +5487,8 @@ pamlib_LTLIBRARIES = \
 dist_pamconf_DATA = \
        src/login/systemd-user
 
+EXTRA_DIST += \
+       src/login/systemd-user.m4
 endif
 
 nodist_systemunit_DATA += \
@@ -6063,10 +6101,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
@@ -6087,7 +6126,7 @@ doc-sync: all
        rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
 
 .PHONY: gardel
-gardel: upload
+gardel:
        scp man/*.html gardel:public/systemd-man/
 
 .PHONY: lennart-fedora
Unnamed repository; edit this file 'description' to name the repository.