From ae79ac19963f32f0604e2262b5e177a4abed0d98 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 2 Jun 2016 02:49:00 -0400 Subject: stuff in Makefiles --- Makefile.am | 3 ++- move.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 23b4146fc9..b1515e05f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1400,7 +1400,7 @@ src/basic/cap-from-name.h: src/basic/cap-from-name.gperf $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@ -#@src/journal/Makefile +#@src/libsystemd/libsystemd-journal-internal/Makefile audit_list_includes = -include linux/audit.h -include missing.h if HAVE_AUDIT audit_list_includes += -include libaudit.h @@ -1414,6 +1414,7 @@ src/journal/audit_type-to-name.h: src/journal/audit_type-list.txt $(AM_V_at)$(MKDIR_P) $(dir $@) $(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" }' <$< >$@ +#@src/journal/Makefile src/resolve/dns_type-list.txt: src/resolve/dns-type.h $(AM_V_at)$(MKDIR_P) $(dir $@) diff --git a/move.sh b/move.sh index d6ab19450a..f4cea391b2 100755 --- a/move.sh +++ b/move.sh @@ -184,7 +184,8 @@ fixup_makefiles() ( -e 's/ \$\(CPPFLAGS\) / /g' \ -e 's/ \$\(AM_CPPFLAGS\) / $(ALL_CPPFLAGS) /g' \ -e '/^[^# ]*:/ { s|\S+/|$(outdir)/|g }' \ - src/libbasic/Makefile + src/libbasic/Makefile \ + src/libsystemd/libsystemd-journal-internal/Makefile ) move() ( -- cgit v1.2.3-54-g00ecf