chiark / gitweb /
getty: simplify things a bit
[elogind.git] / Makefile.am
index 32877233a613bf5b400494f90021aac1b28f8577..25cde406e0fe4fea5f772a782e1b8af9fee0f3f1 100644 (file)
@@ -20,7 +20,7 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = po
 
 LIBSYSTEMD_LOGIN_CURRENT=0
-LIBSYSTEMD_LOGIN_REVISION=1
+LIBSYSTEMD_LOGIN_REVISION=3
 LIBSYSTEMD_LOGIN_AGE=0
 
 LIBSYSTEMD_DAEMON_CURRENT=0
@@ -150,7 +150,7 @@ bin_PROGRAMS += \
 endif
 
 rootlibexec_PROGRAMS = \
-       systemd-logger \
+       systemd-stdout-syslog-bridge \
        systemd-cgroups-agent \
        systemd-initctl \
        systemd-update-utmp \
@@ -171,9 +171,6 @@ rootlibexec_PROGRAMS = \
        systemd-ac-power \
        systemd-detect-virt \
        systemd-sysctl \
-        systemd-hostnamed \
-        systemd-localed \
-        systemd-timedated \
         systemd-logind \
         systemd-uaccess
 
@@ -182,6 +179,21 @@ rootlibexec_PROGRAMS += \
        systemd-binfmt
 endif
 
+if ENABLE_HOSTNAMED
+rootlibexec_PROGRAMS += \
+       systemd-hostnamed
+endif
+
+if ENABLE_TIMEDATED
+rootlibexec_PROGRAMS += \
+       systemd-timedated
+endif
+
+if ENABLE_LOCALED
+rootlibexec_PROGRAMS += \
+       systemd-localed
+endif
+
 systemgenerator_PROGRAMS = \
        systemd-getty-generator
 
@@ -226,18 +238,42 @@ dist_pkgsysconf_DATA = \
 
 dist_dbuspolicy_DATA = \
        src/org.freedesktop.systemd1.conf \
-        src/org.freedesktop.hostname1.conf \
-        src/org.freedesktop.locale1.conf \
-        src/org.freedesktop.timedate1.conf \
         src/org.freedesktop.login1.conf
 
+if ENABLE_HOSTNAMED
+dist_dbuspolicy_DATA += \
+       src/org.freedesktop.hostname1.conf
+endif
+
+if ENABLE_TIMEDATED
+dist_dbuspolicy_DATA += \
+       src/org.freedesktop.timedate1.conf
+endif
+
+if ENABLE_LOCALED
+dist_dbuspolicy_DATA += \
+       src/org.freedesktop.locale1.conf
+endif
+
 dist_dbussystemservice_DATA = \
        src/org.freedesktop.systemd1.service \
-        src/org.freedesktop.hostname1.service \
-        src/org.freedesktop.locale1.service \
-        src/org.freedesktop.timedate1.service \
         src/org.freedesktop.login1.service
 
+if ENABLE_HOSTNAMED
+dist_dbussystemservice_DATA += \
+       src/org.freedesktop.hostname1.service
+endif
+
+if ENABLE_TIMEDATED
+dist_dbussystemservice_DATA += \
+       src/org.freedesktop.timedate1.service
+endif
+
+if ENABLE_LOCALED
+dist_dbussystemservice_DATA += \
+        src/org.freedesktop.locale1.service
+endif
+
 dist_udevrules_DATA = \
         src/70-uaccess.rules \
         src/71-seat.rules
@@ -259,16 +295,29 @@ dbusinterface_DATA = \
        org.freedesktop.systemd1.Automount.xml \
        org.freedesktop.systemd1.Snapshot.xml \
        org.freedesktop.systemd1.Swap.xml \
-       org.freedesktop.systemd1.Path.xml \
-        org.freedesktop.hostname1.xml \
-        org.freedesktop.locale1.xml \
-        org.freedesktop.timedate1.xml
+       org.freedesktop.systemd1.Path.xml
+
+if ENABLE_HOSTNAMED
+dbusinterface_DATA += \
+       org.freedesktop.hostname1.xml
+endif
+
+if ENABLE_TIMEDATED
+dbusinterface_DATA += \
+       org.freedesktop.timedate1.xml
+endif
+
+if ENABLE_LOCALED
+dbusinterface_DATA += \
+       org.freedesktop.locale1.xml
+endif
 
 dist_bashcompletion_DATA = \
        src/systemctl-bash-completion.sh
 
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
+       tmpfiles.d/tmp.conf \
        tmpfiles.d/x11.conf
 
 if HAVE_SYSV_COMPAT
