X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=7c1b4310938a4e998df5ee6af1f8287dc1d7f02b;hp=e1501aecf059f8c4ac842c8cc2c8b370a123cad9;hb=20bbd54f603994a3cc211d2795de16550882ed8d;hpb=7c8fa05c4d5d01748ff2a04edb882afb3119b7d7 diff --git a/Makefile.am b/Makefile.am index e1501aecf..7c1b43109 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,9 +23,9 @@ AM_MAKEFLAGS = --no-print-directory SUBDIRS = . po -LIBUDEV_CURRENT=13 -LIBUDEV_REVISION=3 -LIBUDEV_AGE=13 +LIBUDEV_CURRENT=1 +LIBUDEV_REVISION=0 +LIBUDEV_AGE=0 LIBGUDEV_CURRENT=1 LIBGUDEV_REVISION=1 @@ -67,6 +67,7 @@ usergeneratordir=$(pkglibexecdir)/user-generators pkgincludedir=$(includedir)/systemd systemgeneratordir=$(rootlibexecdir)/system-generators systemshutdowndir=$(rootlibexecdir)/system-shutdown +systemsleepdir=$(rootlibexecdir)/system-sleep systemunitdir=$(rootprefix)/lib/systemd/system udevlibexecdir=$(rootprefix)/lib/udev udevhomedir = $(libexecdir)/udev @@ -117,6 +118,7 @@ AM_CPPFLAGS = \ -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \ -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \ -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \ + -DSYSTEMD_SLEEP_BINARY_PATH=\"$(rootlibexecdir)/systemd-sleep\" \ -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\" \ @@ -230,7 +232,8 @@ rootlibexec_PROGRAMS = \ systemd-fsck \ systemd-timestamp \ systemd-ac-power \ - systemd-sysctl + systemd-sysctl \ + systemd-sleep systemgenerator_PROGRAMS = \ systemd-getty-generator @@ -266,6 +269,7 @@ dist_systemunit_DATA = \ units/nss-lookup.target \ units/nss-user-lookup.target \ units/mail-transfer-agent.target \ + units/hibernate.target \ units/http-daemon.target \ units/poweroff.target \ units/reboot.target \ @@ -276,7 +280,9 @@ dist_systemunit_DATA = \ units/final.target \ units/umount.target \ units/sigpwr.target \ + units/sleep.target \ units/sockets.target \ + units/suspend.target \ units/swap.target \ units/systemd-initctl.socket \ units/systemd-shutdownd.socket \ @@ -318,12 +324,14 @@ nodist_systemunit_DATA = \ units/systemd-sysctl.service \ units/halt.service \ units/emergency.service \ + units/hibernate.service \ units/poweroff.service \ units/reboot.service \ units/kexec.service \ units/fsck@.service \ units/fsck-root.service \ units/rescue.service \ + units/suspend.service \ units/user@.service \ units/systemd-udev.service \ units/systemd-udev-trigger.service \ @@ -365,6 +373,8 @@ EXTRA_DIST += \ units/systemd-udev.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service \ + units/hibernate.service.in \ + units/suspend.service.in \ introspect.awk \ man/custom-html.xsl @@ -481,7 +491,8 @@ MANPAGES = \ man/systemd-machine-id-setup.1 \ man/systemd-detect-virt.1 \ man/journald.conf.5 \ - man/journalctl.1 + man/journalctl.1 \ + man/systemd-inhibit.1 MANPAGES_ALIAS = \ man/reboot.8 \ @@ -525,6 +536,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/util.h \ src/shared/virt.c \ src/shared/virt.h \ + src/shared/path-util.c \ + src/shared/path-util.h \ src/shared/hashmap.c \ src/shared/hashmap.h \ src/shared/set.c \ @@ -546,6 +559,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/ioprio.h \ src/shared/socket-util.c \ src/shared/socket-util.h \ + src/shared/conf-files.c \ + src/shared/conf-files.h \ src/shared/cgroup-util.c \ src/shared/cgroup-util.h \ src/shared/cgroup-show.c \ @@ -561,11 +576,9 @@ libsystemd_shared_la_SOURCES = \ src/shared/specifier.c \ src/shared/specifier.h \ src/shared/spawn-polkit-agent.c \ - src/shared/spawn-polkit-agent.h - -libsystemd_shared_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) + src/shared/spawn-polkit-agent.h \ + src/shared/hwclock.c \ + src/shared/hwclock.h #------------------------------------------------------------------------------- noinst_LTLIBRARIES += \ @@ -1059,6 +1072,13 @@ systemd_sysctl_SOURCES = \ systemd_sysctl_LDADD = \ libsystemd-shared.la +# ------------------------------------------------------------------------------ +systemd_sleep_SOURCES = \ + src/sleep/sleep.c + +systemd_sleep_LDADD = \ + libsystemd-shared.la + # ------------------------------------------------------------------------------ systemd_fsck_SOURCES = \ src/fsck/fsck.c @@ -1310,7 +1330,8 @@ libudev_la_CFLAGS = \ libudev_la_LDFLAGS = \ $(AM_LDFLAGS) \ - -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) + -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \ + -Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym libudev_la_LIBADD = \ libsystemd-shared.la @@ -1319,7 +1340,8 @@ pkgconfiglib_DATA += \ src/libudev/libudev.pc EXTRA_DIST += \ - src/libudev/libudev.pc.in + src/libudev/libudev.pc.in \ + src/libudev/libudev.sym CLEANFILES += \ src/libudev/libudev.pc @@ -2666,6 +2688,20 @@ loginctl_LDADD = \ rootbin_PROGRAMS += \ loginctl +systemd_inhibit_SOURCES = \ + src/login/inhibit.c + +systemd_inhibit_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + +systemd_inhibit_LDADD = \ + libsystemd-shared.la \ + libsystemd-dbus.la + +rootbin_PROGRAMS += \ + systemd-inhibit + test_login_SOURCES = \ src/login/test-login.c @@ -3010,6 +3046,7 @@ systemd-install-data-hook: $(DESTDIR)$(prefix)/lib/sysctl.d \ $(DESTDIR)$(sysconfdir)/sysctl.d \ $(DESTDIR)$(systemshutdowndir) \ + $(DESTDIR)$(systemsleepdir) \ $(DESTDIR)$(systemgeneratordir) \ $(DESTDIR)$(usergeneratordir) $(MKDIR_P) -m 0755 \ @@ -3166,10 +3203,6 @@ if TARGET_MEEGO endif if TARGET_FEDORA - $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants - ( 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 && \ @@ -3180,10 +3213,6 @@ if TARGET_FEDORA endif if TARGET_MANDRIVA - $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants - ( 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 dm.service single.service && \ $(LN_S) prefdm.service display-manager.service && \ @@ -3201,20 +3230,12 @@ if TARGET_DEBIAN_OR_UBUNTU endif if TARGET_SUSE - $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants ( cd $(DESTDIR)$(systemunitdir) && \ rm -f local.service && \ $(LN_S) rc-local.service local.service ) - ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \ - rm -f halt-local.service && \ - $(LN_S) $(systemunitdir)/halt-local.service halt-local.service ) endif if TARGET_MAGEIA - $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants - ( 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 && \