Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 608036 - Cleanup some of client.mk r=khuey a=NPOTB

Browse Source 
--HG--
extra : rebase_source : fbf93e2ba4ea8c8e83dce84424c808accae6c566
This commit is contained in:
Justin Wood 2010-10-28 14:15:15 -04:00
parent e89b938b37
commit ed47071897
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client.mk
View File

@ -69,8 +69,7 @@
#
#######################################################################
# Defines
#
CVS = cvs
comma := ,
CWD := $(CURDIR)
@ -107,7 +106,6 @@ endif
PERL ?= perl
PYTHON ?= python
RUN_AUTOCONF_LOCALLY = 1
CONFIG_GUESS_SCRIPT := $(wildcard $(TOPSRCDIR)/build/autoconf/config.guess)
ifdef CONFIG_GUESS_SCRIPT
CONFIG_GUESS = $(shell $(CONFIG_GUESS_SCRIPT))
@ -170,7 +168,6 @@ CONFIGURES += $(TOPSRCDIR)/js/src/configure
#######################################################################
# Rules
#
# The default rule is build
build::
@ -272,7 +269,6 @@ else
CONFIG_STATUS = $(wildcard $(OBJDIR)/config.status)
CONFIG_CACHE = $(wildcard $(OBJDIR)/config.cache)
ifdef RUN_AUTOCONF_LOCALLY
EXTRA_CONFIG_DEPS := \
$(TOPSRCDIR)/aclocal.m4 \
$(wildcard $(TOPSRCDIR)/build/autoconf/*.m4) \
@ -282,7 +278,6 @@ EXTRA_CONFIG_DEPS := \
$(CONFIGURES): %: %.in $(EXTRA_CONFIG_DEPS)
@echo Generating $@ using autoconf
cd $(@D); $(AUTOCONF)
endif
CONFIG_STATUS_DEPS := \
$(wildcard $(CONFIGURES)) \
@ -290,8 +285,7 @@ CONFIG_STATUS_DEPS := \
$(TOPSRCDIR)/.mozconfig.mk \
$(wildcard $(TOPSRCDIR)/nsprpub/configure) \
$(wildcard $(TOPSRCDIR)/config/milestone.txt) \
$(wildcard $(TOPSRCDIR)/config/chrome-versions.sh) \
$(wildcard $(addsuffix confvars.sh,$(wildcard $(TOPSRCDIR)/*/))) \
$(wildcard $(addsuffix confvars.sh,$(wildcard $(TOPSRCDIR)/*/))) \
$(NULL)
# configure uses the program name to determine @srcdir@. Calling it without
@ -303,10 +297,6 @@ else
CONFIGURE = $(TOPSRCDIR)/configure
endif
ifdef MOZ_TOOLS
CONFIGURE = $(TOPSRCDIR)/configure
endif
configure-files: $(CONFIGURES)
configure:: configure-files
@ -417,4 +407,4 @@ echo-variable-%:
# in parallel.
.NOTPARALLEL:
.PHONY: checkout real_checkout depend build profiledbuild maybe_clobber_profiledbuild export libs alldep install clean realclean distclean cleansrcdir pull_all build_all clobber clobber_all pull_and_build_all everything configure preflight_all preflight postflight postflight_all
.PHONY: checkout real_checkout depend build profiledbuild maybe_clobber_profiledbuild export libs alldep install clean realclean distclean cleansrcdir pull_all build_all clobber clobber_all pull_and_build_all everything configure preflight_all preflight postflight postflight_all upload sdk