Skip to content

Commit 8494dca

Browse files
committed
Replace $(AT) with .SILENCE.
This reduces the amount of syntax noise in the makefiles.
1 parent d3474b8 commit 8494dca

File tree

2 files changed

+49
-52
lines changed

2 files changed

+49
-52
lines changed

depends/Makefile

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@ host_prefix=$($(host_arch)_$(host_os)_prefix)
102102
build_prefix=$(host_prefix)/native
103103
build_host=$(build)
104104

105-
AT_$(V):=
106-
AT_:=@
107-
AT:=$(AT_$(V))
108-
109105
all: install
110106

111107
include hosts/$(host_os).mk
@@ -178,12 +174,12 @@ include funcs.mk
178174
final_build_id_long+=$(shell $(build_SHA256SUM) config.site.in)
179175
final_build_id+=$(shell echo -n "$(final_build_id_long)" | $(build_SHA256SUM) | cut -c-$(HASH_LENGTH))
180176
$(host_prefix)/.stamp_$(final_build_id): $(native_packages) $(packages)
181-
$(AT)rm -rf $(@D)
182-
$(AT)mkdir -p $(@D)
183-
$(AT)echo copying packages: $^
184-
$(AT)echo to: $(@D)
185-
$(AT)cd $(@D); $(foreach package,$^, tar xf $($(package)_cached); )
186-
$(AT)touch $@
177+
rm -rf $(@D)
178+
mkdir -p $(@D)
179+
echo copying packages: $^
180+
echo to: $(@D)
181+
cd $(@D); $(foreach package,$^, tar xf $($(package)_cached); )
182+
touch $@
187183

188184
# $PATH is not preserved between ./configure and make by convention. Its
189185
# modification and overriding at ./configure time is (as I understand it)
@@ -210,8 +206,8 @@ $(host_prefix)/.stamp_$(final_build_id): $(native_packages) $(packages)
210206
# we expect them to be available in $PATH at all times, more specificity does
211207
# not hurt.
212208
$(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_build_id)
213-
$(AT)@mkdir -p $(@D)
214-
$(AT)sed -e 's|@HOST@|$(host)|' \
209+
@mkdir -p $(@D)
210+
sed -e 's|@HOST@|$(host)|' \
215211
-e 's|@CC@|$(host_CC)|' \
216212
-e 's|@CXX@|$(host_CXX)|' \
217213
-e 's|@AR@|$(host_AR)|' \
@@ -236,7 +232,7 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_
236232
-e 's|@multiprocess@|$(MULTIPROCESS)|' \
237233
-e 's|@debug@|$(DEBUG)|' \
238234
$< > $@
239-
$(AT)touch $@
235+
touch $@
240236

241237

242238
define check_or_remove_cached
@@ -285,3 +281,4 @@ $(foreach package,$(all_packages),$(eval $(call ext_add_stages,$(package))))
285281

286282
.PHONY: install cached clean clean-all download-one download-osx download-linux download-win download check-packages check-sources
287283
.PHONY: FORCE
284+
$(V).SILENT:

depends/funcs.mk

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -188,53 +188,53 @@ endef
188188

