INTEGRATION: CWS ause068 (1.6.42); FILE MERGED

2006/09/26 09:44:48 hjs 1.6.42.1: #i69536# noop looks like a nice replacement for echo > /dev/null
This commit is contained in:
Kurt Zenker 2006-10-05 10:06:28 +00:00
parent 72cd66d3ce
commit bbe9fbd512

View file

@ -4,9 +4,9 @@
# #
# $RCSfile: extractfiles.mk,v $ # $RCSfile: extractfiles.mk,v $
# #
# $Revision: 1.6 $ # $Revision: 1.7 $
# #
# last change: $Author: rt $ $Date: 2005-09-07 19:58:54 $ # last change: $Author: kz $ $Date: 2006-10-05 11:06:28 $
# #
# The Contents of this file are made available subject to # The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1. # the terms of GNU Lesser General Public License Version 2.1.
@ -184,7 +184,7 @@ make_temp_dir:
.ENDIF .ENDIF
$(OUT)$/bin$/mozruntime.zip: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) $(OUT)$/bin$/mozruntime.zip: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
+echo $@>& $(NULLDEV) noop
$(MISC)$/build$/so_moz_runtime_files: $(OUT)$/bin$/mozruntime.zip $(MISC)$/build$/so_moz_runtime_files: $(OUT)$/bin$/mozruntime.zip
# copy files in BIN_RUNTIMELIST # copy files in BIN_RUNTIMELIST
@ -261,7 +261,7 @@ $(MISC)$/build$/so_moz_include_files: $(INCCOM)$/nsBuildID.h
+$(TOUCH) $@ +$(TOUCH) $@
$(MISC)$/build$/so_moz_lib_files: $(foreach,file,$(LIBLIST) $(LIB_DIR)$/$(file)) $(MISC)$/build$/so_moz_lib_files: $(foreach,file,$(LIBLIST) $(LIB_DIR)$/$(file))
+echo $(foreach,file,$(LIBLIST) $(MOZ_DIST_DIR)$/lib$/$(file)) echo $(foreach,file,$(LIBLIST) $(MOZ_DIST_DIR)$/lib$/$(file))
+$(foreach,file,$(LIBLIST) $(COPY) $(MOZ_DIST_DIR)$/lib$/$(file) \ +$(foreach,file,$(LIBLIST) $(COPY) $(MOZ_DIST_DIR)$/lib$/$(file) \
$(LIB_DIR)$/$(file) &&) \ $(LIB_DIR)$/$(file) &&) \
echo >& $(NULLDEV) echo >& $(NULLDEV)
@ -290,8 +290,8 @@ RES_FILELIST: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
.ENDIF .ENDIF
$(LIB_DIR)$/%: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) $(LIB_DIR)$/%: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
+echo >& $(NULLDEV) noop
$(MISC)$/CREATETARBALL: extract_mozab_files $(MISC)$/CREATETARBALL: extract_mozab_files
@+-$(MKDIR) $(OUT)$/zipped >& $(NULLDEV) @+-$(MKDIR) $(OUT)$/zipped >& $(NULLDEV)