X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=42da4fb753ca996cf70f5672b30e5dfff8e257eb;hp=0c8804f481ee43c822439db24cb8cea6ebf51127;hb=5e41cfec83aa47af12e469bc62e336f8213ee066;hpb=81527be142678057215665be66e4b3c8306a7ab3

diff --git a/Makefile.am b/Makefile.am
index 0c8804f48..42da4fb75 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -181,7 +181,6 @@ bin_PROGRAMS += \
 endif
 
 rootlibexec_PROGRAMS = \
-	systemd-stdout-syslog-bridge \
 	systemd-cgroups-agent \
 	systemd-initctl \
 	systemd-update-utmp \
@@ -189,7 +188,6 @@ rootlibexec_PROGRAMS = \
 	systemd-shutdown \
 	systemd-modules-load \
 	systemd-remount-api-vfs \
-	systemd-kmsg-syslogd \
 	systemd-reply-password \
 	systemd-fsck \
 	systemd-timestamp \
@@ -287,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 \
@@ -319,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 \
@@ -353,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 \
@@ -373,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 \
@@ -444,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 = \
@@ -569,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 \
@@ -751,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
@@ -908,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 \
@@ -938,6 +974,7 @@ systemctl_LDADD = \
 	libsystemd-basic.la \
 	libsystemd-daemon.la \
 	libsystemd-journal.la \
+	libsystemd-id128.la \
 	$(DBUS_LIBS)
 
 systemd_notify_SOURCES = \
@@ -1079,7 +1116,7 @@ lib_LTLIBRARIES += \
 	libsystemd-daemon.la
 
 pkgconfiglib_DATA += \
-	libsystemd-daemon.pc
+        src/libsystemd-daemon.pc
 
 MANPAGES += \
 	man/sd-daemon.7 \
@@ -1102,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
 
 # ------------------------------------------------------------------------------
@@ -1138,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:
@@ -1160,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
 
 # ------------------------------------------------------------------------------
@@ -1171,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
 
@@ -1203,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 += \
@@ -1317,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
@@ -2186,11 +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-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 )
@@ -2261,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 && \
@@ -2272,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 )
@@ -2404,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: