Skip to content
Snippets Groups Projects
Commit 407c91a0 authored by Russell Bryant's avatar Russell Bryant
Browse files

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: https://origsvn.digium.com/svn/asterisk/trunk@37477 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 90098fa1
Branches
Tags
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment