diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 00:06:45 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 00:06:45 -0400 |
| commit | a3e390abebfaeb7c2c8f57dcf721075e85801a4c (patch) | |
| tree | 52384648eb1383dc1bdf2916147f260cbccba71e /src/journal-remote | |
| parent | aab3aab0b571d8ebb3316808f7da91fda86fa180 (diff) | |
| parent | 7a901e86b9e5ae219ee5db89453864ff4ea19afd (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# src/systemd-nspawn/Makefile
Diffstat (limited to 'src/journal-remote')
| -rw-r--r-- | src/journal-remote/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/journal-remote/Makefile b/src/journal-remote/Makefile index 21d07f7712..150e326a78 100644 --- a/src/journal-remote/Makefile +++ b/src/journal-remote/Makefile @@ -52,12 +52,12 @@ systemd_journal_remote_LDADD += \ ifneq ($(ENABLE_TMPFILES),) dist_tmpfiles_DATA += \ tmpfiles.d/systemd-remote.conf -endif +endif # ENABLE_TMPFILES ifneq ($(HAVE_GNUTLS),) systemd_journal_remote_LDADD += \ $(GNUTLS_LIBS) -endif +endif # HAVE_GNUTLS # systemd-journal-remote make sense mostly with full crypto stack dist_systemunit_DATA += \ @@ -80,7 +80,7 @@ EXTRA_DIST += \ units/systemd-journal-remote.service.in \ src/journal-remote/journal-remote.conf.in \ src/journal-remote/log-generator.py -endif +endif # HAVE_MICROHTTPD ifneq ($(HAVE_LIBCURL),) libexec_PROGRAMS += \ @@ -104,7 +104,7 @@ nodist_systemunit_DATA += \ nodist_pkgsysconf_DATA += \ src/journal-remote/journal-upload.conf -endif +endif # HAVE_LIBCURL EXTRA_DIST += \ units/systemd-journal-upload.service.in \ |