wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 830351: remove unused .mkdir.deps rule and clenaup cosmetic makefile problems

Browse Source
This commit is contained in:
Joey Armstrong 2013-01-31 14:55:30 -05:00
parent aa5b3bbd91
commit 278deb0097
7 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/makefiles/autotargets.mk
View File

@ -38,7 +38,7 @@ _slashSqueeze =$(foreach val,$(getargv),$(call getPathPrefix,$(val))$(subst $(sp
# Squeeze extraneous directory slashes from the path
# o protect embedded spaces within the path
# o replace //+ sequences with /
slash_strip =\
slash_strip = \
$(strip \
$(subst <--[**]-->,$(space),\
$(call _slashSqueeze,\
@ -62,20 +62,13 @@ mkdir_deps =$(foreach dir,$(getargv),$(call slash_strip,$(dir)/.mkdir.done))
# 198001010000 would translate to something older than FAT epoch.
@$(TOUCH) -t 198001030000 "$@"
# A handful of makefiles are attempting "mkdir dot". Likely not intended
# or stale logic so add a stub target to handle the request and warn for now.
.mkdir.done:
ifndef NOWARN_AUTOTARGETS # {
@echo "WARNING: $(MKDIR) -dot- requested by $(MAKE) -C $(CURDIR) $(MAKECMDGOALS)"
@$(TOUCH) -t 198001030000 $@
endif #}
INCLUDED_AUTOTARGETS_MK = 1
endif #}
## Accumulate deps and cleanup
ifneq (,$(GENERATED_DIRS))
GENERATED_DIRS := $(strip $(sort $(GENERATED_DIRS)))
tmpauto :=$(call mkdir_deps,GENERATED_DIRS)
GENERATED_DIRS_DEPS +=$(tmpauto)
GARBAGE_DIRS +=$(GENERATED_DIRS)
@ -88,6 +81,7 @@ endif
#################################################################
AUTO_DEPS +=$(GENERATED_DIRS_DEPS)
AUTO_DEPS := $(strip $(sort $(AUTO_DEPS)))
# Complain loudly if deps have not loaded so getargv != $(NULL)
$(call requiredfunction,getargv)

10
config/makefiles/makeutils.mk
View File

@ -45,11 +45,11 @@ subargv =$(wordlist $(1),$(words $(getargv)),$(getargv))
# $(NULL)
# target: $(target-preqs)
banner =\
$(info )\
$(info ***************************************************************************)\
$(info ** $(getargv))\
$(info ***************************************************************************)\
banner = \
$(info ) \
$(info ***************************************************************************) \
$(info ** $(getargv)) \
$(info ***************************************************************************) \
$(NULL)
#####################################################################

4
config/makefiles/test/check-autotargets.mk
View File

@ -11,8 +11,6 @@ endif
space=$(null) $(null)
GENERATED_DIRS = bogus # test data
NOWARN_AUTOTARGETS = 1 # Unit test includes makefile twice.
undefine USE_AUTOTARGETS_MK
undefine INCLUDED_AUTOTARGETS_MK
include $(topsrcdir)/config/makefiles/autotargets.mk
@ -25,7 +23,7 @@ $(call requiredfunction,mkdir_deps)
# Verify test data populated makefile vars correctly
vars = AUTO_DEPS GARBAGE_DIRS GENERATED_DIRS_DEPS
vars = AUTO_DEPS GARBAGE_DIRS GENERATED_DIRS_DEPS
$(foreach var,$(vars),$(call errorIfEmpty,$(var)))
# Data should also be valid

2
config/rules.mk
View File

@ -116,7 +116,7 @@ cppunittests-remote:
--localLib=$(DEPTH)/dist/$(MOZ_APP_NAME) \
--dm_trans=$(DM_TRANS) \
--deviceIP=${TEST_DEVICE} \
$(subst .cpp,$(BIN_SUFFIX),$(CPP_UNIT_TESTS)) $(EXTRA_TEST_ARGS); \
$(subst .cpp,$(BIN_SUFFIX),$(CPP_UNIT_TESTS)) $(EXTRA_TEST_ARGS); \
else \
echo "please prepare your host with environment variables for TEST_DEVICE"; \
fi

12
js/src/config/makefiles/autotargets.mk
View File

@ -38,7 +38,7 @@ _slashSqueeze =$(foreach val,$(getargv),$(call getPathPrefix,$(val))$(subst $(sp
# Squeeze extraneous directory slashes from the path
# o protect embedded spaces within the path
# o replace //+ sequences with /
slash_strip =\
slash_strip = \
$(strip \
$(subst <--[**]-->,$(space),\
$(call _slashSqueeze,\
@ -62,20 +62,13 @@ mkdir_deps =$(foreach dir,$(getargv),$(call slash_strip,$(dir)/.mkdir.done))
# 198001010000 would translate to something older than FAT epoch.
@$(TOUCH) -t 198001030000 "$@"
# A handful of makefiles are attempting "mkdir dot". Likely not intended
# or stale logic so add a stub target to handle the request and warn for now.
.mkdir.done:
ifndef NOWARN_AUTOTARGETS # {
@echo "WARNING: $(MKDIR) -dot- requested by $(MAKE) -C $(CURDIR) $(MAKECMDGOALS)"
@$(TOUCH) -t 198001030000 $@
endif #}
INCLUDED_AUTOTARGETS_MK = 1
endif #}
## Accumulate deps and cleanup
ifneq (,$(GENERATED_DIRS))
GENERATED_DIRS := $(strip $(sort $(GENERATED_DIRS)))
tmpauto :=$(call mkdir_deps,GENERATED_DIRS)
GENERATED_DIRS_DEPS +=$(tmpauto)
GARBAGE_DIRS +=$(GENERATED_DIRS)
@ -88,6 +81,7 @@ endif
#################################################################
AUTO_DEPS +=$(GENERATED_DIRS_DEPS)
AUTO_DEPS := $(strip $(sort $(AUTO_DEPS)))
# Complain loudly if deps have not loaded so getargv != $(NULL)
$(call requiredfunction,getargv)

10
js/src/config/makefiles/makeutils.mk
View File

@ -45,11 +45,11 @@ subargv =$(wordlist $(1),$(words $(getargv)),$(getargv))
# $(NULL)
# target: $(target-preqs)
banner =\
$(info )\
$(info ***************************************************************************)\
$(info ** $(getargv))\
$(info ***************************************************************************)\
banner = \
$(info ) \
$(info ***************************************************************************) \
$(info ** $(getargv)) \
$(info ***************************************************************************) \
$(NULL)
#####################################################################

2
js/src/config/rules.mk
View File

@ -116,7 +116,7 @@ cppunittests-remote:
--localLib=$(DEPTH)/dist/$(MOZ_APP_NAME) \
--dm_trans=$(DM_TRANS) \
--deviceIP=${TEST_DEVICE} \
$(subst .cpp,$(BIN_SUFFIX),$(CPP_UNIT_TESTS)) $(EXTRA_TEST_ARGS); \
$(subst .cpp,$(BIN_SUFFIX),$(CPP_UNIT_TESTS)) $(EXTRA_TEST_ARGS); \
else \
echo "please prepare your host with environment variables for TEST_DEVICE"; \
fi