build-sys: split-off D-Bus requires from selinux convenience lib

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7c1b4310938a4e998df5ee6af1f8287dc1d7f02b..833f72ac5de8c1a445f9e17ba40021e763311802 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ AM_MAKEFLAGS = --no-print-directory
 SUBDIRS = . po
 
 LIBUDEV_CURRENT=1
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=1
 LIBUDEV_AGE=0
 
 LIBGUDEV_CURRENT=1
@@ -32,20 +32,20 @@ LIBGUDEV_REVISION=1
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=2
-LIBSYSTEMD_LOGIN_REVISION=1
+LIBSYSTEMD_LOGIN_REVISION=3
 LIBSYSTEMD_LOGIN_AGE=2
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=1
+LIBSYSTEMD_DAEMON_REVISION=2
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=3
+LIBSYSTEMD_ID128_REVISION=5
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=0
-LIBSYSTEMD_JOURNAL_REVISION=3
-LIBSYSTEMD_JOURNAL_AGE=0
+LIBSYSTEMD_JOURNAL_CURRENT=1
+LIBSYSTEMD_JOURNAL_REVISION=1
+LIBSYSTEMD_JOURNAL_AGE=1
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -214,7 +214,8 @@ bin_PROGRAMS = \
        systemd-cgtop \
        systemd-stdio-bridge \
        systemd-nspawn \
-       systemd-detect-virt
+       systemd-detect-virt \
+       systemd-delta
 
 dist_bin_SCRIPTS = \
        src/analyze/systemd-analyze
@@ -236,7 +237,9 @@ rootlibexec_PROGRAMS = \
        systemd-sleep
 
 systemgenerator_PROGRAMS = \
-       systemd-getty-generator
+       systemd-getty-generator \
+       systemd-fstab-generator \
+       systemd-system-update-generator
 
 dist_bashcompletion_DATA = \
        bash-completion/systemd-bash-completion.sh
@@ -304,7 +307,8 @@ dist_systemunit_DATA = \
        units/syslog.target \
        units/systemd-udev-control.socket \
        units/systemd-udev-kernel.socket \
-       units/systemd-timedated-ntp.target
+       units/systemd-timedated-ntp.target  \
+       units/system-update.target
 
 nodist_systemunit_DATA = \
        units/getty@.service \
@@ -452,6 +456,7 @@ MANPAGES = \
        man/systemd.1 \
        man/systemctl.1 \
        man/systemd-cgls.1 \
+       man/systemd-delta.1 \
        man/systemd-cgtop.1 \
        man/systemd-nspawn.1 \
        man/systemd-tmpfiles.8 \
@@ -485,7 +490,9 @@ MANPAGES = \
        man/os-release.5 \
        man/machine-info.5 \
        man/modules-load.d.5 \
+       man/systemd-modules-load.service.8 \
        man/sysctl.d.5 \
+       man/systemd-sysctl.service.8 \
        man/systemd-ask-password.1 \
        man/systemd-cat.1 \
        man/systemd-machine-id-setup.1 \
@@ -497,11 +504,15 @@ MANPAGES = \
 MANPAGES_ALIAS = \
        man/reboot.8 \
        man/poweroff.8 \
-       man/init.1
+       man/init.1 \
+       man/systemd-modules-load.8 \
+       man/systemd-sysctl.8
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
 man/init.1: man/systemd.1
+man/systemd-modules-load.8: man/systemd-modules-load.service.8
+man/systemd-sysctl.8: man/systemd-sysctl.service.8
 
 XML_FILES = \
        ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -601,13 +612,23 @@ libsystemd_dbus_la_LIBADD = \
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
-       libsystemd-label.la
+       libsystemd-units.la
 
-libsystemd_label_la_SOURCES = \
+libsystemd_units_la_SOURCES = \
        src/shared/install.c \
        src/shared/install.h \
        src/shared/path-lookup.c \
-       src/shared/path-lookup.h \
+       src/shared/path-lookup.h
+
+libsystemd_units_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-label.la
+
+libsystemd_label_la_SOURCES = \
        src/shared/cgroup-label.c \
        src/shared/socket-label.c \
        src/shared/label.c \
@@ -621,7 +642,6 @@ libsystemd_label_la_SOURCES = \
 
 libsystemd_label_la_CFLAGS = \
        $(AM_CFLAGS) \
-       $(DBUS_CFLAGS) \
        $(SELINUX_CFLAGS)
 
 libsystemd_label_la_LIBADD = \
@@ -787,7 +807,9 @@ libsystemd_core_la_SOURCES = \
        src/core/special.h \
        src/core/bus-errors.h \
        src/core/build.h \
-       src/core/sysfs-show.h
+       src/core/sysfs-show.h \
+       src/core/switch-root.h \
+       src/core/switch-root.c
 
 nodist_libsystemd_core_la_SOURCES = \
        src/core/load-fragment-gperf.c \
@@ -803,6 +825,7 @@ libsystemd_core_la_CFLAGS = \
 
 libsystemd_core_la_LIBADD = \
        libsystemd-capability.la \
+       libsystemd-units.la \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-dbus.la \
@@ -973,6 +996,7 @@ test_install_CFLAGS = \
        $(DBUS_CFLAGS)
 
 test_install_LDADD = \
+       libsystemd-units.la \
        libsystemd-label.la \
        libsystemd-shared.la
 
@@ -1114,6 +1138,13 @@ systemd_detect_virt_SOURCES = \
 systemd_detect_virt_LDADD = \
        libsystemd-shared.la
 
+# ------------------------------------------------------------------------------
+systemd_delta_SOURCES = \
+       src/delta/delta.c
+
+systemd_delta_LDADD = \
+       libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 systemd_getty_generator_SOURCES = \
        src/getty-generator/getty-generator.c
@@ -1122,6 +1153,23 @@ systemd_getty_generator_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la
 
+# ------------------------------------------------------------------------------
+systemd_fstab_generator_SOURCES = \
+       src/fstab-generator/fstab-generator.c \
+       src/core/mount-setup.c
+
+systemd_fstab_generator_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
+systemd_system_update_generator_SOURCES = \
+       src/system-update-generator/system-update-generator.c
+
+systemd_system_update_generator_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 systemd_rc_local_generator_SOURCES = \
        src/rc-local-generator/rc-local-generator.c
@@ -1160,6 +1208,7 @@ systemctl_CFLAGS = \
        $(DBUS_CFLAGS)
 
 systemctl_LDADD = \
+       libsystemd-units.la \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
@@ -1435,9 +1484,9 @@ systemd-install-hook:
        mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants
        ln -sf ../systemd-udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-control.socket
        ln -sf ../systemd-udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-kernel.socket
-       mkdir -p $(DESTDIR)$(systemunitdir)/basic.target.wants
-       ln -sf ../systemd-udev.service $(DESTDIR)$(systemunitdir)/basic.target.wants/systemd-udev.service
-       ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/basic.target.wants/systemd-udev-trigger.service
+       mkdir -p $(DESTDIR)$(systemunitdir)/sysinit.target.wants
+       ln -sf ../systemd-udev.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev.service
+       ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service
 
 INSTALL_DATA_HOOKS += systemd-install-hook
 
@@ -2052,9 +2101,13 @@ systemd_journald_LDADD = \
        libsystemd-shared.la \
        libsystemd-audit.la \
        libsystemd-daemon.la \
-       libsystemd-login.la \
        libsystemd-id128.la
 
+if ENABLE_LOGIND
+systemd_journald_LDADD += \
+       libsystemd-login.la
+endif
+
 if HAVE_ACL
 systemd_journald_LDADD += \
        libsystemd-acl.la
@@ -2232,10 +2285,14 @@ systemd_coredump_SOURCES = \
 
 systemd_coredump_LDADD = \
        libsystemd-journal.la \
-       libsystemd-login.la \
        libsystemd-label.la \
        libsystemd-shared.la
 
+if ENABLE_LOGIND
+systemd_coredump_LDADD += \
+       libsystemd-login.la
+endif
+
 rootlibexec_PROGRAMS += \
        systemd-coredump
 
@@ -2282,7 +2339,13 @@ INSTALL_DATA_HOOKS += \
        binfmt-install-data-hook
 
 MANPAGES += \
-       man/binfmt.d.5
+       man/binfmt.d.5 \
+       man/systemd-binfmt.service.8
+
+MANPAGES_ALIAS +=  \
+       man/systemd-binfmt.8
+
+man/systemd-binfmt.8: man/systemd-binfmt.service.8
 
 EXTRA_DIST += \
        units/systemd-binfmt.service.in
@@ -2348,6 +2411,7 @@ rootlibexec_PROGRAMS += \
        systemd-readahead-replay
 
 dist_systemunit_DATA += \
+       units/systemd-readahead-drop.service \
        units/systemd-readahead-done.timer
 
 nodist_systemunit_DATA += \
@@ -2626,6 +2690,8 @@ systemd_logind_SOURCES = \
        src/login/logind-dbus.c \
        src/login/logind-device.c \
        src/login/logind-device.h \
+       src/login/logind-button.c \
+       src/login/logind-button.h \
        src/login/logind-seat.c \
        src/login/logind-seat.h \
        src/login/logind-session.c \
@@ -2841,9 +2907,10 @@ rootlibexec_PROGRAMS += \
 
 dist_udevrules_DATA += \
        src/login/70-uaccess.rules \
-       src/login/71-seat.rules
+       src/login/70-power-switch.rules
 
 nodist_udevrules_DATA += \
+       src/login/71-seat.rules \
        src/login/73-seat-late.rules
 
 MANPAGES += \
@@ -2900,12 +2967,14 @@ EXTRA_DIST += \
        src/login/logind-gperf.gperf \
        src/login/libsystemd-login.pc.in \
        src/login/libsystemd-login.sym \
+       src/login/71-seat.rules.in \
        src/login/73-seat-late.rules.in \
        units/systemd-logind.service.in \
        units/systemd-user-sessions.service.in
 
 CLEANFILES += \
        src/login/logind-gperf.c \
+       src/login/71-seat.rules \
        src/login/73-seat-late.rules
 endif
 # ------------------------------------------------------------------------------