@@ -305,7 +354,7 @@ dist_systemunit_DATA = \
        units/sockets.target \
        units/swap.target \
        units/systemd-initctl.socket \
-       units/systemd-logger.socket \
+       units/systemd-stdout-syslog-bridge.socket \
        units/systemd-shutdownd.socket \
        units/syslog.socket \
        units/dev-hugepages.automount \
@@ -346,11 +395,8 @@ nodist_systemunit_DATA = \
        units/serial-getty@.service \
        units/console-shell.service \
        units/systemd-initctl.service \
-       units/systemd-logger.service \
+       units/systemd-stdout-syslog-bridge.service \
        units/systemd-shutdownd.service \
-       units/systemd-hostnamed.service \
-       units/systemd-localed.service \
-       units/systemd-timedated.service \
        units/systemd-logind.service \
        units/systemd-kmsg-syslogd.service \
        units/systemd-modules-load.service \
@@ -384,6 +430,21 @@ nodist_systemunit_DATA += \
        units/systemd-binfmt.service
 endif
 
+if ENABLE_HOSTNAMED
+nodist_systemunit_DATA += \
+       units/systemd-hostnamed.service
+endif
+
+if ENABLE_TIMEDATED
+nodist_systemunit_DATA += \
+       units/systemd-timedated.service
+endif
+
+if ENABLE_LOCALED
+nodist_systemunit_DATA += \
+       units/systemd-localed.service
+endif
+
 dist_userunit_DATA = \
        units/user/default.target \
        units/user/exit.target
@@ -397,11 +458,8 @@ EXTRA_DIST = \
        units/console-shell.service.m4 \
        units/rescue.service.m4 \
        units/systemd-initctl.service.in \
-       units/systemd-logger.service.in \
+       units/systemd-stdout-syslog-bridge.service.in \
        units/systemd-shutdownd.service.in \
-       units/systemd-hostnamed.service.in \
-       units/systemd-localed.service.in \
-       units/systemd-timedated.service.in \
        units/systemd-logind.service.in \
        units/systemd-kmsg-syslogd.service.in \
        units/systemd-modules-load.service.in \
@@ -443,6 +501,21 @@ EXTRA_DIST += \
        units/systemd-binfmt.service.in
 endif
 
+if ENABLE_HOSTNAMED
+EXTRA_DIST += \
+       units/systemd-hostnamed.service.in
+endif
+
+if ENABLE_TIMEDATED
+EXTRA_DIST += \
+       units/systemd-timedated.service.in
+endif
+
+if ENABLE_LOCALED
+EXTRA_DIST += \
+       units/systemd-localed.service.in
+endif
+
 if TARGET_FEDORA
 dist_systemunit_DATA += \
        units/fedora/prefdm.service \
@@ -505,11 +578,23 @@ pkgconfiglib_DATA = \
 
 # Passed through intltool only
 polkitpolicy_in_files = \
-        src/org.freedesktop.hostname1.policy.in \
-        src/org.freedesktop.locale1.policy.in \
-        src/org.freedesktop.timedate1.policy.in \
         src/org.freedesktop.login1.policy.in
 
+if ENABLE_HOSTNAMED
+polkitpolicy_in_files += \
+       src/org.freedesktop.hostname1.policy.in
+endif
+
+if ENABLE_TIMEDATED
+polkitpolicy_in_files += \
+       src/org.freedesktop.timedate1.policy.in
+endif
+
+if ENABLE_LOCALED
+polkitpolicy_in_files += \
+        src/org.freedesktop.locale1.policy.in
+endif
+
 # First passed through sed, followed by intltool
 polkitpolicy_in_in_files = \
        src/org.freedesktop.systemd1.policy.in.in
@@ -599,12 +684,16 @@ libsystemd_core_la_SOURCES = \
        src/condition.c \
         src/dbus-common.c \
         src/sd-daemon.c \
