summaryrefslogtreecommitdiff
path: root/src/libsystemd/libsystemd-journal-internal
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-06-07 00:06:45 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-06-07 00:06:45 -0400
commita3e390abebfaeb7c2c8f57dcf721075e85801a4c (patch)
tree52384648eb1383dc1bdf2916147f260cbccba71e /src/libsystemd/libsystemd-journal-internal
parentaab3aab0b571d8ebb3316808f7da91fda86fa180 (diff)
parent7a901e86b9e5ae219ee5db89453864ff4ea19afd (diff)
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts: # src/systemd-nspawn/Makefile
Diffstat (limited to 'src/libsystemd/libsystemd-journal-internal')
-rw-r--r--src/libsystemd/libsystemd-journal-internal/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libsystemd/libsystemd-journal-internal/Makefile b/src/libsystemd/libsystemd-journal-internal/Makefile
index b502bc8e40..6d0be9edff 100644
--- a/src/libsystemd/libsystemd-journal-internal/Makefile
+++ b/src/libsystemd/libsystemd-journal-internal/Makefile
@@ -26,7 +26,7 @@ include $(topsrcdir)/build-aux/Makefile.head.mk
audit_list_includes = -include linux/audit.h -include $(topsrcdir)/src/libbasic/missing.h
ifneq ($(HAVE_AUDIT),)
audit_list_includes += -include libaudit.h
-endif
+endif # HAVE_AUDIT
$(outdir)/audit_type-list.txt: $(call at.path,$(topsrcdir)/src/libbasic/missing.h)
$(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM $(audit_list_includes) - </dev/null | grep -vE 'AUDIT_.*(FIRST|LAST)_' | $(SED) -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | sort -k2 >$@
@@ -80,7 +80,7 @@ libsystemd_journal_internal_la_CFLAGS += \
libsystemd_journal_internal_la_LIBADD += \
$(XZ_LIBS)
-endif
+endif # HAVE_XZ
ifneq ($(HAVE_LZ4),)
libsystemd_journal_internal_la_CFLAGS += \
@@ -88,7 +88,7 @@ libsystemd_journal_internal_la_CFLAGS += \
libsystemd_journal_internal_la_LIBADD += \
$(LZ4_LIBS)
-endif
+endif # HAVE_LZ4
ifneq ($(HAVE_GCRYPT),)
libsystemd_journal_internal_la_SOURCES += \
@@ -104,7 +104,7 @@ libsystemd_journal_internal_la_LIBADD += \
libsystemd_journal_internal_la_CFLAGS += \
$(GCRYPT_CFLAGS) \
-Wno-pointer-arith
-endif
+endif # HAVE_GCRYPT
noinst_LTLIBRARIES += \
libsystemd-journal-internal.la