]> 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
Rename formats-util.h to format-util.h
[thirdparty/systemd.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index d5a70780a7b062629033bf306cb54fb6ee235575..37efdd86256b1d059988ca25fbf72b94d6a15346 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,12 +39,12 @@ SUBDIRS = . po
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
 LIBUDEV_CURRENT=7
-LIBUDEV_REVISION=4
+LIBUDEV_REVISION=5
 LIBUDEV_AGE=6
 
-LIBSYSTEMD_CURRENT=15
+LIBSYSTEMD_CURRENT=17
 LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=15
+LIBSYSTEMD_AGE=17
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -157,6 +157,7 @@ nodist_zshcompletion_DATA = $(nodist_zshcompletion_data)
 endif
 udevlibexec_PROGRAMS =
 gperf_gperf_sources =
+rootlib_LTLIBRARIES =
 
 in_files = $(filter %.in,$(EXTRA_DIST))
 in_in_files = $(filter %.in.in, $(in_files))
@@ -250,16 +251,6 @@ AM_CFLAGS = $(OUR_CFLAGS)
 AM_LDFLAGS = $(OUR_LDFLAGS)
 
 # ------------------------------------------------------------------------------
-define move-to-rootlibdir
-       if test "$(libdir)" != "$(rootlibdir)"; then \
-               $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
-               rm -f $(DESTDIR)$(libdir)/$$libname && \
-               $(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
-               mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
-       fi
-endef
-
 INSTALL_DIRS =
 
 SHUTDOWN_TARGET_WANTS =
@@ -384,6 +375,7 @@ bin_PROGRAMS = \
        systemd-delta \
        systemd-analyze \
        systemd-run \
+       systemd-mount \
        systemd-stdio-bridge \
        systemd-path
 
@@ -501,7 +493,6 @@ dist_systemunit_DATA = \
        units/swap.target \
        units/slices.target \
        units/system.slice \
-       units/x-.slice \
        units/systemd-initctl.socket \
        units/syslog.socket \
        units/dev-hugepages.mount \
@@ -532,7 +523,6 @@ dist_systemunit_DATA_busnames += \
 nodist_systemunit_DATA = \
        units/getty@.service \
        units/serial-getty@.service \
-       units/console-shell.service \
        units/console-getty.service \
        units/container-getty@.service \
        units/systemd-initctl.service \
@@ -573,7 +563,18 @@ endif
 dist_userunit_DATA = \
        units/user/basic.target \
        units/user/default.target \
-       units/user/exit.target
+       units/user/exit.target \
+       units/user/graphical-session.target \
+       units/user/graphical-session-pre.target \
+       units/user/bluetooth.target \
+       units/user/busnames.target \
+       units/user/paths.target \
+       units/user/printer.target \
+       units/user/shutdown.target \
+       units/user/smartcard.target \
+       units/user/sockets.target \
+       units/user/sound.target \
+       units/user/timers.target
 
 nodist_userunit_DATA = \
        units/user/systemd-exit.service
@@ -584,7 +585,6 @@ dist_systempreset_DATA = \
 EXTRA_DIST += \
        units/getty@.service.m4 \
        units/serial-getty@.service.m4 \
-       units/console-shell.service.m4.in \
        units/console-getty.service.m4.in \
        units/container-getty@.service.m4.in \
        units/rescue.service.in \
@@ -632,16 +632,9 @@ EXTRA_DIST += \
        units/rc-local.service.in \
        units/halt-local.service.in
 
-# automake is broken and can't handle files with a dash in front
-# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14728#8
-units-install-hook:
-       mv $(DESTDIR)$(systemunitdir)/x-.slice $(DESTDIR)/$(systemunitdir)/-.slice
-
-units-uninstall-hook:
-       rm -f $(DESTDIR)/$(systemunitdir)/-.slice
-
-INSTALL_DATA_HOOKS += units-install-hook
-UNINSTALL_DATA_HOOKS += units-uninstall-hook
+GENERAL_ALIASES += \
+       $(systemunitdir)/reboot.target $(pkgsysconfdir)/system/ctrl-alt-del.target \
+       $(systemunitdir)/machines.target $(pkgsysconfdir)/system/multi-user.target.wants/machines.target
 
 dist_doc_DATA = \
        README \
@@ -939,7 +932,7 @@ libbasic_la_SOURCES = \
        src/basic/copy.h \
        src/basic/alloc-util.h \
        src/basic/alloc-util.c \
-       src/basic/formats-util.h \
+       src/basic/format-util.h \
        src/basic/nss-util.h
 
 nodist_libbasic_la_SOURCES = \
@@ -1198,6 +1191,8 @@ libcore_la_SOURCES = \
        src/core/load-dropin.h \
        src/core/execute.c \
        src/core/execute.h \
+       src/core/dynamic-user.c \
+       src/core/dynamic-user.h \
        src/core/kill.c \
        src/core/kill.h \
        src/core/dbus.c \
@@ -1268,8 +1263,8 @@ libcore_la_SOURCES = \
        src/core/audit-fd.h \
        src/core/show-status.c \
        src/core/show-status.h \
-       src/core/failure-action.c \
-       src/core/failure-action.h
+       src/core/emergency-action.c \
+       src/core/emergency-action.h
 
 nodist_libcore_la_SOURCES = \
        src/core/load-fragment-gperf.c \
@@ -1563,6 +1558,11 @@ tests += \
        test-acl-util
 endif
 
+if HAVE_SECCOMP
+tests += \
+       test-seccomp
+endif
+
 EXTRA_DIST += \
        test/a.service \
        test/basic.target \
@@ -1620,15 +1620,36 @@ EXTRA_DIST += \
        test/test-execute/exec-passenvironment.service \
        test/test-execute/exec-group.service \
        test/test-execute/exec-group-nfsnobody.service \
+       test/test-execute/exec-supplementarygroups.service \
+       test/test-execute/exec-supplementarygroups-single-group.service \
+       test/test-execute/exec-supplementarygroups-single-group-user.service \
+       test/test-execute/exec-supplementarygroups-multiple-groups-default-group-user.service \
+       test/test-execute/exec-supplementarygroups-multiple-groups-withgid.service \
+       test/test-execute/exec-supplementarygroups-multiple-groups-withuid.service \
+       test/test-execute/exec-dynamicuser-fixeduser.service \
+       test/test-execute/exec-dynamicuser-fixeduser-one-supplementarygroup.service \
+       test/test-execute/exec-dynamicuser-supplementarygroups.service \
        test/test-execute/exec-ignoresigpipe-no.service \
        test/test-execute/exec-ignoresigpipe-yes.service \
        test/test-execute/exec-personality-x86-64.service \
        test/test-execute/exec-personality-x86.service \
        test/test-execute/exec-personality-s390.service \
+       test/test-execute/exec-personality-ppc64.service \
+       test/test-execute/exec-personality-ppc64le.service \
+       test/test-execute/exec-personality-aarch64.service \
        test/test-execute/exec-privatedevices-no.service \
        test/test-execute/exec-privatedevices-yes.service \
+       test/test-execute/exec-privatedevices-no-capability-mknod.service \
+       test/test-execute/exec-privatedevices-yes-capability-mknod.service \
+       test/test-execute/exec-protectkernelmodules-no-capabilities.service \
+       test/test-execute/exec-protectkernelmodules-yes-capabilities.service \
+       test/test-execute/exec-protectkernelmodules-yes-mount-propagation.service \
        test/test-execute/exec-privatetmp-no.service \
        test/test-execute/exec-privatetmp-yes.service \
+       test/test-execute/exec-readonlypaths.service \
+       test/test-execute/exec-readonlypaths-mount-propagation.service \
+       test/test-execute/exec-readwritepaths-mount-propagation.service \
+       test/test-execute/exec-inaccessiblepaths-mount-propagation.service \
        test/test-execute/exec-spec-interpolation.service \
        test/test-execute/exec-systemcallerrornumber.service \
        test/test-execute/exec-systemcallfilter-failing2.service \
@@ -2013,6 +2034,13 @@ test_acl_util_SOURCES = \
 test_acl_util_LDADD = \
        libsystemd-shared.la
 
+test_seccomp_SOURCES = \
+       src/test/test-seccomp.c
+
+test_seccomp_LDADD = \
+       libsystemd-shared.la \
+       $(SECCOMP_LIBS)
+
 test_namespace_LDADD = \
        libcore.la
 
@@ -3125,6 +3153,13 @@ systemd_run_SOURCES = \
 systemd_run_LDADD = \
        libsystemd-shared.la
 
+# ------------------------------------------------------------------------------
+systemd_mount_SOURCES = \
+       src/mount/mount-tool.c
+
+systemd_mount_LDADD = \
+       libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 systemd_stdio_bridge_SOURCES = \
        src/stdio-bridge/stdio-bridge.c
@@ -3255,15 +3290,6 @@ libsystemd_la_LIBADD = \
        libbasic.la \
        libsystemd-journal-internal.la
 
-libsystemd-install-hook:
-       libname=libsystemd.so && $(move-to-rootlibdir)
-
-libsystemd-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd.so*
-
-INSTALL_EXEC_HOOKS += libsystemd-install-hook
-UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook
-
 pkgconfiglib_DATA += \
        src/libsystemd/libsystemd.pc
 
@@ -3276,7 +3302,7 @@ pkginclude_HEADERS += \
        src/systemd/sd-id128.h \
        src/systemd/sd-daemon.h
 
-lib_LTLIBRARIES += \
+rootlib_LTLIBRARIES += \
        libsystemd.la
 
 tests += \
@@ -3295,6 +3321,7 @@ tests += \
        test-bus-error \
        test-bus-creds \
        test-bus-gvariant \
+       test-bus-track \
        test-event \
        test-netlink \
        test-local-addresses \
@@ -3338,6 +3365,16 @@ test_bus_cleanup_CFLAGS = \
 test_bus_cleanup_LDADD = \
        libsystemd-shared.la
 
+test_bus_track_SOURCES = \
+       src/libsystemd/sd-bus/test-bus-track.c
+
+test_bus_track_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SECCOMP_CFLAGS)
+
+test_bus_track_LDADD = \
+       libsystemd-shared.la
+
 test_bus_server_SOURCES = \
        src/libsystemd/sd-bus/test-bus-server.c
 
@@ -3597,7 +3634,7 @@ tests += \
 include_HEADERS += \
        src/libudev/libudev.h
 
-lib_LTLIBRARIES += \
+rootlib_LTLIBRARIES += \
        libudev.la
 
 libudev_la_SOURCES =\
@@ -3629,16 +3666,6 @@ pkgconfiglib_DATA += \
 EXTRA_DIST += \
        src/libudev/libudev.pc.in
 
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libudev-install-hook:
-       libname=libudev.so && $(move-to-rootlibdir)
-
-libudev-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libudev.so*
-
-INSTALL_EXEC_HOOKS += libudev-install-hook
-UNINSTALL_EXEC_HOOKS += libudev-uninstall-hook
-
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
        libudev-internal.la
@@ -3865,7 +3892,8 @@ TESTS += \
 
 if HAVE_PYTHON
 TESTS += \
-       test/rule-syntax-check.py
+       test/rule-syntax-check.py \
+       hwdb/parse_hwdb.py
 
 if HAVE_SYSV_COMPAT
 TESTS += \
@@ -3917,7 +3945,8 @@ EXTRA_DIST += \
        test/udev-test.pl \
        test/rule-syntax-check.py \
        test/sysv-generator-test.py \
-       test/mocks/fsck
+       test/mocks/fsck \
+       hwdb/parse_hwdb.py
 
 # ------------------------------------------------------------------------------
 ata_id_SOURCES = \
@@ -4629,9 +4658,6 @@ nodist_udevrules_DATA += \
 
 nodist_systemunit_DATA += \
        units/systemd-vconsole-setup.service
-
-SYSINIT_TARGET_WANTS += \
-       systemd-vconsole-setup.service
 endif
 
 EXTRA_DIST += \
@@ -5000,6 +5026,27 @@ test_nss_LDADD = \
 manual_tests += \
        test-nss
 
+# ------------------------------------------------------------------------------
+libnss_systemd_la_SOURCES = \
+       src/nss-systemd/nss-systemd.sym \
+       src/nss-systemd/nss-systemd.c
+
+libnss_systemd_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -module \
+       -export-dynamic \
+       -avoid-version \
+       -shared \
+       -shrext .so.2 \
+       -Wl,--version-script=$(top_srcdir)/src/nss-systemd/nss-systemd.sym
+
+libnss_systemd_la_LIBADD = \
+       libsystemd-internal.la \
+       libbasic.la
+
+rootlib_LTLIBRARIES += \
+       libnss_systemd.la
+
 # ------------------------------------------------------------------------------
 if HAVE_MYHOSTNAME
 libnss_myhostname_la_SOURCES = \
@@ -5019,7 +5066,7 @@ libnss_myhostname_la_LIBADD = \
        libsystemd-internal.la \
        libbasic.la
 
-lib_LTLIBRARIES += \
+rootlib_LTLIBRARIES += \
        libnss_myhostname.la
 endif
 
@@ -5118,7 +5165,7 @@ libnss_mymachines_la_LIBADD = \
        libsystemd-internal.la \
        libbasic.la
 
-lib_LTLIBRARIES += \
+rootlib_LTLIBRARIES += \
        libnss_mymachines.la
 
 endif
@@ -5417,7 +5464,7 @@ libnss_resolve_la_LIBADD = \
        libbasic.la \
         -ldl
 
-lib_LTLIBRARIES += \
+rootlib_LTLIBRARIES += \
        libnss_resolve.la
 
 systemd_resolve_SOURCES = \
@@ -5591,6 +5638,8 @@ libnetworkd_core_la_SOURCES = \
        src/network/networkd-netdev-bond.c \
        src/network/networkd-netdev-bridge.h \
        src/network/networkd-netdev-bridge.c \
+       src/network/networkd-netdev-vcan.h \
+       src/network/networkd-netdev-vcan.c \
        src/network/networkd-link-bus.c \
        src/network/networkd-ipv4ll.c \
        src/network/networkd-dhcp4.c \
@@ -5865,8 +5914,10 @@ pam_systemd_la_LIBADD = \
 pamlib_LTLIBRARIES = \
        pam_systemd.la
 
+if ENABLE_PAM_CONFIG
 dist_pamconf_DATA = \
        src/login/systemd-user
+endif
 
 EXTRA_DIST += \
        src/login/systemd-user.m4
@@ -5988,6 +6039,9 @@ EXTRA_DIST += \
        test/TEST-11-ISSUE-3166/test.sh \
        test/TEST-12-ISSUE-3171/Makefile \
        test/TEST-12-ISSUE-3171/test.sh \
+       test/TEST-13-NSPAWN-SMOKE/Makefile \
+       test/TEST-13-NSPAWN-SMOKE/create-busybox-container \
+       test/TEST-13-NSPAWN-SMOKE/test.sh \
        test/test-functions
 
 EXTRA_DIST += \
@@ -6265,19 +6319,6 @@ SYSTEM_UNIT_ALIASES += \
        reboot.target ctrl-alt-del.target \
        getty@.service autovt@.service
 
-USER_UNIT_ALIASES += \
-       $(systemunitdir)/shutdown.target shutdown.target \
-       $(systemunitdir)/sockets.target sockets.target \
-       $(systemunitdir)/timers.target timers.target \
-       $(systemunitdir)/paths.target paths.target \
-       $(systemunitdir)/bluetooth.target bluetooth.target \
-       $(systemunitdir)/printer.target printer.target \
-       $(systemunitdir)/sound.target sound.target \
-       $(systemunitdir)/smartcard.target smartcard.target
-
-USER_UNIT_ALIASES += \
-       $(systemunitdir)/busnames.target busnames.target
-
 GENERAL_ALIASES += \
        $(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
        $(systemunitdir)/getty@.service $(pkgsysconfdir)/system/getty.target.wants/getty@tty1.service \
@@ -6530,7 +6571,7 @@ print-%:
        @echo $($*)
 
 git-contrib:
-       @git shortlog -s `git describe --abbrev=0`.. | cut -c8- | awk '{ print $$0 "," }' | sort -u
+       @git shortlog -s `git describe --abbrev=0`.. | cut -c8- | sed 's/ / /g' | awk '{ print $$0 "," }' | sort -u
 
 EXTRA_DIST += \
         tools/gdb-sd_dump_hashmaps.py
Unnamed repository; edit this file 'description' to name the repository.