chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
units: on mandriva/fedora create single.service alias via symlink, not Names=
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index f508163d5b493120e9605d9008ae53989e338ab7..3120e786473006131080b085599d28dc78567dfd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,6 +58,7 @@ AM_CPPFLAGS = \
        -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
        -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
        -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
+        -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
        -DRUNTIME_DIR=\"$(localstatedir)/run\" \
        -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
        -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
@@ -84,6 +85,12 @@ AM_CPPFLAGS += \
        -DKBD_SETFONT=\"/usr/bin/setfont\" \
        -DDEFAULT_FONT=\"LatArCyrHeb-16\"
 else
+if TARGET_MANDRIVA
+AM_CPPFLAGS += \
+       -DKBD_LOADKEYS=\"/bin/loadkeys\" \
+       -DKBD_SETFONT=\"/bin/setfont\" \
+       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/bin/loadkeys\" \
        -DKBD_SETFONT=\"/bin/setfont\" \
@@ -91,6 +98,7 @@ AM_CPPFLAGS += \
 endif
 endif
 endif
+endif
 
 rootbin_PROGRAMS = \
        systemd \
@@ -98,10 +106,13 @@ rootbin_PROGRAMS = \
        systemd-notify \
        systemd-ask-password \
        systemd-tty-ask-password-agent \
-       systemd-tmpfiles
+       systemd-tmpfiles \
+       systemd-machine-id-setup
 
 bin_PROGRAMS = \
-       systemd-cgls
+       systemd-cgls \
+       systemd-stdio-bridge \
+        systemd-nspawn
 
 if HAVE_GTK
 bin_PROGRAMS += \
@@ -129,13 +140,17 @@ rootlibexec_PROGRAMS = \
        systemd-quotacheck \
        systemd-timestamp \
        systemd-ac-power \
+       systemd-detect-virt \
        systemd-sysctl
 
+systemgenerator_PROGRAMS = \
+        systemd-getty-generator
+
 if HAVE_LIBCRYPTSETUP
 rootlibexec_PROGRAMS += \
        systemd-cryptsetup
 
-systemgenerator_PROGRAMS = \
+systemgenerator_PROGRAMS += \
        systemd-cryptsetup-generator
 endif
 
@@ -214,7 +229,6 @@ dist_systemunit_DATA = \
        units/sigpwr.target \
        units/sockets.target \
        units/swap.target \
-       units/dbus.target \
        units/systemd-initctl.socket \
        units/systemd-logger.socket \
        units/systemd-shutdownd.socket \
@@ -231,6 +245,7 @@ dist_systemunit_DATA = \
        units/sys-kernel-security.mount \
        units/var-lock.mount \
        units/var-run.mount \
+       units/media.mount \
        units/hwclock-load.service \
        units/hwclock-save.service \
        units/remount-rootfs.service \
@@ -242,12 +257,12 @@ dist_systemunit_DATA = \
        units/systemd-tmpfiles-clean.timer \
        units/quotaon.service \
        units/systemd-ask-password-wall.path \
-       units/systemd-ask-password-plymouth.path \
        units/systemd-ask-password-console.path
 
 nodist_systemunit_DATA = \
        units/getty@.service \
        units/serial-getty@.service \
+        units/console-shell.service \
        units/graphical.target \
        units/remote-fs.target \
        units/multi-user.target \
@@ -269,7 +284,6 @@ nodist_systemunit_DATA = \
        units/systemd-tmpfiles-clean.service \
        units/systemd-user-sessions.service \
        units/systemd-ask-password-wall.service \
-       units/systemd-ask-password-plymouth.service \
        units/systemd-ask-password-console.service \
        units/systemd-sysctl.service \
        units/syslog.target \
@@ -293,6 +307,7 @@ nodist_userunit_DATA = \
 EXTRA_DIST = \
        units/getty@.service.m4 \
        units/serial-getty@.service.m4 \
+        units/console-shell.service.m4 \
        units/graphical.target.m4 \
        units/multi-user.target.m4 \
        units/remote-fs.target.m4 \
@@ -315,7 +330,6 @@ EXTRA_DIST = \
        units/systemd-tmpfiles-clean.service.in \
        units/systemd-user-sessions.service.in \
        units/systemd-ask-password-wall.service.in \
-       units/systemd-ask-password-plymouth.service.in \
        units/systemd-ask-password-console.service.in \
        units/systemd-sysctl.service.in \
        units/syslog.target.in \
