journal: introduce log target 'journal' for executed processes

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e668c09dd1a79871345ebf2cfc000f664f7b00f3..0bd893f20b089f4187280899f4b9547ead3dee67 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -100,7 +100,8 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src \
        -I $(top_srcdir)/src/readahead \
        -I $(top_srcdir)/src/login \
-       -I $(top_srcdir)/src/journal
+       -I $(top_srcdir)/src/journal \
+       -I $(top_srcdir)/src/systemd
 
 if TARGET_GENTOO
 AM_CPPFLAGS += \
@@ -180,7 +181,6 @@ bin_PROGRAMS += \
 endif
 
 rootlibexec_PROGRAMS = \
-       systemd-stdout-syslog-bridge \
        systemd-cgroups-agent \
        systemd-initctl \
        systemd-update-utmp \
@@ -286,7 +286,6 @@ dist_systemunit_DATA = \
        units/sockets.target \
        units/swap.target \
        units/systemd-initctl.socket \
-       units/systemd-stdout-syslog-bridge.socket \
        units/systemd-shutdownd.socket \
        units/syslog.socket \
        units/dev-hugepages.mount \
@@ -318,7 +317,6 @@ nodist_systemunit_DATA = \
        units/serial-getty@.service \
        units/console-shell.service \
        units/systemd-initctl.service \
-       units/systemd-stdout-syslog-bridge.service \
        units/systemd-shutdownd.service \
        units/systemd-kmsg-syslogd.service \
        units/systemd-modules-load.service \
@@ -352,7 +350,6 @@ EXTRA_DIST += \
        units/console-shell.service.m4 \
        units/rescue.service.m4 \
        units/systemd-initctl.service.in \
-       units/systemd-stdout-syslog-bridge.service.in \
        units/systemd-shutdownd.service.in \
        units/systemd-kmsg-syslogd.service.in \
        units/systemd-modules-load.service.in \
@@ -568,8 +565,68 @@ libsystemd_core_la_LIBADD = \
 # list the .h files as dependencies if we want make dist to work.
 
 EXTRA_DIST += \
-       ${libsystemd_basic_la_SOURCES:.c=.h} \
-       ${libsystemd_core_la_SOURCES:.c=.h} \
+       src/util.h \
+       src/virt.h \
+       src/label.h \
+       src/hashmap.h \
+       src/set.h \
+       src/strv.h \
+       src/conf-parser.h \
+       src/socket-util.h \
+       src/log.h \
+       src/ratelimit.h \
+       src/exit-status.h \
+       src/unit.h \
+       src/job.h \
+       src/manager.h \
+       src/path-lookup.h \
+       src/load-fragment.h \
+       src/service.h \
+       src/automount.h \
+       src/mount.h \
+       src/swap.h \
+       src/device.h \
+       src/target.h \
+       src/snapshot.h \
+       src/socket.h \
+       src/timer.h \
+       src/path.h \
+       src/load-dropin.h \
+       src/execute.h \
+       src/utmp-wtmp.h \
+       src/dbus.h \
+       src/dbus-manager.h \
+       src/dbus-unit.h \
+       src/dbus-job.h \
+       src/dbus-service.h \
+       src/dbus-socket.h \
+       src/dbus-timer.h \
+       src/dbus-target.h \
+       src/dbus-mount.h \
+       src/dbus-automount.h \
+       src/dbus-swap.h \
+       src/dbus-snapshot.h \
+       src/dbus-device.h \
+       src/dbus-execute.h \
+       src/dbus-path.h \
+       src/cgroup.h \
+       src/mount-setup.h \
+       src/hostname-setup.h \
+       src/selinux-setup.h \
+       src/loopback-setup.h \
+       src/kmod-setup.h \
+       src/locale-setup.h \
+       src/machine-id-setup.h \
+       src/specifier.h \
+       src/unit-name.h \
+       src/fdset.h \
+       src/namespace.h \
+       src/tcpwrap.h \
+       src/cgroup-util.h \
+       src/condition.h \
+       src/dbus-common.h \
+       src/install.h \
+       src/cgroup-attr.h \
        src/macro.h \
        src/def.h \
        src/ioprio.h \
@@ -750,15 +807,6 @@ test_install_CFLAGS = \
 test_install_LDADD = \
        libsystemd-basic.la
 
-systemd_stdout_syslog_bridge_SOURCES = \
-       src/stdout-syslog-bridge.c \
-       src/tcpwrap.c
-
-systemd_stdout_syslog_bridge_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       $(LIBWRAP_LIBS)
-
 systemd_initctl_SOURCES = \
        src/initctl.c \
        src/dbus-common.c
@@ -1053,7 +1101,7 @@ libsystemd_daemon_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
 
 pkginclude_HEADERS += \
-       src/sd-daemon.h
+       src/systemd/sd-daemon.h
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-daemon-install-hook:
@@ -1131,7 +1179,7 @@ noinst_PROGRAMS += \
        test-id128
 
 pkginclude_HEADERS += \
-       src/sd-id128.h
+       src/systemd/sd-id128.h
 
 lib_LTLIBRARIES += \
        libsystemd-id128.la
@@ -1290,8 +1338,8 @@ noinst_PROGRAMS += \
        test-journal
 
 pkginclude_HEADERS += \
-       src/journal/sd-journal.h \
-        src/journal/sd-messages.h
+       src/systemd/sd-journal.h \
+        src/systemd/sd-messages.h
 
 lib_LTLIBRARIES += \
        libsystemd-journal.la
@@ -1451,7 +1499,7 @@ nodist_systemunit_DATA += \
        units/systemd-readahead-done.service
 
 EXTRA_DIST += \
-       src/readahead/sd-readahead.h \
+       src/systemd/sd-readahead.h \
        src/readahead/readahead-common.h \
        units/systemd-readahead-collect.service.in \
        units/systemd-readahead-replay.service.in \
@@ -1878,7 +1926,7 @@ dist_pkgsysconf_DATA += \
        src/login/systemd-logind.conf
 
 pkginclude_HEADERS += \
-       src/login/sd-login.h
+       src/systemd/sd-login.h
 
 lib_LTLIBRARIES += \
        libsystemd-login.la
@@ -2185,8 +2233,7 @@ systemd-install-data-hook:
                rm -f user && \
                $(LN_S) $(pkgsysconfdir)/user user )
        ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
-               rm -f systemd-initctl.socket systemd-stdout-syslog-bridge.socket systemd-shutdownd.socket syslog.socket && \
-               $(LN_S) ../systemd-stdout-syslog-bridge.socket systemd-stdout-syslog-bridge.socket && \
+               rm -f systemd-initctl.socket systemd-shutdownd.socket syslog.socket && \
                $(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
                $(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket && \
                $(LN_S) ../syslog.socket syslog.socket )