journal-upload: use journal as the source

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 34289fbfce46deee61e0477a66355f371043e125..7fefa5873a7667632fb0e294d641a2c6a16c9395 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3449,19 +3449,19 @@ 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
+       src/journal-remote/journal-remote-parse.h \
+       src/journal-remote/journal-remote-parse.c \
+       src/journal-remote/journal-remote-write.h \
+       src/journal-remote/journal-remote-write.c \
+       src/journal-remote/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
+       src/journal-remote/microhttpd-util.h \
+       src/journal-remote/microhttpd-util.c
 
 systemd_journal_remote_CFLAGS = \
        $(AM_CFLAGS) \
@@ -3476,6 +3476,27 @@ systemd_journal_remote_LDADD += \
 endif
 endif
 
+if HAVE_LIBCURL
+rootlibexec_PROGRAMS += \
+       systemd-journal-upload
+
+systemd_journal_upload_SOURCES = \
+       src/journal-remote/journal-upload.h \
+       src/journal-remote/journal-upload.c \
+       src/journal-remote/journal-upload-journal.c
+
+systemd_journal_upload_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(LIBCURL_CFLAGS)
+
+systemd_journal_upload_LDADD = \
+       libsystemd-core.la \
+       libsystemd-internal.la \
+       libsystemd-journal-internal.la \
+       libsystemd-shared.la \
+       $(LIBCURL_LIBS)
+endif
+
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
 journalctl_CFLAGS = \
        $(AM_CFLAGS)
@@ -3803,9 +3824,9 @@ rootlibexec_PROGRAMS += \
        systemd-journal-gatewayd
 
 systemd_journal_gatewayd_SOURCES = \
-       src/journal/journal-gatewayd.c \
-       src/journal/microhttpd-util.h \
-       src/journal/microhttpd-util.c
+       src/journal-remote/journal-gatewayd.c \
+       src/journal-remote/microhttpd-util.h \
+       src/journal-remote/microhttpd-util.c
 
 systemd_journal_gatewayd_LDADD = \
        libsystemd-logs.la \
@@ -3834,7 +3855,7 @@ nodist_systemunit_DATA += \
        units/systemd-journal-gatewayd.service
 
 dist_gatewayddocumentroot_DATA = \
-       src/journal/browse.html
+       src/journal-remote/browse.html
 
 endif
 
@@ -4575,9 +4596,24 @@ rootlibexec_PROGRAMS += \
 nodist_systemunit_DATA += \
        units/systemd-resolved.service
 
+dist_systemunit_DATA += \
+       units/org.freedesktop.resolve1.busname
+
+dist_dbuspolicy_DATA += \
+       src/resolve/org.freedesktop.resolve1.conf
+
+dist_dbussystemservice_DATA += \
+       src/resolve/org.freedesktop.resolve1.service
+
 EXTRA_DIST += \
        units/systemd-resolved.service.in
 
+SYSTEM_UNIT_ALIASES += \
+       systemd-resolved.service dbus-org.freedesktop.resolve1.service
+
+BUSNAMES_TARGET_WANTS += \
+       org.freedesktop.resolve1.busname
+
 GENERAL_ALIASES += \
        $(systemunitdir)/systemd-resolved.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-resolved.service