@@ -328,7 +342,8 @@ EXTRA_DIST = \
        units/fsck-root.service.in \
        units/quotacheck.service.in \
        systemd.pc.in \
-       introspect.awk
+       introspect.awk \
+       src/org.freedesktop.systemd1.policy.in
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \
@@ -337,15 +352,35 @@ dist_systemunit_DATA += \
        units/fedora/halt-local.service
 endif
 
+if TARGET_MANDRIVA
+dist_systemunit_DATA += \
+       units/mandriva/prefdm.service \
+       units/fedora/rc-local.service \
+       units/fedora/halt-local.service
+endif
+
+if TARGET_FRUGALWARE
+dist_systemunit_DATA += \
+       units/frugalware/display-manager.service
+endif
+
 if HAVE_PLYMOUTH
 dist_systemunit_DATA += \
        units/plymouth-start.service \
        units/plymouth-read-write.service \
        units/plymouth-quit.service \
+       units/plymouth-quit-wait.service \
        units/plymouth-reboot.service \
        units/plymouth-kexec.service \
        units/plymouth-poweroff.service \
-       units/plymouth-halt.service
+       units/plymouth-halt.service \
+       units/systemd-ask-password-plymouth.path
+
+nodist_systemunit_DATA += \
+       units/systemd-ask-password-plymouth.service
+
+EXTRA_DIST += \
+       units/systemd-ask-password-plymouth.service.in
 endif
 
 dist_doc_DATA = \
@@ -360,7 +395,7 @@ dist_doc_DATA = \
 pkgconfigdata_DATA = \
        systemd.pc
 
-dist_polkitpolicy_DATA = \
+polkitpolicy_DATA = \
        src/org.freedesktop.systemd1.policy
 
 noinst_LTLIBRARIES = \
@@ -428,6 +463,7 @@ libsystemd_core_la_SOURCES = \
        src/loopback-setup.c \
        src/kmod-setup.c \
        src/locale-setup.c \
+       src/machine-id-setup.c \
        src/specifier.c \
        src/unit-name.c \
        src/fdset.c \
@@ -464,6 +500,7 @@ EXTRA_DIST += \
        ${libsystemd_core_la_SOURCES:.c=.h} \
        ${libsystemd_daemon_la_SOURCES:.c=.h} \
        src/macro.h \
+        src/def.h \
        src/ioprio.h \
        src/missing.h \
        src/list.h \
@@ -487,6 +524,7 @@ MANPAGES = \
        man/systemctl.1 \
        man/systemadm.1 \
        man/systemd-cgls.1 \
+       man/systemd-nspawn.1 \
        man/systemd-tmpfiles.8 \
        man/systemd-notify.1 \
        man/sd_notify.3 \
@@ -517,6 +555,7 @@ MANPAGES = \
        man/systemd.conf.5 \
        man/tmpfiles.d.5 \
        man/hostname.5 \
+       man/machine-id.5 \
        man/vconsole.conf.5 \
        man/locale.conf.5 \
        man/os-release.5 \
@@ -731,6 +770,16 @@ systemd_tmpfiles_CFLAGS = \
 systemd_tmpfiles_LDADD = \
        libsystemd-basic.la
 
+systemd_machine_id_setup_SOURCES = \
+       src/machine-id-setup.c \
+       src/machine-id-main.c
+
+systemd_machine_id_setup_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_machine_id_setup_LDADD = \
+       libsystemd-basic.la
+
 systemd_sysctl_SOURCES = \
        src/sysctl.c
 
@@ -783,6 +832,15 @@ systemd_ac_power_LDADD = \
        libsystemd-basic.la \
        $(UDEV_LIBS)
 
+systemd_detect_virt_SOURCES = \
+       src/detect-virt.c
+
+systemd_detect_virt_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_detect_virt_LDADD = \
+       libsystemd-basic.la
+
 systemd_cryptsetup_SOURCES = \
        src/cryptsetup.c \
        src/ask-password-api.c
@@ -807,6 +865,16 @@ systemd_cryptsetup_generator_CFLAGS = \
 systemd_cryptsetup_generator_LDADD = \
        libsystemd-basic.la
 
+systemd_getty_generator_SOURCES = \
+       src/getty-generator.c \
+       src/unit-name.c
+
+systemd_getty_generator_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_getty_generator_LDADD = \
+       libsystemd-basic.la
+
 systemd_user_sessions_SOURCES = \
        src/user-sessions.c \
        src/cgroup-util.c
@@ -935,6 +1003,23 @@ systemd_cgls_CFLAGS = \
 systemd_cgls_LDADD = \
        libsystemd-basic.la
 
+systemd_nspawn_SOURCES = \
+       src/nspawn.c \
+       src/cgroup-util.c
+
+systemd_nspawn_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_nspawn_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la
+
+systemd_stdio_bridge_SOURCES = \
+       src/bridge.c
+
+systemd_stdio_bridge_LDADD = \
+       libsystemd-basic.la
+
 systemadm_SOURCES = \
        src/systemadm.vala \
        src/systemd-interfaces.vala
@@ -1016,7 +1101,7 @@ SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
                 -e 's,@rootbindir\@,$(rootbindir),g' \
-               -e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
+                -e 's,@bindir\@,$(bindir),g' \
                -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
                -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
                -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
@@ -1037,6 +1122,9 @@ man/%: man/%.in Makefile
 %.pc: %.pc.in Makefile
        $(SED_PROCESS)
 
+src/%.policy: src/%.policy.in Makefile
+       $(SED_PROCESS)
+
 M4_PROCESS_SYSTEM = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@ || rm $@
@@ -1056,7 +1144,8 @@ CLEANFILES = \
        $(nodist_userunit_DATA) \
        $(nodist_man_MANS) \
        ${XML_IN_FILES:.xml.in=.html} \
-       $(pkgconfigdata_DATA)
+       $(pkgconfigdata_DATA) \
+       src/org.freedesktop.systemd1.policy
 
 if HAVE_VALAC
 CLEANFILES += \
@@ -1198,12 +1287,14 @@ install-data-hook:
                        fsck-root.service \
                        remount-rootfs.service \
                        var-run.mount \
-                       var-lock.mount && \
+                       var-lock.mount \
+                       media.mount && \
                $(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
                $(LN_S) ../fsck-root.service fsck-root.service && \
                $(LN_S) ../remount-rootfs.service remount-rootfs.service && \
                $(LN_S) ../var-run.mount var-run.mount && \
-               $(LN_S) ../var-lock.mount var-lock.mount )
+               $(LN_S) ../var-lock.mount var-lock.mount && \
+               $(LN_S) ../media.mount media.mount )
        ( cd $(DESTDIR)$(userunitdir) && \
                rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target sound.target && \
                $(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
@@ -1261,6 +1352,7 @@ install-data-hook:
                        systemd-tmpfiles-setup.service \
                        systemd-sysctl.service \
                        systemd-ask-password-console.path \
+                       systemd-kmsg-syslogd.service \
                        cryptsetup.target && \
                $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
                $(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
@@ -1273,6 +1365,7 @@ install-data-hook:
                $(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
                $(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \
                $(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path && \
+               $(LN_S) ../systemd-kmsg-syslogd.service && \
                $(LN_S) ../cryptsetup.target cryptsetup.target )
        ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
                rm -f systemd-tmpfiles-clean.timer && \
@@ -1292,8 +1385,9 @@ if HAVE_PLYMOUTH
                $(LN_S) ../plymouth-start.service plymouth-start.service && \
                $(LN_S) ../plymouth-read-write.service plymouth-read-write.service )
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f plymouth-quit.service  && \
-               $(LN_S) ../plymouth-quit.service plymouth-quit.service )
+               rm -f plymouth-quit.service plymouth-quit-wait.service && \
+               $(LN_S) ../plymouth-quit.service plymouth-quit.service && \
+               $(LN_S) ../plymouth-quit-wait.service plymouth-quit-wait.service )
        ( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
                rm -f plymouth-reboot.service && \
                $(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
@@ -1317,12 +1411,31 @@ if TARGET_FEDORA
                rm -f halt-local.service && \
                $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
        ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f display-manager.service single.service && \
+               $(LN_S) prefdm.service display-manager.service && \
+                $(LN_S) rescue.service single.service )
+       ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
                rm -f display-manager.service && \
-               $(LN_S) prefdm.service display-manager.service )
+               $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
+endif
+
+if TARGET_MANDRIVA
+       $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+               rm -f rc-local.service && \
+               $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
+       ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
+               rm -f halt-local.service && \
+               $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f display-manager.service single.service && \
+               $(LN_S) prefdm.service display-manager.service && \
+                $(LN_S) rescue.service single.service )
        ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
                rm -f display-manager.service && \
                $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
+
 if TARGET_DEBIAN_OR_UBUNTU
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f runlevel5.target && \
Unnamed repository; edit this file 'description' to name the repository.