-        src/install.c
+        src/install.c \
+        src/cgroup-attr.c
 
 nodist_libsystemd_core_la_SOURCES = \
         src/load-fragment-gperf.c \
         src/load-fragment-gperf-nulstr.c
 
+EXTRA_DIST += \
+        src/load-fragment-gperf.gperf.m4
+
 libsystemd_core_la_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS) \
@@ -698,6 +787,7 @@ MANPAGES = \
        man/systemd-logind.conf.5 \
        man/tmpfiles.d.5 \
        man/hostname.5 \
+        man/timezone.5 \
        man/machine-id.5 \
        man/vconsole.conf.5 \
        man/locale.conf.5 \
@@ -857,11 +947,11 @@ test_install_CFLAGS = \
 test_install_LDADD = \
        libsystemd-basic.la
 
-systemd_logger_SOURCES = \
-       src/logger.c \
+systemd_stdout_syslog_bridge_SOURCES = \
+       src/stdout-syslog-bridge.c \
        src/tcpwrap.c
 
-systemd_logger_LDADD = \
+systemd_stdout_syslog_bridge_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la \
        $(LIBWRAP_LIBS)
@@ -974,6 +1064,9 @@ systemd_logind_SOURCES = \
 nodist_systemd_logind_SOURCES = \
         src/logind-gperf.c
 
+EXTRA_DIST += \
+        src/logind-gperf.gperf
+
 systemd_logind_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS) \
@@ -1307,7 +1400,8 @@ systemd_cgls_LDADD = \
 
 systemd_nspawn_SOURCES = \
        src/nspawn.c \
-       src/cgroup-util.c
+       src/cgroup-util.c \
+        src/loopback-setup.c
 
 systemd_nspawn_CFLAGS = \
        $(AM_CFLAGS)
@@ -1528,7 +1622,11 @@ CLEANFILES = \
        $(pkgconfiglib_DATA) \
        $(nodist_polkitpolicy_DATA) \
         src/73-seat-late.rules \
-        src/99-systemd.rules
+        src/99-systemd.rules \
+        src/load-fragment-gperf.gperf \
+        src/load-fragment-gperf.c \
+        src/load-fragment-gperf-nulstr.c \
+        src/logind-gperf.c
 
 if HAVE_VALAC
 CLEANFILES += \
@@ -1669,8 +1767,8 @@ endif
                rm -f user && \
                $(LN_S) $(pkgsysconfdir)/user user )
        ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
-               rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket syslog.socket && \
-               $(LN_S) ../systemd-logger.socket systemd-logger.socket && \
+               rm -f systemd-initctl.socket systemd-stdout-syslog-bridge.socket systemd-shutdownd.socket syslog.socket && \
+               $(LN_S) ../systemd-stdout-syslog-bridge.socket systemd-stdout-syslog-bridge.socket && \
                $(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
                $(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket && \
                $(LN_S) ../syslog.socket syslog.socket )
@@ -1722,12 +1820,9 @@ endif
                $(LN_S) graphical.target runlevel5.target && \
                $(LN_S) reboot.target runlevel6.target )
        ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f default.target ctrl-alt-del.target dbus-org.freedesktop.hostname1.service dbus-org.freedesktop.locale1.service dbus-org.freedesktop.timedate1.service dbus-org.freedesktop.login1.service autovt@.service && \
+               rm -f default.target ctrl-alt-del.target dbus-org.freedesktop.login1.service autovt@.service && \
                $(LN_S) graphical.target default.target && \
                $(LN_S) reboot.target ctrl-alt-del.target && \
-                $(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service && \
-                $(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service && \
-                $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service && \
                 $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service && \
                 $(LN_S) getty@.service autovt@.service )
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
@@ -1773,6 +1868,21 @@ if ENABLE_BINFMT
                        proc-sys-fs-binfmt_misc.automount && \
                $(LN_S) ../systemd-binfmt.service systemd-binfmt.service && \
                $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount )
+endif
+if ENABLE_HOSTNAMED
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f dbus-org.freedesktop.hostname1.service && \
+               $(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service )
+endif
+if ENABLE_TIMEDATED
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f dbus-org.freedesktop.timedate1.service  && \
+                $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )
+endif
+if ENABLE_LOCALED
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f dbus-org.freedesktop.locale1.service && \
+                $(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service )
 endif
        ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
                rm -f systemd-tmpfiles-clean.timer && \