sd-login: teach sd_pid_get_unit() proper handling of instantiated services

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0bd893f20b089f4187280899f4b9547ead3dee67..42da4fb753ca996cf70f5672b30e5dfff8e257eb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -188,7 +188,6 @@ rootlibexec_PROGRAMS = \
        systemd-shutdown \
        systemd-modules-load \
        systemd-remount-api-vfs \
-       systemd-kmsg-syslogd \
        systemd-reply-password \
        systemd-fsck \
        systemd-timestamp \
@@ -318,7 +317,6 @@ nodist_systemunit_DATA = \
        units/console-shell.service \
        units/systemd-initctl.service \
        units/systemd-shutdownd.service \
-       units/systemd-kmsg-syslogd.service \
        units/systemd-modules-load.service \
        units/systemd-remount-api-vfs.service \
        units/systemd-update-utmp-runlevel.service \
@@ -351,7 +349,6 @@ EXTRA_DIST += \
        units/rescue.service.m4 \
        units/systemd-initctl.service.in \
        units/systemd-shutdownd.service.in \
-       units/systemd-kmsg-syslogd.service.in \
        units/systemd-modules-load.service.in \
        units/systemd-remount-api-vfs.service.in \
        units/systemd-update-utmp-runlevel.service.in \
@@ -369,7 +366,7 @@ EXTRA_DIST += \
        units/fsck@.service.in \
        units/fsck-root.service.in \
        units/user@.service.in \
-       systemd.pc.in \
+       src/systemd.pc.in \
        introspect.awk \
        src/73-seat-late.rules.in \
        src/99-systemd.rules.in \
@@ -440,7 +437,7 @@ dist_doc_DATA = \
        DISTRO_PORTING
 
 pkgconfigdata_DATA = \
-       systemd.pc
+       src/systemd.pc
 
 # First passed through sed, followed by intltool
 polkitpolicy_in_in_files = \
@@ -955,14 +952,6 @@ systemd_cgroups_agent_LDADD = \
        libsystemd-basic.la \
        $(DBUS_LIBS)
 
-systemd_kmsg_syslogd_SOURCES = \
-       src/kmsg-syslogd.c \
-       src/fdset.c
-
-systemd_kmsg_syslogd_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la
-
 systemctl_SOURCES = \
        src/systemctl.c \
        src/utmp-wtmp.c \
@@ -985,6 +974,7 @@ systemctl_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la \
        libsystemd-journal.la \
+       libsystemd-id128.la \
        $(DBUS_LIBS)
 
 systemd_notify_SOURCES = \
@@ -1126,7 +1116,7 @@ lib_LTLIBRARIES += \
        libsystemd-daemon.la
 
 pkgconfiglib_DATA += \
-       libsystemd-daemon.pc
+        src/libsystemd-daemon.pc
 
 MANPAGES += \
        man/sd-daemon.7 \
@@ -1149,7 +1139,7 @@ man/sd_is_mq.3: man/sd_is_fifo.3
 man/sd_notifyf.3: man/sd_notify.3
 
 EXTRA_DIST += \
-       libsystemd-daemon.pc.in \
+       src/libsystemd-daemon.pc.in \
        src/libsystemd-daemon.sym
 
 # ------------------------------------------------------------------------------
@@ -1185,7 +1175,7 @@ lib_LTLIBRARIES += \
        libsystemd-id128.la
 
 pkgconfiglib_DATA += \
-       libsystemd-id128.pc
+       src/libsystemd-id128.pc
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-id128-install-hook:
@@ -1207,7 +1197,7 @@ UNINSTALL_EXEC_HOOKS += \
        libsystemd-id128-uninstall-hook
 
 EXTRA_DIST += \
-       libsystemd-id128.pc.in \
+       src/libsystemd-id128.pc.in \
        src/libsystemd-id128.sym
 
 # ------------------------------------------------------------------------------
@@ -1218,9 +1208,13 @@ systemd_journald_SOURCES = \
        src/journal/lookup3.c \
        src/journal/journal-rate-limit.c \
        src/sd-id128.c \
-       src/acl-util.c \
        src/cgroup-util.c
 
+if HAVE_ACL
+systemd_journald_SOURCES += \
+       src/acl-util.c
+endif
+
 nodist_systemd_journald_SOURCES = \
        src/journal/journald-gperf.c
 
@@ -1250,7 +1244,8 @@ systemd_journalctl_SOURCES = \
 
 systemd_journalctl_LDADD = \
        libsystemd-basic.la \
-       libsystemd-journal.la
+       libsystemd-journal.la \
+       libsystemd-id128.la
 
 if HAVE_XZ
 systemd_journalctl_SOURCES += \
@@ -1364,10 +1359,14 @@ pkgconfiglib_DATA += \
 
 journal-install-data-hook:
        $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(systemunitdir)/sockets.target.wants
+               $(DESTDIR)$(systemunitdir)/sockets.target.wants \
+               $(DESTDIR)$(systemunitdir)/sysinit.target.wants
        ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
                rm -f systemd-journald.socket && \
                $(LN_S) ../systemd-journald.socket )
+       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+               rm -f systemd-journald.service && \
+               $(LN_S) ../systemd-journald.service )
 
 INSTALL_DATA_HOOKS += \
        journal-install-data-hook
@@ -2233,10 +2232,9 @@ systemd-install-data-hook:
                rm -f user && \
                $(LN_S) $(pkgsysconfdir)/user user )
        ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
-               rm -f systemd-initctl.socket systemd-shutdownd.socket syslog.socket && \
+               rm -f systemd-initctl.socket systemd-shutdownd.socket && \
                $(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
-               $(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket && \
-               $(LN_S) ../syslog.socket syslog.socket )
+               $(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket )
        ( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \
                rm -f systemd-update-utmp-runlevel.service && \
                $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
@@ -2307,8 +2305,7 @@ systemd-install-data-hook:
                        systemd-modules-load.service \
                        systemd-tmpfiles-setup.service \
                        systemd-sysctl.service \
-                       systemd-ask-password-console.path \
-                       systemd-kmsg-syslogd.service && \
+                       systemd-ask-password-console.path && \
                $(LN_S) ../dev-hugepages.mount dev-hugepages.mount && \
                $(LN_S) ../dev-mqueue.mount dev-mqueue.mount && \
                $(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \
@@ -2318,8 +2315,7 @@ systemd-install-data-hook:
                $(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
                $(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) ../systemd-ask-password-console.path systemd-ask-password-console.path )
        ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
                rm -f systemd-tmpfiles-clean.timer && \
                $(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
@@ -2450,8 +2446,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-rootprefix=$$dc_install_base/$(rootprefix)
 
 upload: all distcheck
-       cp -v systemd-$(VERSION).tar.bz2 /home/lennart/git.fedora/systemd/
-       scp systemd-$(VERSION).tar.bz2 fdo:/srv/www.freedesktop.org/www/software/systemd/
+       cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
+       scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
        scp man/*.html tango:public/systemd-man/
 
 git-tag: