X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=a29a32a5d2d5de2f66d62fc419278a5a99d287c8;hp=4a399c523619c131d85076c4d5235a19b642daec;hb=a7623afb7a48ab1d7b5b24fbd5f1033acfb2301c;hpb=e905a456814eadfb904c49241e3841c1e4a1d119

diff --git a/Makefile.am b/Makefile.am
index 4a399c523..a29a32a5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -299,8 +299,7 @@ bin_PROGRAMS = \
 	systemd-detect-virt \
 	systemd-delta \
 	systemd-analyze \
-	systemd-run \
-	systemd-saproxy
+	systemd-run
 
 dist_bin_SCRIPTS = \
 	src/kernel-install/kernel-install
@@ -321,7 +320,8 @@ rootlibexec_PROGRAMS = \
 	systemd-fsck \
 	systemd-ac-power \
 	systemd-sysctl \
-	systemd-sleep
+	systemd-sleep \
+	systemd-socket-proxyd
 
 systemgenerator_PROGRAMS = \
 	systemd-getty-generator \
@@ -1490,7 +1490,7 @@ systemd_update_utmp_CFLAGS = \
 
 systemd_update_utmp_LDADD = \
 	libsystemd-shared.la \
-	libsystemd-dbus.la \
+	libsystemd-bus.la \
 	$(AUDIT_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -2789,6 +2789,8 @@ systemd_cat_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-journal-internal.la
 
+journalctl_CFLAGS = $(AM_CFLAGS)
+
 journalctl_SOURCES = \
 	src/journal/journalctl.c
 
@@ -2808,7 +2810,7 @@ journalctl_SOURCES += \
 	src/journal/journal-qrcode.c \
 	src/journal/journal-qrcode.h
 
-journalctl_CFLAGS = \
+journalctl_CFLAGS += \
 	$(QRENCODE_CFLAGS)
 
 journalctl_LDADD += \
@@ -2995,7 +2997,7 @@ libsystemd_journal_la_CFLAGS += \
 libsystemd_journal_la_LIBADD += \
 	$(XZ_LIBS)
 
-libsystemd_journal_internal_la_CFLAGS = \
+libsystemd_journal_internal_la_CFLAGS += \
 	$(XZ_CFLAGS)
 
 libsystemd_journal_internal_la_LIBADD += \
@@ -3167,10 +3169,10 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 
-systemd_saproxy_SOURCES = \
-	src/saproxy/saproxy.c
+systemd_socket_proxyd_SOURCES = \
+	src/socket-proxy/socket-proxyd.c
 
-systemd_saproxy_LDADD = \
+systemd_socket_proxyd_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-logs.la \
 	libsystemd-journal-internal.la \
@@ -3178,9 +3180,6 @@ systemd_saproxy_LDADD = \
 	libsystemd-daemon.la \
 	libsystemd-bus.la
 
-systemd_saproxy_CFLAGS = \
-	$(AM_CFLAGS)
-
 # ------------------------------------------------------------------------------
 if ENABLE_COREDUMP
 systemd_coredump_SOURCES = \
@@ -4448,7 +4447,6 @@ SYSINIT_TARGET_WANTS += \
 	systemd-update-utmp.service
 LOCAL_FS_TARGET_WANTS += \
 	systemd-remount-fs.service \
-	systemd-fsck-root.service \
 	tmp.mount
 MULTI_USER_TARGET_WANTS += \
 	getty.target \