chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
execute: socket isn't abstract anymore
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index bb6485792aea13e1b0a60eec66220d7825f66a84..130e76c452f485bf681e68518d73891d293e66ad 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,14 +106,13 @@ rootbin_PROGRAMS = \
        systemd-notify \
        systemd-ask-password \
        systemd-tty-ask-password-agent \
-       systemd-tmpfiles
-
-rootsbin_PROGRAMS = \
+       systemd-tmpfiles \
        systemd-machine-id-setup
 
 bin_PROGRAMS = \
        systemd-cgls \
-       systemd-stdio-bridge
+       systemd-stdio-bridge \
+        systemd-nspawn
 
 if HAVE_GTK
 bin_PROGRAMS += \
@@ -144,11 +143,14 @@ rootlibexec_PROGRAMS = \
        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
 
@@ -203,6 +205,8 @@ dist_tmpfiles_DATA = \
        tmpfiles.d/x11.conf
 
 dist_systemunit_DATA = \
+       units/graphical.target \
+       units/multi-user.target \
        units/emergency.service \
        units/emergency.target \
        units/sysinit.target \
@@ -227,7 +231,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 \
@@ -256,14 +259,14 @@ dist_systemunit_DATA = \
        units/systemd-tmpfiles-clean.timer \
        units/quotaon.service \
        units/systemd-ask-password-wall.path \
-       units/systemd-ask-password-console.path
+       units/systemd-ask-password-console.path \
+       units/syslog.target
 
 nodist_systemunit_DATA = \
        units/getty@.service \
        units/serial-getty@.service \
-       units/graphical.target \
+        units/console-shell.service \
        units/remote-fs.target \
-       units/multi-user.target \
        units/systemd-initctl.service \
        units/systemd-logger.service \
        units/systemd-shutdownd.service \
@@ -284,7 +287,6 @@ nodist_systemunit_DATA = \
        units/systemd-ask-password-wall.service \
        units/systemd-ask-password-console.service \
        units/systemd-sysctl.service \
-       units/syslog.target \
        units/halt.service \
        units/poweroff.service \
        units/reboot.service \
@@ -305,8 +307,7 @@ nodist_userunit_DATA = \
 EXTRA_DIST = \
        units/getty@.service.m4 \
        units/serial-getty@.service.m4 \
-       units/graphical.target.m4 \
-       units/multi-user.target.m4 \
+        units/console-shell.service.m4 \
        units/remote-fs.target.m4 \
        units/rescue.service.m4 \
        units/systemd-initctl.service.in \
@@ -329,7 +330,6 @@ EXTRA_DIST = \
        units/systemd-ask-password-wall.service.in \
        units/systemd-ask-password-console.service.in \
        units/systemd-sysctl.service.in \
-       units/syslog.target.in \
        units/halt.service.in \
        units/poweroff.service.in \
        units/reboot.service.in \
@@ -340,7 +340,7 @@ EXTRA_DIST = \
        units/quotacheck.service.in \
        systemd.pc.in \
        introspect.awk \
-        src/org.freedesktop.systemd1.policy.in
+       src/org.freedesktop.systemd1.policy.in
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \
@@ -356,6 +356,11 @@ dist_systemunit_DATA += \
        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 \
@@ -492,6 +497,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 \
@@ -515,6 +521,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 \
@@ -855,6 +862,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
@@ -983,6 +1000,17 @@ 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
 
@@ -1071,7 +1099,6 @@ SED_PROCESS = \
        $(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
                 -e 's,@rootbindir\@,$(rootbindir),g' \
                 -e 's,@bindir\@,$(bindir),g' \
-               -e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
                -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
                -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
                -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
@@ -1114,7 +1141,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 += \
@@ -1299,10 +1327,6 @@ install-data-hook:
                $(LN_S) $(systemunitdir)/getty@.service getty@tty4.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
-               rm -f quotaon.service quotacheck.service && \
-               $(LN_S) $(systemunitdir)/quotacheck.service quotacheck.service && \
-               $(LN_S) $(systemunitdir)/quotaon.service quotaon.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f remote-fs.target && \
                $(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
@@ -1380,8 +1404,9 @@ 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 && \
-               $(LN_S) prefdm.service display-manager.service )
+               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 )
@@ -1396,8 +1421,10 @@ if TARGET_MANDRIVA
                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 )
+               rm -f display-manager.service dm.service single.service && \
+               $(LN_S) prefdm.service display-manager.service && \
+               $(LN_S) prefdm.service dm.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 )
Unnamed repository; edit this file 'description' to name the repository.