diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-26 00:56:47 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-26 00:56:47 -0400 |
| commit | 9155dec335ce55c5443088595717f282aa27f055 (patch) | |
| tree | a9e8979ba8779e192d4d0e94fd9642ba24039a44 /common.once.head.mk | |
| parent | 981826a044b03a5192d339308554cb6c1fe1ba1d (diff) | |
| parent | 0e3931397419225a8e36a8350607fdfb55d0f473 (diff) | |
Merge branch 'post' into lukeshu-postmove
# Conflicts:
# Makefile.am
# am-pretty.mk
# common.once.head.mk
# config.mk.in
# discard.mk
# src/kernel-install/Makefile
# src/libbasic/Makefile
# src/libcore/Makefile
# src/libfirewall/Makefile
# src/libshared/Makefile
# src/libsystemd/Makefile
# src/libsystemd/src/Makefile
# src/libudev/Makefile
# src/libudev/src/Makefile
# src/system/systemd/Makefile
# src/systemd-nspawn/.gitignore
# src/systemd-nspawn/Makefile
Diffstat (limited to 'common.once.head.mk')
| -rw-r--r-- | common.once.head.mk | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/common.once.head.mk b/common.once.head.mk index 85c2898e88..d0b72a4b92 100644 --- a/common.once.head.mk +++ b/common.once.head.mk @@ -23,6 +23,8 @@ MAKEFLAGS += --no-builtin-rules ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} +AM_MAKEFLAGS = --no-print-directory +AUTOMAKE_OPTIONS = color-tests parallel-tests GCC_COLORS ?= 'ooh, shiny!' export GCC_COLORS @@ -40,6 +42,14 @@ CPPFLAGS += -include $(topoutdir)/config.h # Keep the test-suite.log .PRECIOUS: $(TEST_SUITE_LOG) Makefile +%-from-name.gperf: %-list.txt + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct $(notdir $*)_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@ + +%-from-name.h: %-from-name.gperf + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_$(notdir $*) -H hash_$(notdir $*)_name -p -C <$< >$@ + # Stupid test that everything purported to be exported really is define generate-sym-test $(AM_V_at)$(MKDIR_P) $(dir $@) @@ -52,14 +62,6 @@ define generate-sym-test $(AM_V_at)printf 'return 0; }\n' >> $@ endef -%-from-name.gperf: %-list.txt - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct $(notdir $*)_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@ - -%-from-name.h: %-from-name.gperf - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_$(notdir $*) -H hash_$(notdir $*)_name -p -C <$< >$@ - # from GNU automake DEFAULT_INCLUDES = -I. |