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/Makefile | |
| parent | aab3aab0b571d8ebb3316808f7da91fda86fa180 (diff) | |
| parent | 7a901e86b9e5ae219ee5db89453864ff4ea19afd (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# src/systemd-nspawn/Makefile
Diffstat (limited to 'src/journal/Makefile')
| -rw-r--r-- | src/journal/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/journal/Makefile b/src/journal/Makefile index 43e8810680..17f2c5e859 100644 --- a/src/journal/Makefile +++ b/src/journal/Makefile @@ -71,7 +71,7 @@ journalctl_CFLAGS += \ journalctl_LDADD += \ $(QRENCODE_LIBS) -endif +endif # HAVE_QRENCODE test_journal_SOURCES = \ src/journal/test-journal.c @@ -247,7 +247,7 @@ ifneq ($(HAVE_COMPRESSION),) tests += \ test-compress \ test-compress-benchmark -endif +endif # HAVE_COMPRESSION libexec_PROGRAMS += \ @@ -321,7 +321,7 @@ systemd_journal_gatewayd_LDADD = \ ifneq ($(HAVE_GNUTLS),) systemd_journal_gatewayd_LDADD += \ $(GNUTLS_LIBS) -endif +endif # HAVE_GNUTLS systemd_journal_gatewayd_CFLAGS = \ $(AM_CFLAGS) \ @@ -340,7 +340,7 @@ nodist_systemunit_DATA += \ dist_gatewayddocumentroot_DATA = \ src/journal-remote/browse.html -endif +endif # HAVE_MICROHTTPD EXTRA_DIST += \ units/systemd-journal-gatewayd.service.in |