make depend, and filter out 'env' arguments
Merge remote-tracking branch 'origin/4.02-gdb' into 4.02-gdb
fixes