unit: turn display-manager.target into a service

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6d860ec95cf52a92638c429ddfb10624530271f6..f1f9da7a0bb6e5fdf428a2522c09fb72c88d92c9 100644 (file)
--- 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 \
@@ -89,8 +105,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 = \
@@ -132,6 +153,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 +190,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 +199,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 +207,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 \
@@ -411,6 +445,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 +504,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 )