189189
define int_add_cmds
190190
$($(1)_fetched):
191-
$(AT)mkdir -p $$(@D) $(SOURCES_PATH)
192-
$(AT)rm -f $$@
193-
$(AT)touch $$@
194-
$(AT)cd $$(@D); $(call $(1)_fetch_cmds,$(1))
195-
$(AT)cd $($(1)_source_dir); $(foreach source,$($(1)_all_sources),$(build_SHA256SUM) $(source) >> $$(@);)
196-
$(AT)touch $$@
191+
mkdir -p $$(@D) $(SOURCES_PATH)
192+
rm -f $$@
193+
touch $$@
194+
cd $$(@D); $(call $(1)_fetch_cmds,$(1))
195+
cd $($(1)_source_dir); $(foreach source,$($(1)_all_sources),$(build_SHA256SUM) $(source) >> $$(@);)
196+
touch $$@
197197
$($(1)_extracted): | $($(1)_fetched)
198-
$(AT)echo Extracting $(1)...
199-
$(AT)mkdir -p $$(@D)
200-
$(AT)cd $$(@D); $(call $(1)_extract_cmds,$(1))
201-
$(AT)touch $$@
198+
echo Extracting $(1)...
199+
mkdir -p $$(@D)
200+
cd $$(@D); $(call $(1)_extract_cmds,$(1))
201+
touch $$@
202202
$($(1)_preprocessed): | $($(1)_extracted)
203-
$(AT)echo Preprocessing $(1)...
204-
$(AT)mkdir -p $$(@D) $($(1)_patch_dir)
205-
$(AT)$(foreach patch,$($(1)_patches),cd $(PATCHES_PATH)/$(1); cp $(patch) $($(1)_patch_dir) ;)
206-
$(AT)cd $$(@D); $(call $(1)_preprocess_cmds, $(1))
207-
$(AT)touch $$@
203+
echo Preprocessing $(1)...
204+
mkdir -p $$(@D) $($(1)_patch_dir)
205+
$(foreach patch,$($(1)_patches),cd $(PATCHES_PATH)/$(1); cp $(patch) $($(1)_patch_dir) ;)
206+
cd $$(@D); $(call $(1)_preprocess_cmds, $(1))
207+
touch $$@
208208
$($(1)_configured): | $($(1)_dependencies) $($(1)_preprocessed)
209-
$(AT)echo Configuring $(1)...
210-
$(AT)rm -rf $(host_prefix); mkdir -p $(host_prefix)/lib; cd $(host_prefix); $(foreach package,$($(1)_all_dependencies), tar --no-same-owner -xf $($(package)_cached); )
211-
$(AT)mkdir -p $$(@D)
212-
$(AT)+cd $$(@D); $($(1)_config_env) $(call $(1)_config_cmds, $(1))
213-
$(AT)touch $$@
209+
echo Configuring $(1)...
210+
rm -rf $(host_prefix); mkdir -p $(host_prefix)/lib; cd $(host_prefix); $(foreach package,$($(1)_all_dependencies), tar --no-same-owner -xf $($(package)_cached); )
211+
mkdir -p $$(@D)
212+
+cd $$(@D); $($(1)_config_env) $(call $(1)_config_cmds, $(1))
213+
touch $$@
214214
$($(1)_built): | $($(1)_configured)
215-
$(AT)echo Building $(1)...
216-
$(AT)mkdir -p $$(@D)
217-
$(AT)+cd $$(@D); $($(1)_build_env) $(call $(1)_build_cmds, $(1))
218-
$(AT)touch $$@
215+
echo Building $(1)...
216+
mkdir -p $$(@D)
217+
+cd $$(@D); $($(1)_build_env) $(call $(1)_build_cmds, $(1))
218+
touch $$@
219219
$($(1)_staged): | $($(1)_built)
220-
$(AT)echo Staging $(1)...
221-
$(AT)mkdir -p $($(1)_staging_dir)/$(host_prefix)
222-
$(AT)cd $($(1)_build_dir); $($(1)_stage_env) $(call $(1)_stage_cmds, $(1))
223-
$(AT)rm -rf $($(1)_extract_dir)
224-
$(AT)touch $$@
220+
echo Staging $(1)...
221+
mkdir -p $($(1)_staging_dir)/$(host_prefix)
222+
cd $($(1)_build_dir); $($(1)_stage_env) $(call $(1)_stage_cmds, $(1))
223+
rm -rf $($(1)_extract_dir)
224+
touch $$@
225225
$($(1)_postprocessed): | $($(1)_staged)
226-
$(AT)echo Postprocessing $(1)...
227-
$(AT)cd $($(1)_staging_prefix_dir); $(call $(1)_postprocess_cmds)
228-
$(AT)touch $$@
226+
echo Postprocessing $(1)...
227+
cd $($(1)_staging_prefix_dir); $(call $(1)_postprocess_cmds)
228+
touch $$@
229229
$($(1)_cached): | $($(1)_dependencies) $($(1)_postprocessed)
230-
$(AT)echo Caching $(1)...
231-
$(AT)cd $$($(1)_staging_dir)/$(host_prefix); find . | sort | tar --no-recursion -czf $$($(1)_staging_dir)/$$(@F) -T -
232-
$(AT)mkdir -p $$(@D)
233-
$(AT)rm -rf $$(@D) && mkdir -p $$(@D)
234-
$(AT)mv $$($(1)_staging_dir)/$$(@F) $$(@)
235-
$(AT)rm -rf $($(1)_staging_dir)
230+
echo Caching $(1)...
231+
cd $$($(1)_staging_dir)/$(host_prefix); find . | sort | tar --no-recursion -czf $$($(1)_staging_dir)/$$(@F) -T -
232+
mkdir -p $$(@D)
233+
rm -rf $$(@D) && mkdir -p $$(@D)
234+
mv $$($(1)_staging_dir)/$$(@F) $$(@)
235+
rm -rf $($(1)_staging_dir)
236236
$($(1)_cached_checksum): $($(1)_cached)
237-
$(AT)cd $$(@D); $(build_SHA256SUM) $$(<F) > $$(@)
237+
cd $$(@D); $(build_SHA256SUM) $$(<F) > $$(@)
238238

239239
.PHONY: $(1)
240240
$(1): | $($(1)_cached_checksum)

0 commit comments

Comments
 (0)