X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=65a7ffeb2720ea440f6ce6c16843597701b894e5;hp=9e01cd520bb8cb5f0deca018a03d5019cb92bda8;hb=022446adf99b84c59a88c2e614033ccde13c395c;hpb=d895500c478c6ad7904905bb4c08176d5a6c0763

diff --git a/Makefile.am b/Makefile.am
index 9e01cd520..65a7ffeb2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -797,7 +797,9 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/generator.h \
 	src/shared/generator.c \
 	src/shared/clean-ipc.h \
-	src/shared/clean-ipc.c
+	src/shared/clean-ipc.c \
+	src/shared/login-shared.c \
+	src/shared/login-shared.h
 
 nodist_libsystemd_shared_la_SOURCES = \
 	src/shared/errno-from-name.h \
@@ -2108,9 +2110,7 @@ libsystemd_internal_la_SOURCES = \
 	src/libsystemd/sd-resolve/resolve-util.h \
 	src/libsystemd/sd-id128/sd-id128.c \
 	src/libsystemd/sd-daemon/sd-daemon.c \
-	src/login/sd-login.c \
-	src/login/login-shared.c \
-	src/login/login-shared.h
+	src/libsystemd/sd-login/sd-login.c
 
 nodist_libsystemd_internal_la_SOURCES = \
 	src/libsystemd/libsystemd.sym \
@@ -2753,10 +2753,8 @@ if HAVE_ACL
 libudev_core_la_SOURCES += \
 	src/udev/udev-builtin-uaccess.c \
 	src/login/logind-acl.c \
-	src/login/sd-login.c \
-	src/systemd/sd-login.h \
-	src/login/login-shared.c \
-	src/login/login-shared.h
+	src/libsystemd/sd-login/sd-login.c \
+	src/systemd/sd-login.h
 
 libudev_core_la_LIBADD += \
 	libsystemd-acl.la
@@ -3130,6 +3128,38 @@ systemd_cat_SOURCES = \
 systemd_cat_LDADD = \
 	libsystemd-journal-core.la
 
+if HAVE_MICROHTTPD
+rootlibexec_PROGRAMS += \
+	systemd-journal-remote
+
+systemd_journal_remote_SOURCES = \
+	src/journal/journal-remote-parse.h \
+	src/journal/journal-remote-parse.c \
+	src/journal/journal-remote-write.h \
+	src/journal/journal-remote-write.c \
+	src/journal/journal-remote.c
+
+systemd_journal_remote_LDADD = \
+	libsystemd-internal.la \
+	libsystemd-journal-core.la
+
+systemd_journal_remote_SOURCES += \
+	src/journal/microhttpd-util.h \
+	src/journal/microhttpd-util.c
+
+systemd_journal_remote_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(MICROHTTPD_CFLAGS)
+
+systemd_journal_remote_LDADD += \
+	$(MICROHTTPD_LIBS)
+
+if HAVE_GNUTLS
+systemd_journal_remote_LDADD += \
+	$(GNUTLS_LIBS)
+endif
+endif
+
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
 journalctl_CFLAGS = \
 	$(AM_CFLAGS)
@@ -3437,6 +3467,11 @@ systemd_journal_gatewayd_LDADD = \
 	libsystemd-shared.la \
 	$(MICROHTTPD_LIBS)
 
+if HAVE_GNUTLS
+systemd_journal_gatewayd_LDADD += \
+	$(GNUTLS_LIBS)
+endif
+
 systemd_journal_gatewayd_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(MICROHTTPD_CFLAGS)
@@ -3816,10 +3851,12 @@ nodist_systemunit_DATA += \
 	units/systemd-bus-driverd.service
 
 dist_systemunit_DATA += \
-	units/org.freedesktop.DBus.busname
+	units/org.freedesktop.DBus.busname	\
+	units/org.freedesktop.systemd1.busname
 
 BUSNAMES_TARGET_WANTS += \
-	org.freedesktop.DBus.busname
+	org.freedesktop.DBus.busname	\
+	org.freedesktop.systemd1.busname
 
 nodist_userunit_DATA += \
 	units/user/systemd-bus-driverd.service
@@ -4184,9 +4221,7 @@ libsystemd_logind_core_la_SOURCES = \
 	src/login/logind-session-dbus.c \
 	src/login/logind-seat-dbus.c \
 	src/login/logind-user-dbus.c \
-	src/login/logind-acl.h \
-	src/login/login-shared.c \
-	src/login/login-shared.h
+	src/login/logind-acl.h
 
 libsystemd_logind_core_la_LIBADD = \
 	libsystemd-label.la \
@@ -4246,7 +4281,7 @@ rootbin_PROGRAMS += \
 	systemd-inhibit
 
 test_login_SOURCES = \
-	src/login/test-login.c
+	src/libsystemd/sd-login/test-login.c
 
 test_login_LDADD = \
 	libsystemd-internal.la \