add "update" to the list of targets to ignore various included files for and
check the targets in a little bit different way git-svn-id: http://svn.digium.com/svn/asterisk/trunk@37477 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
4e4fb4bdec
commit
75abdcd730
8
Makefile
8
Makefile
|
@ -123,14 +123,14 @@ GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
|
|||
USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
|
||||
|
||||
ifneq ($(wildcard menuselect.makeopts),)
|
||||
ifeq ($(findstring clean,$(MAKECMDGOALS))$(findstring distclean,$(MAKECMDGOALS)),)
|
||||
ifeq ($(foreach target,clean distclean update,$(findstring $(target),$(MAKECMDGOALS))),)
|
||||
include menuselect.makeopts
|
||||
include menuselect.makedeps
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq ($(wildcard makeopts),)
|
||||
ifeq ($(findstring clean,$(MAKECMDGOALS))$(findstring distclean,$(MAKECMDGOALS)),)
|
||||
ifeq ($(foreach target,clean distclean update,$(findstring $(target),$(MAKECMDGOALS))),)
|
||||
include makeopts
|
||||
endif
|
||||
endif
|
||||
|
@ -427,13 +427,13 @@ db1-ast/libdb1.a:
|
|||
$(MAKE) -C db1-ast libdb1.a
|
||||
|
||||
ifneq ($(wildcard .depend),)
|
||||
ifeq ($(findstring clean,$(MAKECMDGOALS))$(findstring distclean,$(MAKECMDGOALS)),)
|
||||
ifeq ($(foreach target,clean distclean update,$(findstring $(target),$(MAKECMDGOALS))),)
|
||||
include .depend
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq ($(wildcard .tags-depend),)
|
||||
ifeq ($(findstring clean,$(MAKECMDGOALS))$(findstring distclean,$(MAKECMDGOALS)),)
|
||||
ifeq ($(foreach target,clean distclean update,$(findstring $(target),$(MAKECMDGOALS))),)
|
||||
include .tags-depend
|
||||
endif
|
||||
endif
|
||||
|
|
Reference in New Issue