author | Mitchell Field <mitchell.field@live.com.au> |
Sun, 03 Apr 2011 17:16:49 +1000 | |
changeset 67702 | f066b09198b33be73f6d73298dc18f6acca91c33 |
parent 64649 | 4e4c7457e8f78669a000b1183e31d1cee6cfc6a6 |
child 67703 | 09fdd8059a417e28ca731330cf00053a975f909a |
push id | 1 |
push user | root |
push date | Tue, 26 Apr 2011 22:38:44 +0000 |
treeherder | mozilla-beta@bfdb6e623a36 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | khuey |
bugs | 645356 |
milestone | 2.2a1pre |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
Makefile.in | file | annotate | diff | comparison | revisions | |
browser/app/Makefile.in | file | annotate | diff | comparison | revisions | |
browser/installer/windows/Makefile.in | file | annotate | diff | comparison | revisions | |
config/Makefile.in | file | annotate | diff | comparison | revisions | |
config/config.mk | file | annotate | diff | comparison | revisions | |
config/rules.mk | file | annotate | diff | comparison | revisions | |
js/src/Makefile.in | file | annotate | diff | comparison | revisions | |
js/src/config/config.mk | file | annotate | diff | comparison | revisions | |
js/src/config/rules.mk | file | annotate | diff | comparison | revisions |
--- a/Makefile.in +++ b/Makefile.in @@ -89,22 +89,22 @@ DIST_GARBAGE = config.cache config.log c $(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out ifdef WINCE check:: $(PYTHON) $(topsrcdir)/build/mobile/devicemanager-utils.py copy $(DIST)/bin endif default alldep all:: $(topsrcdir)/configure config.status - $(RM) -rf $(DIST)/sdk - $(RM) -rf $(DIST)/include - $(RM) -rf $(DIST)/private - $(RM) -rf $(DIST)/public - $(RM) -rf $(DIST)/bin/components - $(RM) -rf _tests + $(RM) -r $(DIST)/sdk + $(RM) -r $(DIST)/include + $(RM) -r $(DIST)/private + $(RM) -r $(DIST)/public + $(RM) -r $(DIST)/bin/components + $(RM) -r _tests $(topsrcdir)/configure: $(topsrcdir)/configure.in @echo "STOP! configure.in has changed, and your configure is out of date." @echo "Please rerun autoconf and re-configure your build directory." @echo "To ignore this message, touch 'configure' in the source directory," @echo "but your build might not succeed." @exit 1 @@ -112,30 +112,30 @@ config.status: $(topsrcdir)/configure @echo "STOP! configure has changed and needs to be run in this build directory." @echo "Please rerun configure." @echo "To ignore this message, touch 'config.status' in the build directory," @echo "but your build might not succeed." @exit 1 # Build pseudo-external modules first when export is explicitly called export:: - $(RM) -rf $(DIST)/sdk + $(RM) -r $(DIST)/sdk $(MAKE) -C config export $(MAKE) tier_nspr ifdef ENABLE_TESTS # Additional makefile targets to call automated test suites include $(topsrcdir)/testing/testsuite-targets.mk endif include $(topsrcdir)/config/rules.mk distclean:: cat unallmakefiles | $(XARGS) rm -f - rm -f unallmakefiles $(DIST_GARBAGE) + $(RM) unallmakefiles $(DIST_GARBAGE) ifeq ($(OS_ARCH),WINNT) # we want to copy PDB files on Windows MAKE_SYM_STORE_ARGS := -c --vcs-info ifdef PDBSTR_PATH MAKE_SYM_STORE_ARGS += -i endif DUMP_SYMS_BIN ?= $(topsrcdir)/toolkit/crashreporter/tools/win32/dump_syms_vc$(_MSC_VER).exe @@ -171,18 +171,18 @@ export SYMBOL_INDEX_NAME = \ $(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_TARGET)-$(BUILDID)$(EXTRA_BUILDID)-symbols.txt buildsymbols: ifdef MOZ_CRASHREPORTER ifdef USE_ELF_HACK $(MAKE) -C $(MOZ_BUILD_APP)/installer elfhack endif echo building symbol store - $(RM) -rf $(DIST)/crashreporter-symbols - $(RM) -f "$(DIST)/$(SYMBOL_ARCHIVE_BASENAME).zip" + $(RM) -r $(DIST)/crashreporter-symbols + $(RM) "$(DIST)/$(SYMBOL_ARCHIVE_BASENAME).zip" $(NSINSTALL) -D $(DIST)/crashreporter-symbols $(PYTHON) $(topsrcdir)/toolkit/crashreporter/tools/symbolstore.py \ $(MAKE_SYM_STORE_ARGS) \ $(foreach dir,$(SYM_STORE_SOURCE_DIRS),-s $(dir)) \ $(DUMP_SYMS_BIN) \ $(DIST)/crashreporter-symbols \ $(MAKE_SYM_STORE_PATH) > \ $(DIST)/crashreporter-symbols/$(SYMBOL_INDEX_NAME) @@ -194,18 +194,18 @@ endif grep "sym" $(SYMBOL_INDEX_NAME) > $(SYMBOL_INDEX_NAME).tmp && \ mv $(SYMBOL_INDEX_NAME).tmp $(SYMBOL_INDEX_NAME) cd $(DIST)/crashreporter-symbols && \ zip -r9D "../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip" . -i "*.sym" -i "*.txt" else ifdef WINCE ifdef SYMBOLSTORE_PATH echo building symbol store with symstore.exe - $(RM) -rf $(DIST)/symbols - $(RM) -f "$(DIST)/$(SYMBOL_ARCHIVE_BASENAME).zip" + $(RM) -r $(DIST)/symbols + $(RM) "$(DIST)/$(SYMBOL_ARCHIVE_BASENAME).zip" $(NSINSTALL) -D $(DIST)/symbols $(SYMBOLSTORE_PATH) add -r -f "$(subst /,\,$(shell pwd -W))\*.PDB" \ -s $(DIST)/symbols/ -t "$(MOZ_PKG_APPNAME)" -v "$(MOZ_PKG_VERSION)" echo packing symbols $(NSINSTALL) -D $(DIST)/$(PKG_PATH) cd $(DIST)/symbols && \ zip -r9D "../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip" . endif # SYMBOLSTORE_PATH
--- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -313,37 +313,37 @@ endif LOWER_APP_NAME = $(shell echo $(APP_NAME) | tr '[A-Z]' '[a-z]') AB_CD = $(MOZ_UI_LOCALE) AB := $(firstword $(subst -, ,$(AB_CD))) clean clobber repackage:: - rm -rf $(DIST)/$(APP_NAME).app + $(RM) -r $(DIST)/$(APP_NAME).app ifdef LIBXUL_SDK APPFILES = Resources else APPFILES = MacOS endif libs repackage:: $(PROGRAM) application.ini - mkdir -p $(DIST)/$(APP_NAME).app/Contents/MacOS + $(MKDIR) -p $(DIST)/$(APP_NAME).app/Contents/MacOS rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app --exclude English.lproj - mkdir -p $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj + $(MKDIR) -p $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj sed -e "s/%APP_VERSION%/$(APP_VERSION)/" -e "s/%APP_NAME%/$(APP_NAME)/" -e "s/%LOWER_APP_NAME%/$(LOWER_APP_NAME)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist sed -e "s/%APP_NAME%/$(APP_NAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj/InfoPlist.strings rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/$(APPFILES) $(RM) $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/mangle $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/shlibsign ifdef LIBXUL_SDK cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/firefox-bin else - rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM) + $(RM) $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM) rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS endif -cp -L $(DIST)/bin/mangle $(DIST)/bin/shlibsign $(DIST)/$(APP_NAME).app/Contents/$(APPFILES) cp -RL $(DIST)/branding/firefox.icns $(DIST)/$(APP_NAME).app/Contents/Resources/firefox.icns cp -RL $(DIST)/branding/document.icns $(DIST)/$(APP_NAME).app/Contents/Resources/document.icns printf APPLMOZB > $(DIST)/$(APP_NAME).app/Contents/PkgInfo # remove CVS dirs from packaged app find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \;
--- a/browser/installer/windows/Makefile.in +++ b/browser/installer/windows/Makefile.in @@ -89,27 +89,29 @@ endif installer:: $(MAKE) -C .. installer-stage $(MAKE) $(CONFIG_DIR)/setup.exe # For building the uninstaller during the application build so it can be # included for mar file generation. uninstaller:: - $(RM) -rf $(CONFIG_DIR) && mkdir $(CONFIG_DIR) + $(RM) -r $(CONFIG_DIR) + $(MKDIR) $(CONFIG_DIR) $(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR) $(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR) $(PYTHON) $(topsrcdir)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) \ $(srcdir)/nsis/defines.nsi.in > $(CONFIG_DIR)/defines.nsi $(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \ --preprocess-locale $(topsrcdir) \ $(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR) $(CONFIG_DIR)/setup.exe:: - $(RM) -rf $(CONFIG_DIR) && mkdir $(CONFIG_DIR) + $(RM) -r $(CONFIG_DIR) + $(MKDIR) $(CONFIG_DIR) $(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR) $(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR) $(PYTHON) $(topsrcdir)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) \ $(srcdir)/nsis/defines.nsi.in > $(CONFIG_DIR)/defines.nsi $(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \ --preprocess-locale $(topsrcdir) \ $(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR)
--- a/config/Makefile.in +++ b/config/Makefile.in @@ -99,18 +99,17 @@ endif HEADERS = \ $(DEPTH)/mozilla-config.h \ $(srcdir)/nsStaticComponents.h \ $(NULL) export:: $(TARGETS) $(HEADERS) $(INSTALL) $(IFLAGS1) $(HEADERS) $(DIST)/include - -rm -f $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES) - -rm -f $(DIST)/bin/chrome/chromelist.txt + -$(RM) $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES) ifdef HOST_PROGRAM $(INSTALL) $(HOST_PROGRAM) $(DIST)/bin endif # Generate a new buildid every time we "export" in config... that's only # supposed to be once per-build! export:: ifdef MOZ_BUILD_DATE
--- a/config/config.mk +++ b/config/config.mk @@ -154,16 +154,19 @@ JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(c ifneq (,$(SIMPLE_PROGRAMS)$(PROGRAM)) JEMALLOC_LIBS += $(MOZ_JEMALLOC_STANDALONE_GLUE_LDOPTS) endif endif endif CC := $(CC_WRAPPER) $(CC) CXX := $(CXX_WRAPPER) $(CXX) +MKDIR ?= mkdir +SLEEP ?= sleep +TOUCH ?= touch # determine debug-related options _DEBUG_CFLAGS := _DEBUG_LDFLAGS := ifdef MOZ_DEBUG _DEBUG_CFLAGS += $(MOZ_DEBUG_ENABLE_DEFS) $(MOZ_DEBUG_FLAGS) _DEBUG_LDFLAGS += $(MOZ_DEBUG_LDFLAGS)
--- a/config/rules.mk +++ b/config/rules.mk @@ -929,42 +929,42 @@ endif # MOZ_PROFILE_GENERATE || MOZ_PROF endif # NO_PROFILE_GUIDED_OPTIMIZE ############################################## checkout: $(MAKE) -C $(topsrcdir) -f client.mk checkout clean clobber realclean clobber_all:: $(SUBMAKEFILES) - -rm -f $(ALL_TRASH) - -rm -rf $(ALL_TRASH_DIRS) + -$(RM) $(ALL_TRASH) + -$(RM) -r $(ALL_TRASH_DIRS) $(foreach dir,$(PARALLEL_DIRS) $(DIRS) $(STATIC_DIRS) $(TOOL_DIRS),-$(call SUBMAKE,$@,$(dir))) distclean:: $(SUBMAKEFILES) $(foreach dir,$(PARALLEL_DIRS) $(DIRS) $(STATIC_DIRS) $(TOOL_DIRS),-$(call SUBMAKE,$@,$(dir))) - -rm -rf $(ALL_TRASH_DIRS) - -rm -f $(ALL_TRASH) \ + -$(RM) -r $(ALL_TRASH_DIRS) + -$(RM) $(ALL_TRASH) \ Makefile .HSancillary \ $(wildcard *.$(OBJ_SUFFIX)) $(wildcard *.ho) $(wildcard host_*.o*) \ $(wildcard *.$(LIB_SUFFIX)) $(wildcard *$(DLL_SUFFIX)) \ $(wildcard *.$(IMPORT_LIB_SUFFIX)) ifeq ($(OS_ARCH),OS2) - -rm -f $(PROGRAM:.exe=.map) + -$(RM) $(PROGRAM:.exe=.map) endif alltags: - rm -f TAGS + $(RM) TAGS find $(topsrcdir) -name dist -prune -o \( -name '*.[hc]' -o -name '*.cp' -o -name '*.cpp' -o -name '*.idl' \) -print | $(TAG_PROGRAM) # # PROGRAM = Foo # creates OBJS, links with LIBS to create Foo # $(PROGRAM): $(PROGOBJS) $(LIBS_DEPS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) $(GLOBAL_DEPS) - @rm -f $@.manifest + @$(RM) $@.manifest ifeq (WINCE,$(OS_ARCH)) $(EXPAND_LD) -NOLOGO -OUT:$@ $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) else ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) $(EXPAND_LD) -NOLOGO -OUT:$@ -PDB:$(LINK_PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) ifdef MSMANIFEST_TOOL @if test -f $@.manifest; then \ if test -f "$(srcdir)/$@.manifest"; then \ @@ -1105,46 +1105,46 @@ ifndef NO_DIST_INSTALL $(INSTALL) $(IFLAGS2) $^.quantify $(FINAL_TARGET) endif ifdef DTRACE_PROBE_OBJ EXTRA_DEPS += $(DTRACE_PROBE_OBJ) endif $(filter %.$(LIB_SUFFIX),$(LIBRARY)): $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS_DEPS) $(EXTRA_DEPS) $(GLOBAL_DEPS) - rm -f $(LIBRARY) + $(RM) $(LIBRARY) $(EXPAND_AR) $(AR_FLAGS) $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS) $(RANLIB) $@ $(filter-out %.$(LIB_SUFFIX),$(LIBRARY)): $(filter %.$(LIB_SUFFIX),$(LIBRARY)) $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS_DEPS) $(EXTRA_DEPS) $(GLOBAL_DEPS) $(EXPAND_LIBS_GEN) $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS) > $@ ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH))) $(IMPORT_LIBRARY): $(SHARED_LIBRARY) endif ifeq ($(OS_ARCH),OS2) $(DEF_FILE): $(OBJS) $(SHARED_LIBRARY_LIBS) - rm -f $@ + $(RM) $@ echo LIBRARY $(SHARED_LIBRARY_NAME) INITINSTANCE TERMINSTANCE > $@ echo PROTMODE >> $@ echo CODE LOADONCALL MOVEABLE DISCARDABLE >> $@ echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >> $@ echo EXPORTS >> $@ $(ADD_TO_DEF_FILE) $(IMPORT_LIBRARY): $(SHARED_LIBRARY) - rm -f $@ + $(RM) $@ $(IMPLIB) $@ $^ $(RANLIB) $@ endif # OS/2 $(HOST_LIBRARY): $(HOST_OBJS) Makefile - rm -f $@ + $(RM) $@ $(HOST_AR) $(HOST_AR_FLAGS) $(HOST_OBJS) $(HOST_RANLIB) $@ ifdef HAVE_DTRACE ifndef XP_MACOSX ifdef DTRACE_PROBE_OBJ ifndef DTRACE_LIB_DEPENDENT $(DTRACE_PROBE_OBJ): $(OBJS) @@ -1156,24 +1156,24 @@ endif # On Darwin (Mac OS X), dwarf2 debugging uses debug info left in .o files, # so instead of deleting .o files after repacking them into a dylib, we make # symlinks back to the originals. The symlinks are a no-op for stabs debugging, # so no need to conditionalize on OS version or debugging format. $(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS_DEPS) $(LIBRARY) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) $(GLOBAL_DEPS) ifndef INCREMENTAL_LINKER - rm -f $@ + $(RM) $@ endif ifdef DTRACE_LIB_DEPENDENT ifndef XP_MACOSX dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS)) endif $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) - @rm -f $(DTRACE_PROBE_OBJ) + @$(RM) $(DTRACE_PROBE_OBJ) else # ! DTRACE_LIB_DEPENDENT $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(DTRACE_PROBE_OBJ) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) endif # DTRACE_LIB_DEPENDENT ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) ifdef MSMANIFEST_TOOL ifdef EMBED_MANIFEST_AT @if test -f $@.manifest; then \ @@ -1181,17 +1181,17 @@ ifdef EMBED_MANIFEST_AT rm -f $@.manifest; \ fi endif # EMBED_MANIFEST_AT endif # MSVC with manifest tool ifdef MOZ_PROFILE_GENERATE touch -t `date +%Y%m%d%H%M.%S -d "now+5seconds"` pgo.relink endif endif # WINNT && !GCC - @rm -f foodummyfilefoo $(DELETE_AFTER_LINK) + @$(RM) foodummyfilefoo $(DELETE_AFTER_LINK) chmod +x $@ ifdef ENABLE_STRIP $(STRIP) $@ endif ifdef MOZ_POST_DSO_LIB_COMMAND $(MOZ_POST_DSO_LIB_COMMAND) $@ endif @@ -1297,17 +1297,17 @@ endif $(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $(_VPATH_SRCS) %.$(OBJ_SUFFIX): %.cpp $(GLOBAL_DEPS) $(REPORT_BUILD) @$(MAKE_DEPS_AUTO_CXX) ifdef STRICT_CPLUSPLUS_SUFFIX echo "#line 1 \"$*.cpp\"" | cat - $*.cpp > t_$*.cc $(ELOG) $(CCC) -o $@ -c $(COMPILE_CXXFLAGS) t_$*.cc - rm -f t_$*.cc + $(RM) t_$*.cc else $(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $(_VPATH_SRCS) endif #STRICT_CPLUSPLUS_SUFFIX $(OBJ_PREFIX)%.$(OBJ_SUFFIX): %.mm $(GLOBAL_DEPS) $(REPORT_BUILD) @$(MAKE_DEPS_AUTO_CXX) $(ELOG) $(CCC) -o $@ -c $(COMPILE_CXXFLAGS) $(COMPILE_CMMFLAGS) $(_VPATH_SRCS) @@ -1347,22 +1347,24 @@ ifdef GNU_CC $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) $(OUTOPTION)$@ $(_VPATH_SRCS) else $(RC) $(RCFLAGS) -r $(DEFINES) $(INCLUDES) $(OUTOPTION)$@ $(_VPATH_SRCS) endif endif # need 3 separate lines for OS/2 %:: %.pl - rm -f $@ + $(RM) $@ cp $< $@ chmod +x $@ %:: %.sh - rm -f $@; cp $< $@; chmod +x $@ + $(RM) $@ + cp $< $@ + chmod +x $@ # Cancel these implicit rules # %: %,v %: RCS/%,v %: s.% @@ -1549,18 +1551,18 @@ export:: FORCE endif $(IDL_DIR):: $(NSINSTALL) -D $@ # generate .h files from into $(XPIDL_GEN_DIR), then export to $(DIST)/include; # warn against overriding existing .h file. $(XPIDL_GEN_DIR)/.done: - @if test ! -d $(XPIDL_GEN_DIR); then echo Creating $(XPIDL_GEN_DIR)/.done; rm -rf $(XPIDL_GEN_DIR); mkdir $(XPIDL_GEN_DIR); fi - @touch $@ + $(MKDIR) -p $(XPIDL_GEN_DIR) + @$(TOUCH) $@ # don't depend on $(XPIDL_GEN_DIR), because the modification date changes # with any addition to the directory, regenerating all .h files -> everything. $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_COMPILE) $(XPIDL_GEN_DIR)/.done $(REPORT_BUILD) $(ELOG) $(XPIDL_COMPILE) -m header -w $(XPIDL_FLAGS) -o $(XPIDL_GEN_DIR)/$* $(_VPATH_SRCS) @if test -n "$(findstring $*.h, $(EXPORTS))"; \ @@ -1646,17 +1648,17 @@ GARBAGE_DIRS += $(JAVA_GEN_DIR) # generate .java files into _javagen/[package name dirs] _JAVA_GEN_DIR = $(JAVA_GEN_DIR)/$(JAVA_IFACES_PKG_NAME) $(_JAVA_GEN_DIR): $(NSINSTALL) -D $@ $(JAVA_GEN_DIR)/.%.java.pp: %.idl $(XPIDL_COMPILE) $(_JAVA_GEN_DIR) $(REPORT_BUILD) $(ELOG) $(XPIDL_COMPILE) -m java -w $(XPIDL_FLAGS) -I$(srcdir) -I$(IDL_DIR) -o $(_JAVA_GEN_DIR)/$* $(_VPATH_SRCS) - @touch $@ + @$(TOUCH) $@ # "Install" generated Java interfaces. We segregate them based on the XPI_NAME. # If XPI_NAME is not set, install into the "default" directory. ifneq ($(XPI_NAME),) JAVA_INSTALL_DIR = $(JAVA_DIST_DIR)/$(XPI_NAME) else JAVA_INSTALL_DIR = $(JAVA_DIST_DIR)/default endif @@ -1844,17 +1846,17 @@ endif endif ifdef INSTALL_EXTENSION_ID ifndef XPI_NAME $(error XPI_NAME must be set for INSTALL_EXTENSION_ID) endif libs:: - $(RM) -rf "$(DIST)/bin/extensions/$(INSTALL_EXTENSION_ID)" + $(RM) -r "$(DIST)/bin/extensions/$(INSTALL_EXTENSION_ID)" $(NSINSTALL) -D "$(DIST)/bin/extensions/$(INSTALL_EXTENSION_ID)" cd $(FINAL_TARGET) && tar $(TAR_CREATE_FLAGS) - . | (cd "../../bin/extensions/$(INSTALL_EXTENSION_ID)" && tar -xf -) endif ifneq (,$(filter flat symlink,$(MOZ_CHROME_FILE_FORMAT))) _JAR_REGCHROME_DISABLE_JAR=1 else @@ -1916,17 +1918,17 @@ depend:: $(SUBMAKEFILES) $(MAKE_DIRS) $( else depend:: $(SUBMAKEFILES) endif $(LOOP_OVER_PARALLEL_DIRS) $(LOOP_OVER_DIRS) $(LOOP_OVER_TOOL_DIRS) dependclean:: $(SUBMAKEFILES) - rm -f $(MDDEPFILES) + $(RM) $(MDDEPFILES) $(LOOP_OVER_PARALLEL_DIRS) $(LOOP_OVER_DIRS) $(LOOP_OVER_TOOL_DIRS) endif # MOZ_AUTO_DEPS endif # COMPILER_DEPEND @@ -1939,17 +1941,17 @@ endif # COMPILER_DEPEND # # We use $(CURDIR) in the rule's target to ensure that we don't find # a dependency directory in the source tree via VPATH (perhaps from # a previous build in the source tree) and thus neglect to create a # dependency directory in the object directory, where we really need # it. $(CURDIR)/$(MDDEPDIR): - @if test ! -d $@; then echo Creating $@; rm -rf $@; mkdir $@; else true; fi + $(MKDIR) -p $@ ifneq (,$(filter-out all chrome default export realchrome tools clean clobber clobber_all distclean realclean,$(MAKECMDGOALS))) ifneq (,$(OBJS)$(XPIDLSRCS)$(SIMPLE_PROGRAMS)) MDDEPEND_FILES := $(strip $(wildcard $(MDDEPDIR)/*.pp)) ifneq (,$(MDDEPEND_FILES)) # The script mddepend.pl checks the dependencies and writes to stdout # one rule to force out-of-date objects. For example,
--- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -653,21 +653,21 @@ check-valgrind:: endif DIST_GARBAGE = config.cache config.log config.status \ config/autoconf.mk \ unallmakefiles js-config js-config.h js-confdefs.h distclean:: cat unallmakefiles | $(XARGS) rm -f - rm -f $(DIST_GARBAGE) + $(RM) $(DIST_GARBAGE) # our build system doesn't handle subdir srcs very gracefully today export:: - mkdir -p nanojit + $(MKDIR) -p nanojit DEFINES += -DEXPORT_JS_API # Some platforms that have stdint.h include it in system headers. So # to reliably get limit macros defined, we'd always have to define the # one below before including any header, but that's obscure and # fragile, so we do it here. DEFINES += -D__STDC_LIMIT_MACROS @@ -812,24 +812,24 @@ jsdtoa.o: jsdtoa.cpp Makefile.in @$(MAKE_DEPS_AUTO_CXX) $(CXX) -o $@ -c $(filter-out $(MOZ_OPTIMIZE_FLAGS), $(COMPILE_CFLAGS)) $< endif export:: jsautocfg.h ifeq (,$(CROSS_COMPILE)$(GNU_CC)$(filter-out WINNT,$(OS_ARCH))) jsautocfg.h: - touch $@ + $(TOUCH) $@ else ifeq ($(OS_ARCH),WINCE) jsautocfg.h: - touch $@ + $(TOUCH) $@ else jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) - @rm -f $@ jsautocfg.tmp + @$(RM) $@ jsautocfg.tmp ./jscpucfg > jsautocfg.tmp mv jsautocfg.tmp $@ endif endif # jscpucfg is a strange target # Needs to be built with the host compiler but needs to include # the mdcpucfg for the target so it needs the appropriate target defines @@ -879,17 +879,17 @@ JS_CONFIG_LIBS=$(EXTRA_DSO_LDOPTS) $(OS_ # which libraries to build, what to name them, and what flags to pass # when linking them (and thus what flags its own clients must pass). # All this information needs to go into the js-config script. To # avoid trying to re-compute all that in the configure script, we just # have the configure script generate this Makefile, and then invoke # this rule. at=@ js-config: js-config.in Makefile $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk $(topsrcdir)/config/rules.mk - rm -f js-config.tmp + $(RM) js-config.tmp sed < $< > js-config.tmp \ -e 's|$(at)prefix$(at)|$(prefix)|' \ -e 's|$(at)exec_prefix$(at)|$(exec_prefix)|' \ -e 's|$(at)includedir$(at)|$(includedir)|' \ -e 's|$(at)libdir$(at)|$(libdir)|' \ -e 's|$(at)MOZILLA_VERSION$(at)|$(MOZILLA_VERSION)|' \ -e 's|$(at)LIBRARY_NAME$(at)|$(LIBRARY_NAME)|' \ -e 's|$(at)NSPR_CFLAGS$(at)|$(NSPR_CFLAGS)|' \ @@ -955,17 +955,17 @@ ifdef ENABLE_TRACEJIT # Code for importing the nanojit subtree from its repository. NANOJIT_CENTRAL_REV=$(shell cat $(srcdir)/nanojit-import-rev) NANOJIT_CENTRAL_REPO=http://hg.mozilla.org/projects/nanojit-central NANOJIT_CENTRAL_LOCAL=$(CURDIR)/nanojit-central CUR_REPO=$(srcdir)/../.. update-nanojit: - rm -Rf $(NANOJIT_CENTRAL_LOCAL) import-splicemap import-revmap + $(RM) -r $(NANOJIT_CENTRAL_LOCAL) import-splicemap import-revmap hg clone $(NANOJIT_CENTRAL_REPO) $(NANOJIT_CENTRAL_LOCAL) python $(srcdir)/find-child.py \ --src=$(NANOJIT_CENTRAL_LOCAL) \ --dst=$(CUR_REPO) \ --start=$(NANOJIT_CENTRAL_REV) \ --filemap=$(srcdir)/nanojit-import-filemap \ >import-splicemap hg convert --config convert.hg.saverev=True \
--- a/js/src/config/config.mk +++ b/js/src/config/config.mk @@ -154,16 +154,19 @@ JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(c ifneq (,$(SIMPLE_PROGRAMS)$(PROGRAM)) JEMALLOC_LIBS += $(MOZ_JEMALLOC_STANDALONE_GLUE_LDOPTS) endif endif endif CC := $(CC_WRAPPER) $(CC) CXX := $(CXX_WRAPPER) $(CXX) +MKDIR ?= mkdir +SLEEP ?= sleep +TOUCH ?= touch # determine debug-related options _DEBUG_CFLAGS := _DEBUG_LDFLAGS := ifdef MOZ_DEBUG _DEBUG_CFLAGS += $(MOZ_DEBUG_ENABLE_DEFS) $(MOZ_DEBUG_FLAGS) _DEBUG_LDFLAGS += $(MOZ_DEBUG_LDFLAGS)
--- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -929,42 +929,42 @@ endif # MOZ_PROFILE_GENERATE || MOZ_PROF endif # NO_PROFILE_GUIDED_OPTIMIZE ############################################## checkout: $(MAKE) -C $(topsrcdir) -f client.mk checkout clean clobber realclean clobber_all:: $(SUBMAKEFILES) - -rm -f $(ALL_TRASH) - -rm -rf $(ALL_TRASH_DIRS) + -$(RM) $(ALL_TRASH) + -$(RM) -r $(ALL_TRASH_DIRS) $(foreach dir,$(PARALLEL_DIRS) $(DIRS) $(STATIC_DIRS) $(TOOL_DIRS),-$(call SUBMAKE,$@,$(dir))) distclean:: $(SUBMAKEFILES) $(foreach dir,$(PARALLEL_DIRS) $(DIRS) $(STATIC_DIRS) $(TOOL_DIRS),-$(call SUBMAKE,$@,$(dir))) - -rm -rf $(ALL_TRASH_DIRS) - -rm -f $(ALL_TRASH) \ + -$(RM) -r $(ALL_TRASH_DIRS) + -$(RM) $(ALL_TRASH) \ Makefile .HSancillary \ $(wildcard *.$(OBJ_SUFFIX)) $(wildcard *.ho) $(wildcard host_*.o*) \ $(wildcard *.$(LIB_SUFFIX)) $(wildcard *$(DLL_SUFFIX)) \ $(wildcard *.$(IMPORT_LIB_SUFFIX)) ifeq ($(OS_ARCH),OS2) - -rm -f $(PROGRAM:.exe=.map) + -$(RM) $(PROGRAM:.exe=.map) endif alltags: - rm -f TAGS + $(RM) TAGS find $(topsrcdir) -name dist -prune -o \( -name '*.[hc]' -o -name '*.cp' -o -name '*.cpp' -o -name '*.idl' \) -print | $(TAG_PROGRAM) # # PROGRAM = Foo # creates OBJS, links with LIBS to create Foo # $(PROGRAM): $(PROGOBJS) $(LIBS_DEPS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) $(GLOBAL_DEPS) - @rm -f $@.manifest + @$(RM) $@.manifest ifeq (WINCE,$(OS_ARCH)) $(EXPAND_LD) -NOLOGO -OUT:$@ $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) else ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) $(EXPAND_LD) -NOLOGO -OUT:$@ -PDB:$(LINK_PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) ifdef MSMANIFEST_TOOL @if test -f $@.manifest; then \ if test -f "$(srcdir)/$@.manifest"; then \ @@ -1105,46 +1105,46 @@ ifndef NO_DIST_INSTALL $(INSTALL) $(IFLAGS2) $^.quantify $(FINAL_TARGET) endif ifdef DTRACE_PROBE_OBJ EXTRA_DEPS += $(DTRACE_PROBE_OBJ) endif $(filter %.$(LIB_SUFFIX),$(LIBRARY)): $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS_DEPS) $(EXTRA_DEPS) $(GLOBAL_DEPS) - rm -f $(LIBRARY) + $(RM) $(LIBRARY) $(EXPAND_AR) $(AR_FLAGS) $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS) $(RANLIB) $@ $(filter-out %.$(LIB_SUFFIX),$(LIBRARY)): $(filter %.$(LIB_SUFFIX),$(LIBRARY)) $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS_DEPS) $(EXTRA_DEPS) $(GLOBAL_DEPS) $(EXPAND_LIBS_GEN) $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS) > $@ ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH))) $(IMPORT_LIBRARY): $(SHARED_LIBRARY) endif ifeq ($(OS_ARCH),OS2) $(DEF_FILE): $(OBJS) $(SHARED_LIBRARY_LIBS) - rm -f $@ + $(RM) $@ echo LIBRARY $(SHARED_LIBRARY_NAME) INITINSTANCE TERMINSTANCE > $@ echo PROTMODE >> $@ echo CODE LOADONCALL MOVEABLE DISCARDABLE >> $@ echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >> $@ echo EXPORTS >> $@ $(ADD_TO_DEF_FILE) $(IMPORT_LIBRARY): $(SHARED_LIBRARY) - rm -f $@ + $(RM) $@ $(IMPLIB) $@ $^ $(RANLIB) $@ endif # OS/2 $(HOST_LIBRARY): $(HOST_OBJS) Makefile - rm -f $@ + $(RM) $@ $(HOST_AR) $(HOST_AR_FLAGS) $(HOST_OBJS) $(HOST_RANLIB) $@ ifdef HAVE_DTRACE ifndef XP_MACOSX ifdef DTRACE_PROBE_OBJ ifndef DTRACE_LIB_DEPENDENT $(DTRACE_PROBE_OBJ): $(OBJS) @@ -1156,24 +1156,24 @@ endif # On Darwin (Mac OS X), dwarf2 debugging uses debug info left in .o files, # so instead of deleting .o files after repacking them into a dylib, we make # symlinks back to the originals. The symlinks are a no-op for stabs debugging, # so no need to conditionalize on OS version or debugging format. $(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS_DEPS) $(LIBRARY) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) $(GLOBAL_DEPS) ifndef INCREMENTAL_LINKER - rm -f $@ + $(RM) $@ endif ifdef DTRACE_LIB_DEPENDENT ifndef XP_MACOSX dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS)) endif $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) - @rm -f $(DTRACE_PROBE_OBJ) + @$(RM) $(DTRACE_PROBE_OBJ) else # ! DTRACE_LIB_DEPENDENT $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(DTRACE_PROBE_OBJ) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) endif # DTRACE_LIB_DEPENDENT ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) ifdef MSMANIFEST_TOOL ifdef EMBED_MANIFEST_AT @if test -f $@.manifest; then \ @@ -1181,17 +1181,17 @@ ifdef EMBED_MANIFEST_AT rm -f $@.manifest; \ fi endif # EMBED_MANIFEST_AT endif # MSVC with manifest tool ifdef MOZ_PROFILE_GENERATE touch -t `date +%Y%m%d%H%M.%S -d "now+5seconds"` pgo.relink endif endif # WINNT && !GCC - @rm -f foodummyfilefoo $(DELETE_AFTER_LINK) + @$(RM) foodummyfilefoo $(DELETE_AFTER_LINK) chmod +x $@ ifdef ENABLE_STRIP $(STRIP) $@ endif ifdef MOZ_POST_DSO_LIB_COMMAND $(MOZ_POST_DSO_LIB_COMMAND) $@ endif @@ -1297,17 +1297,17 @@ endif $(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $(_VPATH_SRCS) %.$(OBJ_SUFFIX): %.cpp $(GLOBAL_DEPS) $(REPORT_BUILD) @$(MAKE_DEPS_AUTO_CXX) ifdef STRICT_CPLUSPLUS_SUFFIX echo "#line 1 \"$*.cpp\"" | cat - $*.cpp > t_$*.cc $(ELOG) $(CCC) -o $@ -c $(COMPILE_CXXFLAGS) t_$*.cc - rm -f t_$*.cc + $(RM) t_$*.cc else $(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $(_VPATH_SRCS) endif #STRICT_CPLUSPLUS_SUFFIX $(OBJ_PREFIX)%.$(OBJ_SUFFIX): %.mm $(GLOBAL_DEPS) $(REPORT_BUILD) @$(MAKE_DEPS_AUTO_CXX) $(ELOG) $(CCC) -o $@ -c $(COMPILE_CXXFLAGS) $(COMPILE_CMMFLAGS) $(_VPATH_SRCS) @@ -1347,22 +1347,24 @@ ifdef GNU_CC $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) $(OUTOPTION)$@ $(_VPATH_SRCS) else $(RC) $(RCFLAGS) -r $(DEFINES) $(INCLUDES) $(OUTOPTION)$@ $(_VPATH_SRCS) endif endif # need 3 separate lines for OS/2 %:: %.pl - rm -f $@ + $(RM) $@ cp $< $@ chmod +x $@ %:: %.sh - rm -f $@; cp $< $@; chmod +x $@ + $(RM) $@ + cp $< $@ + chmod +x $@ # Cancel these implicit rules # %: %,v %: RCS/%,v %: s.% @@ -1549,18 +1551,18 @@ export:: FORCE endif $(IDL_DIR):: $(NSINSTALL) -D $@ # generate .h files from into $(XPIDL_GEN_DIR), then export to $(DIST)/include; # warn against overriding existing .h file. $(XPIDL_GEN_DIR)/.done: - @if test ! -d $(XPIDL_GEN_DIR); then echo Creating $(XPIDL_GEN_DIR)/.done; rm -rf $(XPIDL_GEN_DIR); mkdir $(XPIDL_GEN_DIR); fi - @touch $@ + $(MKDIR) -p $(XPIDL_GEN_DIR) + @$(TOUCH) $@ # don't depend on $(XPIDL_GEN_DIR), because the modification date changes # with any addition to the directory, regenerating all .h files -> everything. $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_COMPILE) $(XPIDL_GEN_DIR)/.done $(REPORT_BUILD) $(ELOG) $(XPIDL_COMPILE) -m header -w $(XPIDL_FLAGS) -o $(XPIDL_GEN_DIR)/$* $(_VPATH_SRCS) @if test -n "$(findstring $*.h, $(EXPORTS))"; \ @@ -1646,17 +1648,17 @@ GARBAGE_DIRS += $(JAVA_GEN_DIR) # generate .java files into _javagen/[package name dirs] _JAVA_GEN_DIR = $(JAVA_GEN_DIR)/$(JAVA_IFACES_PKG_NAME) $(_JAVA_GEN_DIR): $(NSINSTALL) -D $@ $(JAVA_GEN_DIR)/.%.java.pp: %.idl $(XPIDL_COMPILE) $(_JAVA_GEN_DIR) $(REPORT_BUILD) $(ELOG) $(XPIDL_COMPILE) -m java -w $(XPIDL_FLAGS) -I$(srcdir) -I$(IDL_DIR) -o $(_JAVA_GEN_DIR)/$* $(_VPATH_SRCS) - @touch $@ + @$(TOUCH) $@ # "Install" generated Java interfaces. We segregate them based on the XPI_NAME. # If XPI_NAME is not set, install into the "default" directory. ifneq ($(XPI_NAME),) JAVA_INSTALL_DIR = $(JAVA_DIST_DIR)/$(XPI_NAME) else JAVA_INSTALL_DIR = $(JAVA_DIST_DIR)/default endif @@ -1844,17 +1846,17 @@ endif endif ifdef INSTALL_EXTENSION_ID ifndef XPI_NAME $(error XPI_NAME must be set for INSTALL_EXTENSION_ID) endif libs:: - $(RM) -rf "$(DIST)/bin/extensions/$(INSTALL_EXTENSION_ID)" + $(RM) -r "$(DIST)/bin/extensions/$(INSTALL_EXTENSION_ID)" $(NSINSTALL) -D "$(DIST)/bin/extensions/$(INSTALL_EXTENSION_ID)" cd $(FINAL_TARGET) && tar $(TAR_CREATE_FLAGS) - . | (cd "../../bin/extensions/$(INSTALL_EXTENSION_ID)" && tar -xf -) endif ifneq (,$(filter flat symlink,$(MOZ_CHROME_FILE_FORMAT))) _JAR_REGCHROME_DISABLE_JAR=1 else @@ -1916,17 +1918,17 @@ depend:: $(SUBMAKEFILES) $(MAKE_DIRS) $( else depend:: $(SUBMAKEFILES) endif $(LOOP_OVER_PARALLEL_DIRS) $(LOOP_OVER_DIRS) $(LOOP_OVER_TOOL_DIRS) dependclean:: $(SUBMAKEFILES) - rm -f $(MDDEPFILES) + $(RM) $(MDDEPFILES) $(LOOP_OVER_PARALLEL_DIRS) $(LOOP_OVER_DIRS) $(LOOP_OVER_TOOL_DIRS) endif # MOZ_AUTO_DEPS endif # COMPILER_DEPEND @@ -1939,17 +1941,17 @@ endif # COMPILER_DEPEND # # We use $(CURDIR) in the rule's target to ensure that we don't find # a dependency directory in the source tree via VPATH (perhaps from # a previous build in the source tree) and thus neglect to create a # dependency directory in the object directory, where we really need # it. $(CURDIR)/$(MDDEPDIR): - @if test ! -d $@; then echo Creating $@; rm -rf $@; mkdir $@; else true; fi + $(MKDIR) -p $@ ifneq (,$(filter-out all chrome default export realchrome tools clean clobber clobber_all distclean realclean,$(MAKECMDGOALS))) ifneq (,$(OBJS)$(XPIDLSRCS)$(SIMPLE_PROGRAMS)) MDDEPEND_FILES := $(strip $(wildcard $(MDDEPDIR)/*.pp)) ifneq (,$(MDDEPEND_FILES)) # The script mddepend.pl checks the dependencies and writes to stdout # one rule to force out-of-date objects. For example,