chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
condition: take a timestamp and store last result of conditions
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 537050437ba86ca6eee02d13098f3fe828ea127e..f867624f1aed1f98ea6f4bb8b5870b2cc5cae635 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,6 +41,7 @@ rootsbindir=$(rootdir)/sbin
 rootlibexecdir=$(rootdir)/lib/systemd
 systemunitdir=$(rootdir)/lib/systemd/system
 systemgeneratordir=$(rootdir)/lib/systemd/system-generators
+systemshutdowndir=$(rootdir)/lib/systemd/system-shutdown
 
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
@@ -62,6 +63,7 @@ AM_CPPFLAGS = \
        -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
        -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
        -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
+       -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
        -I $(top_srcdir)/src
 
 if TARGET_GENTOO
@@ -82,6 +84,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\" \
@@ -89,13 +97,18 @@ AM_CPPFLAGS += \
 endif
 endif
 endif
+endif
 
 rootbin_PROGRAMS = \
        systemd \
        systemctl \
        systemd-notify \
        systemd-ask-password \
-       systemd-tty-ask-password-agent
+       systemd-tty-ask-password-agent \
+       systemd-tmpfiles
+
+rootsbin_PROGRAMS = \
+       systemd-machine-id-setup
 
 bin_PROGRAMS = \
        systemd-cgls
@@ -121,12 +134,12 @@ rootlibexec_PROGRAMS = \
        systemd-reply-password \
        systemd-readahead-collect \
        systemd-readahead-replay \
-       systemd-tmpfiles \
        systemd-user-sessions \
        systemd-fsck \
        systemd-quotacheck \
        systemd-timestamp \
        systemd-ac-power \
+       systemd-detect-virt \
        systemd-sysctl
 
 if HAVE_LIBCRYPTSETUP
@@ -229,6 +242,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 \
@@ -240,7 +254,6 @@ 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 = \
@@ -267,7 +280,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 \
@@ -313,7 +325,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 \
@@ -335,15 +346,30 @@ 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 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 = \
@@ -375,7 +401,8 @@ libsystemd_basic_la_SOURCES = \
        src/conf-parser.c \
        src/socket-util.c \
        src/log.c \
-       src/ratelimit.c
+       src/ratelimit.c \
+       src/exit-status.c
 
 libsystemd_basic_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -403,7 +430,6 @@ libsystemd_core_la_SOURCES = \
        src/load-dropin.c \
        src/execute.c \
        src/utmp-wtmp.c \
-       src/exit-status.c \
        src/dbus.c \
        src/dbus-manager.c \
        src/dbus-unit.c \
@@ -426,6 +452,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 \
@@ -485,6 +512,7 @@ MANPAGES = \
        man/systemctl.1 \
        man/systemadm.1 \
        man/systemd-cgls.1 \
+       man/systemd-tmpfiles.8 \
        man/systemd-notify.1 \
        man/sd_notify.3 \
        man/sd_readahead.3 \
@@ -514,6 +542,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 \
@@ -728,6 +757,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
 
@@ -780,6 +819,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
@@ -1195,12 +1243,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 && \
@@ -1258,6 +1308,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 && \
@@ -1270,6 +1321,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 && \
@@ -1289,8 +1341,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 )
@@ -1320,6 +1373,23 @@ if TARGET_FEDORA
                rm -f 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 && \
+               $(LN_S) prefdm.service display-manager.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.