X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=bd2523923ee03817410525d50babe8f293d8ced6;hp=6d860ec95cf52a92638c429ddfb10624530271f6;hb=a1b256b0b562481404bda8304e04dee7d7d5e7c9;hpb=0d26c91071adb33a3c25f075dcbacb85e1469d53 diff --git a/Makefile.am b/Makefile.am index 6d860ec95..bd2523923 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,6 +23,7 @@ udevrulesdir=@udevrulesdir@ pkgsysconfdir=$(sysconfdir)/systemd systemunitdir=$(pkgdatadir)/system sessionunitdir=$(pkgdatadir)/session +interfacedir=$(datadir)/dbus-1/interfaces AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ @@ -64,6 +65,21 @@ dist_dbuspolicy_DATA = \ dist_udevrules_DATA = \ src/99-systemd.rules +interface_DATA = \ + org.freedesktop.systemd1.Manager.xml \ + org.freedesktop.systemd1.Job.xml \ + org.freedesktop.systemd1.Unit.xml \ + org.freedesktop.systemd1.Service.xml \ + org.freedesktop.systemd1.Socket.xml \ + org.freedesktop.systemd1.Timer.xml \ + org.freedesktop.systemd1.Target.xml \ + org.freedesktop.systemd1.Device.xml \ + org.freedesktop.systemd1.Mount.xml \ + org.freedesktop.systemd1.Automount.xml \ + org.freedesktop.systemd1.Snapshot.xml \ + org.freedesktop.systemd1.Swap.xml \ + org.freedesktop.systemd1.Path.xml + dist_systemunit_DATA = \ units/emergency.service \ units/getty.target \ @@ -71,6 +87,7 @@ dist_systemunit_DATA = \ units/local-fs.target \ units/network.target \ units/nss-lookup.target \ + units/mail-transfer-agent.target \ units/poweroff.target \ units/reboot.target \ units/remote-fs.target \ @@ -89,8 +106,13 @@ dist_systemunit_DATA = \ units/dev-mqueue.mount \ units/proc-sys-fs-binfmt_misc.automount \ units/proc-sys-fs-binfmt_misc.mount \ + units/sys-fs-fuse-connections.automount \ + units/sys-fs-fuse-connections.mount \ units/sys-kernel-debug.automount \ units/sys-kernel-debug.mount \ + units/sys-kernel-security.automount \ + units/sys-kernel-security.mount \ + units/var-lock.mount \ units/var-run.mount systemunit_DATA = \ @@ -106,7 +128,8 @@ dist_sessionunit_DATA = \ units/session/default.target sessionunit_DATA = \ - units/session/remote-fs.target + units/session/remote-fs.target \ + units/session/exit.service EXTRA_DIST = \ units/basic.target.m4 \ @@ -117,6 +140,7 @@ EXTRA_DIST = \ units/systemd-initctl.service.in \ units/systemd-logger.service.in \ units/syslog.target.in \ + units/session/exit.service.in \ LICENSE \ README \ DISTRO_PORTING @@ -132,6 +156,15 @@ dist_systemunit_DATA += \ units/fedora/sysinit.service endif +if TARGET_GENTOO +dist_systemunit_DATA += \ + units/gentoo/halt.service \ + units/gentoo/killall.service \ + units/gentoo/poweroff.service \ + units/gentoo/reboot.service \ + units/gentoo/xdm.service +endif + # This is needed because automake is buggy in how it generates the # rules for C programs, but not Vala programs. We therefore can't # list the .h files as dependencies if we want make dist to work. @@ -160,6 +193,7 @@ COMMON_SOURCES = \ src/snapshot.c \ src/socket.c \ src/timer.c \ + src/path.c \ src/load-dropin.c \ src/execute.c \ src/dbus.c \ @@ -168,6 +202,7 @@ COMMON_SOURCES = \ src/dbus-job.c \ src/dbus-service.c \ src/dbus-socket.c \ + src/dbus-timer.c \ src/dbus-target.c \ src/dbus-mount.c \ src/dbus-automount.c \ @@ -175,10 +210,12 @@ COMMON_SOURCES = \ src/dbus-snapshot.c \ src/dbus-device.c \ src/dbus-execute.c \ + src/dbus-path.c \ src/cgroup.c \ src/mount-setup.c \ src/hostname-setup.c \ src/loopback-setup.c \ + src/kmod-setup.c \ src/utmp-wtmp.c \ src/specifier.c \ src/unit-name.c \ @@ -324,6 +361,8 @@ SED_PROCESS = \ $(SED) -e 's,@libexecdir\@,$(libexecdir),g' \ -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \ -e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \ + -e 's,@SPECIAL_DBUS_SERVICE\@,$(SPECIAL_DBUS_SERVICE),g' \ + -e 's,@SYSTEMCTL\@,$(bindir)/systemctl,g' \ < $< > $@ units/%: units/%.in Makefile @@ -356,6 +395,7 @@ CLEANFILES = \ units/multi-user.target \ units/remote-fs.target \ units/session/remote-fs.target \ + units/session/exit.service \ man/systemd.special.7 \ man/systemd.special.html @@ -411,6 +451,11 @@ CLEANFILES += \ man/systemd.special.html.in endif +org.freedesktop.systemd1.%.xml: systemd + $(AM_V_GEN)./systemd --introspect=${@:.xml=} > $@ + +CLEANFILES += $(interface_DATA) + install-data-hook: $(MKDIR_P) -m 0755 \ $(DESTDIR)$(systemunitdir) \ @@ -465,15 +510,25 @@ install-data-hook: rm -f getty.target && \ $(LN_S) $(systemunitdir)/getty.target getty.target ) ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \ - rm -f dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount && \ + rm -f dev-hugepages.automount \ + dev-mqueue.automount \ + proc-sys-fs-binfmt_misc.automount \ + sys-kernel-debug.automount \ + sys-fs-fuse-connections.automount \ + sys-kernel-security.automount && \ $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \ $(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \ $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \ - $(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount ) + $(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \ + $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \ + $(LN_S) ../sys-fs-fuse-connections.automount sys-fs-fuse-connections.automount ) if TARGET_FEDORA + ( cd $(DESTDIR)$(pkgsysconfdir)/system && \ + rm -f display-manager.service && \ + $(LN_S) $(systemunitdir)/prefdm.service display-manager.service ) ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \ - rm -f prefdm.service && \ - $(LN_S) $(systemunitdir)/prefdm.service prefdm.service ) + rm -f display-manager.service && \ + $(LN_S) ../display-manager.service display-manager.service ) ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \ rm -f rc-local.service && \ $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )