clean up build output, take two

Author: ReplayCoding

src/devtools/gendbg.sh

@@ -36,9 +36,9 @@ if [ "$OUTFILEDIR" != "$INFILEDIR" ]; then
 	OUTFILE=${OUTFILEDIR}/${OUTFILE}
 fi
 
-pushd "$INFILEDIR"	
+pushd "$INFILEDIR" > /dev/null
 $OBJCOPY "$INFILE" "$OUTFILE"
 $OBJCOPY --add-gnu-debuglink="$OUTFILE" "$INFILE"
-popd
+popd > /dev/null
 
 

src/devtools/makefile_base_posix.mak

@@ -540,8 +540,8 @@ ifneq "$(OUTPUTFILE)" ""
 endif
 
 $(LIB_File): $(OTHER_DEPENDENCIES) $(OBJS) 
-	$(QUIET_PREFIX) -$(P4_EDIT_START) $(LIB_File) $(P4_EDIT_END); 
 	$(QUIET_PREFIX) $(AR) rcs $(LIB_File) $(OBJS) $(LIBFILES);
+	$(QUIET_PREFIX) -$(P4_EDIT_START) $(LIB_File) $(P4_EDIT_END); 
 	$(SHELL) -c "$(POSTBUILDCOMMAND)"
 
 SO_GameOutputFile = $(GAMEOUTPUTFILE)
@@ -550,19 +550,18 @@ SO_GameOutputFile = $(GAMEOUTPUTFILE)
 # instances of the game from crashing due to the overwrite.
 $(GAMEOUTPUTFILE): $(OUTPUTFILE)
 	$(QUIET_PREFIX) \
-	$(P4_EDIT_START) $(GAMEOUTPUTFILE) $(P4_EDIT_END) && \
 	echo "----" $(QUIET_ECHO_POSTFIX);\
 	echo "---- COPYING TO $@ [$(CFG)] ----";\
 	echo "----" $(QUIET_ECHO_POSTFIX);
-	$(QUIET_PREFIX) -$(P4_EDIT_START) $(GAMEOUTPUTFILE) $(P4_EDIT_END);
 	$(QUIET_PREFIX) -mkdir -p `dirname $(GAMEOUTPUTFILE)` > /dev/null;
 	$(QUIET_PREFIX) rm -f $(GAMEOUTPUTFILE) $(QUIET_ECHO_POSTFIX);
 	$(QUIET_PREFIX) cp -v $(OUTPUTFILE) $(GAMEOUTPUTFILE) $(QUIET_ECHO_POSTFIX);
-	$(QUIET_PREFIX) -$(P4_EDIT_START) $(GAMEOUTPUTFILE)$(SYM_EXT) $(P4_EDIT_END);
-	$(QUIET_PREFIX) -if [ "$(CONFTYPE)" != "lib" ]; then\
+	$(QUIET_PREFIX) if [ "$(CONFTYPE)" != "lib" ]; then\
 		$(GEN_SYM) $(GAMEOUTPUTFILE);\
 		$(STRIP) $(GAMEOUTPUTFILE);\
+		$(P4_EDIT_START) $(GAMEOUTPUTFILE)$(SYM_EXT) $(P4_EDIT_END);\
 	fi;
+	$(QUIET_PREFIX) $(P4_EDIT_START) $(GAMEOUTPUTFILE) $(P4_EDIT_END);
 	$(QUIET_PREFIX) $(VSIGN) -signvalve $(GAMEOUTPUTFILE);
 	$(QUIET_PREFIX) if [ "$(COPY_DLL_TO_SRV)" = "1" ]; then\
 		echo "----" $(QUIET_ECHO_POSTFIX);\
@@ -575,9 +574,9 @@ $(GAMEOUTPUTFILE): $(OUTPUTFILE)
 		echo "----" $(QUIET_ECHO_POSTFIX);\
 		echo "---- COPYING TO IMPORT LIBRARY $(IMPORTLIBRARY) ----";\
 		echo "----" $(QUIET_ECHO_POSTFIX);\
-		$(P4_EDIT_START) $(IMPORTLIBRARY) $(P4_EDIT_END) && \
 		mkdir -p `dirname $(IMPORTLIBRARY)` > /dev/null && \
 		cp -v $(OUTPUTFILE) $(IMPORTLIBRARY); \
+		$(P4_EDIT_START) $(IMPORTLIBRARY) $(P4_EDIT_END); \
 	fi;