diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-02 02:51:53 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-02 02:51:53 -0400 |
| commit | d87844858c36a9af10ecce0c14e3f782bde46c76 (patch) | |
| tree | 4d431a3bfc18bf4ab2cb095a9da9aa4f9946d890 /src | |
| parent | d2556f9977122552e1b6ba4a233a500ce86b1343 (diff) | |
| parent | e2f05419e03ecc833012cbd3e9ed71812814acff (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# src/journal/Makefile
Diffstat (limited to 'src')
| -rw-r--r-- | src/journal/Makefile | 1 | ||||
| -rw-r--r-- | src/libsystemd/libsystemd-journal-internal/Makefile | 22 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/journal/Makefile b/src/journal/Makefile index e5223d72bc..43e8810680 100644 --- a/src/journal/Makefile +++ b/src/journal/Makefile @@ -23,6 +23,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk + $(outdir)/dns_type-list.txt: src/resolve/dns-type.h $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(SED) -n -r 's/.* DNS_TYPE_(\w+).*/\1/p' <$< >$@ diff --git a/src/libsystemd/libsystemd-journal-internal/Makefile b/src/libsystemd/libsystemd-journal-internal/Makefile index 784e38732b..ae5ab76ea9 100644 --- a/src/libsystemd/libsystemd-journal-internal/Makefile +++ b/src/libsystemd/libsystemd-journal-internal/Makefile @@ -23,6 +23,17 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk +audit_list_includes = -include linux/audit.h -include $(call at.path,$(topsrcdir)/src/libbasic/missing.h) +ifneq ($(HAVE_AUDIT),) +audit_list_includes += -include libaudit.h +endif + +$(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 >$@ + +$(outdir)/audit_type-to-name.h: $(outdir)/audit_type-list.txt + $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *audit_type_to_string(int type) {\n\tswitch(type) {" } {printf " case AUDIT_%s: return \"%s\";\n", $$1, $$1 } END{ print " default: return NULL;\n\t}\n}\n" }' <$< >$@ + pkginclude_HEADERS += \ src/systemd/sd-journal.h \ src/systemd/sd-messages.h \ @@ -95,17 +106,6 @@ endif noinst_LTLIBRARIES += \ libsystemd-journal-internal.la -audit_list_includes = -include linux/audit.h -include $(call at.path,$(topsrcdir)/src/libbasic/missing.h) -ifneq ($(HAVE_AUDIT),) -audit_list_includes += -include libaudit.h -endif - -$(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 >$@ - -$(outdir)/audit_type-to-name.h: $(outdir)/audit_type-list.txt - $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *audit_type_to_string(int type) {\n\tswitch(type) {" } {printf " case AUDIT_%s: return \"%s\";\n", $$1, $$1 } END{ print " default: return NULL;\n\t}\n}\n" }' <$< >$@ - $(eval $(value automake2autothing)) AM_CPPFLAGS += $(libbasic.CPPFLAGS) AM_CPPFLAGS += -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" |