diff --git a/setup/rules/generic/depend b/setup/rules/generic/depend
index 0640db13c3..ff9386dec6 100644
--- a/setup/rules/generic/depend
+++ b/setup/rules/generic/depend
@@ -2,17 +2,17 @@ depend::
 	@echo "$(CXX) -MM \
 	    $(WX_INCLUDES) \
 	    $(ADD_COMPILE) \
-	    $(LIB_SRC) $(BIN_SRC) $(BIN2_SRC)"
+            $(LIB_SRC) $(LIB_C_SRC) $(LIB_CPP_SRC) $(BIN_SRC) $(BIN2_SRC)"
 	@(cd .. ;\
 	    $(CXX) -MM \
 	    $(WX_INCLUDES) \
 	    $(ADD_COMPILE) \
-	    $(LIB_SRC) $(BIN_SRC) $(BIN2_SRC)\
+            $(LIB_SRC) $(LIB_C_SRC) $(LIB_CPP_SRC) $(BIN_SRC) $(BIN2_SRC)\
 	) > .depend
 	@cp Makefile Makefile.bak
-	@cat Makefile.bak | awk 'BEGIN { found=0;} { if ( $$0 == "# DO NOT DELETE") {found=1} ; { if ( found==0 ) { print $$0; } } }' > Makefile1
+	@cat Makefile.bak | sed -e '/^# DO NOT DELETE/q' > Makefile1
 	@echo "# DO NOT DELETE" >> Makefile1
-	@cat .depend >> Makefile1
+	@cat .depend | sed 's/^\(.\+\.o\ *:\ *\)\([^\ ]\+\/\)/\2\1\2/g' >> Makefile1
 	@mv Makefile1 Makefile
 	@rm .depend