diff options
| author | Loïc Hoguin <[email protected]> | 2015-11-19 18:52:30 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2015-11-19 18:52:30 +0100 |
| commit | c110f49b16ebf3cf23fbfee2f81cc6760a04dc7b (patch) | |
| tree | 68ec4e617346fc30060caeb3e29bfdeb4125d2b7 /plugins | |
| parent | d514facbb41c1b76d76ffe435ccd5174d8c749c2 (diff) | |
| parent | d8678a9ff1280c213acab750bc55696282f90400 (diff) | |
| download | erlang.mk-c110f49b16ebf3cf23fbfee2f81cc6760a04dc7b.tar.gz erlang.mk-c110f49b16ebf3cf23fbfee2f81cc6760a04dc7b.tar.bz2 erlang.mk-c110f49b16ebf3cf23fbfee2f81cc6760a04dc7b.zip | |
Merge branch 'do-not-export-templates' of https://github.com/rabbitmq/erlang.mk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/bootstrap.mk | 6 | ||||
| -rw-r--r-- | plugins/c_src.mk | 4 |
2 files changed, 1 insertions, 9 deletions
diff --git a/plugins/bootstrap.mk b/plugins/bootstrap.mk index dbd115f..464d8fe 100644 --- a/plugins/bootstrap.mk +++ b/plugins/bootstrap.mk @@ -344,7 +344,7 @@ endef # Plugin-specific targets. define render_template - $(verbose) echo "$${_$(1)}" > $(2) + $(verbose) printf -- '$(subst $(newline),\n,$(subst %,%%,$(subst ','\'',$(subst $(tab),$(WS),$(call $(1))))))\n' > $(2) endef ifndef WS @@ -355,10 +355,6 @@ WS = $(tab) endif endif -$(foreach template,$(filter bs_% tpl_%,$(.VARIABLES)), \ - $(eval _$(template) = $$(subst $$(tab),$$(WS),$$($(template)))) \ - $(eval export _$(template))) - bootstrap: ifneq ($(wildcard src/),) $(error Error: src/ directory already exists) diff --git a/plugins/c_src.mk b/plugins/c_src.mk index 5cfdeef..e5d6e51 100644 --- a/plugins/c_src.mk +++ b/plugins/c_src.mk @@ -192,10 +192,6 @@ hello(_) -> erlang:nif_error({not_loaded, ?MODULE}). endef -$(foreach template,bs_c_nif bs_erl_nif, \ - $(eval _$(template) = $$(subst $$(tab),$$(WS),$$($(template)))) \ - $(eval export _$(template))) - new-nif: ifneq ($(wildcard $(C_SRC_DIR)/$n.c),) $(error Error: $(C_SRC_DIR)/$n.c already exists) |