squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Correct make rules a bit.

Browse source
This commit is contained in:
Graydon Hoare 2011-06-30 13:41:20 -07:00
parent 39fccf3bc7
commit df8161d44c
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Makefile.in
View file

@ -230,7 +230,7 @@ endif
config.mk: $(S)configure $(S)Makefile.in $(S)src/snapshots.txt
@$(call E, cfg: reconfiguring)
$(S)configure $(CFG_CONFIGURE_ARGS)
$(Q)$(S)configure $(CFG_CONFIGURE_ARGS)
######################################################################
@ -253,28 +253,33 @@ include $(CFG_SRC_DIR)/mk/docs.mk
# Secondary makefiles, conditionalized for speed
######################################################################
ifneq ($(findstring dist,$(MAKECMDGOALS)),)
ifneq ($(strip $(findstring dist,$(MAKECMDGOALS)) \
$(findstring check,$(MAKECMDGOALS)) \
$(findstring test,$(MAKECMDGOALS)) \
$(findstring clean,$(MAKECMDGOALS))),)
CFG_INFO := $(info cfg: including dist rules)
include $(CFG_SRC_DIR)/mk/dist.mk
endif
ifneq ($(findstring snap,$(MAKECMDGOALS)),)
ifneq ($(strip $(findstring snap,$(MAKECMDGOALS)) \
$(findstring clean,$(MAKECMDGOALS))),)
CFG_INFO := $(info cfg: including snap rules)
include $(CFG_SRC_DIR)/mk/snap.mk
endif
ifneq ($(findstring reformat,$(MAKECMDGOALS)),)
CFG_INFO := $(info cfg: including reformat rules)
include $(CFG_SRC_DIR)/mk/pp.mk
endif
ifneq ($(findstring check,$(MAKECMDGOALS))\
$(findstring test,$(MAKECMDGOALS))\
$(findstring tidy,$(MAKECMDGOALS)),)
include $(CFG_SRC_DIR)/mk/dist.mk
ifneq ($(strip $(findstring check,$(MAKECMDGOALS)) \
$(findstring test,$(MAKECMDGOALS)) \
$(findstring tidy,$(MAKECMDGOALS))),)
CFG_INFO := $(info cfg: including test rules)
include $(CFG_SRC_DIR)/mk/tests.mk
endif
ifneq ($(findstring clean,$(MAKECMDGOALS)),)
include $(CFG_SRC_DIR)/mk/dist.mk
include $(CFG_SRC_DIR)/mk/snap.mk
include $(CFG_SRC_DIR)/mk/tests.mk
CFG_INFO := $(info cfg: including clean rules)
include $(CFG_SRC_DIR)/mk/clean.mk
endif