summaryrefslogtreecommitdiff
path: root/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'src/grp-journal/grp-remote/systemd-journal-remote/Makefile')
-rw-r--r--src/grp-journal/grp-remote/systemd-journal-remote/Makefile19
1 files changed, 4 insertions, 15 deletions
diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/Makefile b/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
index ebfa101c97..601bad9b5f 100644
--- a/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
@@ -36,28 +36,14 @@ systemd_journal_remote_SOURCES = \
src/journal-remote/journal-remote.c
systemd_journal_remote_LDADD = \
+ libsystemd-microhttpd.la \
libjournal-core.la
-systemd_journal_remote_SOURCES += \
- src/journal-remote/microhttpd-util.h \
- src/journal-remote/microhttpd-util.c
-
-systemd_journal_remote_CFLAGS = \
- $(MICROHTTPD_CFLAGS)
-
-systemd_journal_remote_LDADD += \
- $(MICROHTTPD_LIBS)
-
ifneq ($(ENABLE_TMPFILES),)
dist_tmpfiles_DATA += \
tmpfiles.d/systemd-remote.conf
endif # ENABLE_TMPFILES
-ifneq ($(HAVE_GNUTLS),)
-systemd_journal_remote_LDADD += \
- $(GNUTLS_LIBS)
-endif # HAVE_GNUTLS
-
# systemd-journal-remote make sense mostly with full crypto stack
dist_systemunit_DATA += \
units/systemd-journal-remote.socket
@@ -81,4 +67,7 @@ EXTRA_DIST += \
src/journal-remote/log-generator.py
endif # HAVE_MICROHTTPD
+sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
+sd.CPPFLAGS += -DCERTIFICATE_ROOT=\"$(CERTIFICATEROOT)\"
+
include $(topsrcdir)/build-aux/Makefile.tail.mk