summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUmut Tezduyar Lindskog <umuttl@axis.com>2016-03-18 11:34:51 +0100
committerUmut Tezduyar Lindskog <umuttl@axis.com>2016-03-18 11:35:37 +0100
commit2adeb166daee2a5d002cc0ccf0d96bcc6bdf04fb (patch)
tree35c4e48d76ae0b8d221f27ea99237113bde7e92c
parent6a692550f25b3143aa6acecb7adb265956b8387f (diff)
journal-upload: remove microhttpd dependency
journal-upload doesn't really need microhttpd to run. Without the dependency, we can cross compile systemd without microhttpd and get the uploader part of the remote logging. Change-Id: I28dfa5ad2aae94e50de1d32713e1827623c3fd1d
-rw-r--r--Makefile.am56
1 files changed, 28 insertions, 28 deletions
diff --git a/Makefile.am b/Makefile.am
index 97e2c26442..cc06350c9b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3945,6 +3945,34 @@ systemd_cat_SOURCES = \
systemd_cat_LDADD = \
libjournal-core.la
+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 = \
+ libshared.la \
+ $(LIBCURL_LIBS)
+
+nodist_systemunit_DATA += \
+ units/systemd-journal-upload.service
+
+nodist_pkgsysconf_DATA += \
+ src/journal-remote/journal-upload.conf
+endif
+
+EXTRA_DIST += \
+ units/systemd-journal-upload.service.in \
+ src/journal-remote/journal-upload.conf.in
+
if HAVE_MICROHTTPD
rootlibexec_PROGRAMS += \
systemd-journal-remote
@@ -4004,34 +4032,6 @@ EXTRA_DIST += \
src/journal-remote/log-generator.py
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 = \
- libshared.la \
- $(LIBCURL_LIBS)
-
-nodist_systemunit_DATA += \
- units/systemd-journal-upload.service
-
-nodist_pkgsysconf_DATA += \
- src/journal-remote/journal-upload.conf
-endif
-
-EXTRA_DIST += \
- units/systemd-journal-upload.service.in \
- src/journal-remote/journal-upload.conf.in
-
# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
journalctl_CFLAGS = \
$(AM_CFLAGS)