]> 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 5b1431c866cad43f564f589994ad7bd0453f55e2..8ba4e0e389d8a82a631cc0ea19c6098480ab2feb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,9 +42,9 @@ LIBUDEV_CURRENT=7
 LIBUDEV_REVISION=4
 LIBUDEV_AGE=6
 
-LIBSYSTEMD_CURRENT=11
+LIBSYSTEMD_CURRENT=12
 LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=11
+LIBSYSTEMD_AGE=12
 
 # The following four libraries only exist for compatibility reasons,
 # their version info should not be bumped anymore
@@ -397,7 +397,6 @@ rootlibexec_PROGRAMS = \
        systemd-remount-fs \
        systemd-reply-password \
        systemd-fsck \
-       systemd-machine-id-commit \
        systemd-ac-power \
        systemd-sysctl \
        systemd-sleep \
@@ -781,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 \
@@ -918,7 +919,6 @@ libbasic_la_CFLAGS = \
 libbasic_la_LIBADD = \
        $(SELINUX_LIBS) \
        $(CAP_LIBS) \
-       -ldl \
        -lrt \
        -lm
 
@@ -1228,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)
@@ -1330,7 +1330,8 @@ systemd_SOURCES = \
 
 systemd_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(SECCOMP_CFLAGS) \
+       $(MOUNT_CFLAGS)
 
 systemd_LDADD = \
        libcore.la
@@ -1394,6 +1395,7 @@ tests += \
        test-path \
        test-path-util \
        test-strxcpyx \
+       test-siphash24 \
        test-unit-name \
        test-unit-file \
        test-utf8 \
@@ -1501,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 \
@@ -1537,7 +1540,8 @@ test_engine_SOURCES = \
 
 test_engine_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(SECCOMP_CFLAGS) \
+       $(MOUNT_CFLAGS)
 
 test_engine_LDADD = \
        libcore.la
@@ -1547,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
@@ -1597,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
@@ -1607,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
@@ -1816,7 +1823,8 @@ test_tables_CPPFLAGS = \
 
 test_tables_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(SECCOMP_CFLAGS) \
+       $(MOUNT_CFLAGS)
 
 test_tables_LDADD = \
        libjournal-core.la \
@@ -1942,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) \
@@ -1985,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
@@ -1994,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
 
@@ -2021,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) \
@@ -2108,7 +2126,8 @@ systemd_analyze_SOURCES = \
 
 systemd_analyze_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(SECCOMP_CFLAGS) \
+       $(MOUNT_CFLAGS)
 
 systemd_analyze_LDADD = \
        libcore.la
@@ -2319,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
@@ -2340,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
@@ -3472,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 }' < $< > $@
@@ -3480,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
 
@@ -3509,7 +3516,6 @@ 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 += \
@@ -4459,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
@@ -4469,7 +4478,7 @@ systemd_rfkill_LDADD = \
 endif
 
 EXTRA_DIST += \
-       units/systemd-rfkill@.service.in
+       units/systemd-rfkill.service.in
 
 # ------------------------------------------------------------------------------
 if HAVE_LIBCRYPTSETUP
@@ -5134,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
@@ -5477,6 +5487,8 @@ pamlib_LTLIBRARIES = \
 dist_pamconf_DATA = \
        src/login/systemd-user
 
+EXTRA_DIST += \
+       src/login/systemd-user.m4
 endif
 
 nodist_systemunit_DATA += \
Unnamed repository; edit this file 'description' to name the repository.