diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 19:29:16 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-01 19:29:16 -0400 |
| commit | 524d3075ca1e93477deabb95f5c98eaed920de0b (patch) | |
| tree | 65293ddcfd7421141103dbea4938ac5537022ecd | |
| parent | e6340af0662d276ec53daccfec5fabeea0982169 (diff) | |
| parent | 23f0e469311226b141a9a1429705b0f871ffb06d (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# build-aux/Makefile.each.tail/20-systemd.mk
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | build-aux/Makefile.each.tail/20-systemd.mk | 8 | ||||
| -rw-r--r-- | build-aux/Makefile.once.head/20-systemd.mk | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 6775b04d05..23b4146fc9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1343,7 +1343,7 @@ EXTRA_DIST += \ CLEANFILES += \ $(gperf_txt_sources) -#@build-aux/Makefile.once.head/20-systemd.mk +#@build-aux/Makefile.each.tail/20-systemd.mk %-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 }' <$< >$@ diff --git a/build-aux/Makefile.each.tail/20-systemd.mk b/build-aux/Makefile.each.tail/20-systemd.mk index c1cad10809..82692ef301 100644 --- a/build-aux/Makefile.each.tail/20-systemd.mk +++ b/build-aux/Makefile.each.tail/20-systemd.mk @@ -40,6 +40,14 @@ $(outdir)/%.la: $(DESTDIR)$(libdir)/%.so: $(outdir)/%.la $(LIBTOOL) $(ALL_LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $< $(@D) +$(outdir)/%-from-name.gperf: $(srcdir)/%-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 }' <$< >$@ + +$(outdir)/%-from-name.h: $(srcdir)/%-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 <$< >$@ + $(outdir)/%: $(srcdir)/%.in $(SED_PROCESS) diff --git a/build-aux/Makefile.once.head/20-systemd.mk b/build-aux/Makefile.once.head/20-systemd.mk index 58af0f7cc8..5dcd4d2e54 100644 --- a/build-aux/Makefile.once.head/20-systemd.mk +++ b/build-aux/Makefile.once.head/20-systemd.mk @@ -111,14 +111,6 @@ INTLTOOL_V_MERGE_ = $(INTLTOOL_V_MERGE_$(AM_DEFAULT_VERBOSITY)) INTLTOOL_V_MERGE_0 = @echo " ITMRG " $@; INTLTOOL_V_MERGE_1 = -%-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 <$< >$@ - substitutions = \ '|libexecdir=$(libexecdir)|' \ '|bindir=$(bindir)|' \ |