Allow -m to set CC_MKDEP and -x to set CC_MKDEP_FLAGS.

build/mkdep

@@ -33,8 +33,6 @@ SRCDIR=""
 SED=cat
 
 : ${CC=cc}					# use cc by default
-: ${CC_MKDEP=$CC}			# select default compiler to generate dependencies
-: ${CC_MKDEP_FLAGS="-M"}	# cc -M usually produces dependencies
 
 while :
 	do case "$1" in
@@ -53,12 +51,23 @@ while :
 			SRCDIR=$2
 			shift; shift ;;
 
-		# -c allows you to select a compiler to use to generate
-		# dependencies.  Leaves $CC alone.
+		# -c allows you to override the default compiler.
 		-c)
+			CC=$2
+			shift; shift ;;
+
+		# -m allows you to override the compiler used to generate
+		# dependencies.
+		-m)
 			CC_MKDEP=$2
 			shift; shift ;;
 
+		# -m allows you to override the compiler flags used to generate
+		# dependencies.
+		-x)
+			CC_MKDEP_FLAGS=$2
+			shift; shift ;;
+
 		# the -p flag produces "program: program.c" style dependencies
 		# so .o's don't get produced
 		-p)
@@ -78,8 +87,11 @@ while :
 	esac
 done
 
+: ${CC_MKDEP=$CC}			# select default compiler to generate dependencies
+: ${CC_MKDEP_FLAGS="-M"}	# cc -M usually produces dependencies
+
 if test $# = 0 ; then
-	echo 'usage: mkdep [-p] [-s] [-c cc] [-f makefile] [-d srcdir] [flags] file ...'
+	echo 'usage: mkdep [-p] [-s] [-c cc] [-m cc] [-x flags] [-f makefile] [-d srcdir] [cppflags] file ...'
 	exit 1
 fi
 
@@ -123,7 +135,8 @@ else
 			files="$files $i"
 		fi
 	done
-	CC="$CC -I$SRCDIR"
+
+	CC_MKDEP_FLAGS="$CC_MKDEP_FLAGS -I$SRCDIR"
 fi
 
 cat << _EOF_ >> $TMP