diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-27 00:43:18 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-27 00:43:18 -0400 |
| commit | 4edbbb28e4419fc473d5675abd6abd0c450ca82c (patch) | |
| tree | d7605539e35e24746b9ac9c3692b75d20b07288a /src/libsystemd | |
| parent | 93fd8d3a035f6acb134adff0d6b34e7fba5e72af (diff) | |
`git diff`-guided cleanup
Diffstat (limited to 'src/libsystemd')
| -rw-r--r-- | src/libsystemd/Makefile | 11 | ||||
| -rw-r--r-- | src/libsystemd/src/sd-journal/Makefile | 4 |
2 files changed, 3 insertions, 12 deletions
diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile index b8b8e01968..e780b351c5 100644 --- a/src/libsystemd/Makefile +++ b/src/libsystemd/Makefile @@ -32,16 +32,7 @@ EXTRA_DIST += \ src/libsystemd/sd-bus/DIFFERENCES \ src/libsystemd/sd-bus/GVARIANT-SERIALIZATION -#libsystemd_la_SOURCES = \ - $(libsystemd_internal_la_SOURCES) \ - $(libsystemd_journal_internal_la_SOURCES) - -#nodist_libsystemd_la_SOURCES = \ - $(nodist_libsystemd_internal_la_SOURCES) - -#libsystemd_la_CFLAGS = \ - $(libsystemd_internal_la_CFLAGS) \ - $(libsystemd_journal_internal_la_CFLAGS) +libsystemd_la_SOURCES = libsystemd_la_LDFLAGS = \ -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \ diff --git a/src/libsystemd/src/sd-journal/Makefile b/src/libsystemd/src/sd-journal/Makefile index 38a3458f4b..10cd8c45bb 100644 --- a/src/libsystemd/src/sd-journal/Makefile +++ b/src/libsystemd/src/sd-journal/Makefile @@ -23,12 +23,12 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -audit_list_includes = -include linux/audit.h -include $(topsrcdir)/src/libsystemd-basic/include/systemd-basic/missing.h +audit_list_includes = -include linux/audit.h -include systemd-basic/missing.h ifneq ($(HAVE_AUDIT),) audit_list_includes += -include libaudit.h endif # HAVE_AUDIT -$(outdir)/audit_type-list.txt: $(call at.path,$(topsrcdir)/src/libsystemd-basic/include/systemd-basic/missing.h) +$(outdir)/audit_type-list.txt: | $(outdir)/$(DEPDIR) $(AM_V_GEN)$(CPP) $(sd.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 >$@ $(outdir)/audit_type-to-name.h: $(outdir)/audit_type-list.txt |