Bug 785622 - Only include .pp files corresponding to files we do build. r=khuey

This commit is contained in:
Mike Hommey 2012-08-29 08:55:58 +02:00
parent 2c1a2e9335
commit 6f9fd5c1fe
6 changed files with 8 additions and 4 deletions

View File

@ -44,7 +44,7 @@ def InvokeClWithDependencyGeneration(cmdline):
if ret != 0 or target == "":
sys.exit(ret)
depsdir = os.path.normpath(os.path.join(os.path.dirname(target), ".deps"))
depsdir = os.path.normpath(os.path.join(os.curdir, ".deps"))
depstarget = os.path.join(depsdir, depstarget)
if not os.path.isdir(depsdir):
try:

View File

@ -1497,7 +1497,7 @@ $(CURDIR)/$(MDDEPDIR):
$(MKDIR) -p $@
ifneq (,$(filter-out all chrome default export realchrome tools clean clobber clobber_all distclean realclean,$(MAKECMDGOALS)))
MDDEPEND_FILES := $(strip $(wildcard $(MDDEPDIR)/*.pp))
MDDEPEND_FILES := $(strip $(wildcard $(foreach file,$(OBJS) $(PROGOBJS) $(HOST_OBJS) $(HOST_PROGOBJS) $(TARGETS) $(XPIDLSRCS:.idl=.h) $(XPIDLSRCS:.idl=.xpt),$(MDDEPDIR)/$(notdir $(file)).pp) $(addprefix $(MDDEPDIR)/,$(EXTRA_MDDEPEND_FILES))))
ifneq (,$(MDDEPEND_FILES))
# The script mddepend.pl checks the dependencies and writes to stdout

View File

@ -44,7 +44,7 @@ def InvokeClWithDependencyGeneration(cmdline):
if ret != 0 or target == "":
sys.exit(ret)
depsdir = os.path.normpath(os.path.join(os.path.dirname(target), ".deps"))
depsdir = os.path.normpath(os.path.join(os.curdir, ".deps"))
depstarget = os.path.join(depsdir, depstarget)
if not os.path.isdir(depsdir):
try:

View File

@ -1497,7 +1497,7 @@ $(CURDIR)/$(MDDEPDIR):
$(MKDIR) -p $@
ifneq (,$(filter-out all chrome default export realchrome tools clean clobber clobber_all distclean realclean,$(MAKECMDGOALS)))
MDDEPEND_FILES := $(strip $(wildcard $(MDDEPDIR)/*.pp))
MDDEPEND_FILES := $(strip $(wildcard $(foreach file,$(OBJS) $(PROGOBJS) $(HOST_OBJS) $(HOST_PROGOBJS) $(TARGETS) $(XPIDLSRCS:.idl=.h) $(XPIDLSRCS:.idl=.xpt),$(MDDEPDIR)/$(notdir $(file)).pp) $(addprefix $(MDDEPDIR)/,$(EXTRA_MDDEPEND_FILES))))
ifneq (,$(MDDEPEND_FILES))
# The script mddepend.pl checks the dependencies and writes to stdout

View File

@ -83,6 +83,8 @@ SHARED_LIBRARY_LIBS = \
../wrappers/$(LIB_PREFIX)xpcwrappers_s.$(LIB_SUFFIX) \
$(NULL)
EXTRA_MDDEPEND_FILES = dom_qsgen.pp dombindingsgen.pp dictionary_helper_gen.pp event_impl_gen.pp
include $(topsrcdir)/config/rules.mk
DEFINES += \

View File

@ -483,6 +483,8 @@ endif
endif
EXTRA_MDDEPEND_FILES = asm_enc_offsets.s.pp asm_enc_offsets.$(OBJ_SUFFIX).pp asm_com_offsets.s.pp asm_com_offsets.$(OBJ_SUFFIX).pp
include $(topsrcdir)/config/rules.mk
# This must be after rules.mk in order to use $(OBJ_SUFFIX) outside a