X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=bd7eb5c5ddf834ca39bb867ecad2dc5571a70e7e;hp=7eea06f318c85ae0ec1fa1de08a60ca3acdf8538;hb=98736c68fe985010f58a907bcc6bfd4680c77843;hpb=8b9b4d6ce4c403c1b72b86126e0089fa5e0d3420

diff --git a/Makefile.am b/Makefile.am
index 7eea06f31..bd7eb5c5d 100644
--- 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 \
@@ -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 \
@@ -286,7 +285,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,9 +316,7 @@ 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 \
 	units/systemd-remount-api-vfs.service \
 	units/systemd-update-utmp-runlevel.service \
@@ -352,9 +348,7 @@ 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 \
 	units/systemd-remount-api-vfs.service.in \
 	units/systemd-update-utmp-runlevel.service.in \
@@ -568,8 +562,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 +804,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
@@ -907,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 \
@@ -1053,7 +1090,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 +1168,7 @@ noinst_PROGRAMS += \
 	test-id128
 
 pkginclude_HEADERS += \
-	src/sd-id128.h
+	src/systemd/sd-id128.h
 
 lib_LTLIBRARIES += \
 	libsystemd-id128.la
@@ -1290,7 +1327,8 @@ noinst_PROGRAMS += \
 	test-journal
 
 pkginclude_HEADERS += \
-	src/journal/sd-journal.h
+	src/systemd/sd-journal.h \
+        src/systemd/sd-messages.h
 
 lib_LTLIBRARIES += \
 	libsystemd-journal.la
@@ -1450,7 +1488,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 \
@@ -1877,7 +1915,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
@@ -2184,11 +2222,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-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 && \
 		$(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 )
@@ -2259,8 +2295,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 && \
@@ -2270,8 +2305,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 )