allow both -f and -p at the same time

SCCS-vsn: usr.bin/mkdep/mkdep.sh 5.9

diff --git a/usr/src/usr.bin/mkdep/mkdep.sh b/usr/src/usr.bin/mkdep/mkdep.sh
index acd6192..778d56c 100644 (file)
--- a/usr/src/usr.bin/mkdep/mkdep.sh
+++ b/usr/src/usr.bin/mkdep/mkdep.sh
@@ -10,31 +10,36 @@
 # software without specific prior written permission. This software
 # is provided ``as is'' without express or implied warranty.
 #
 # software without specific prior written permission. This software
 # is provided ``as is'' without express or implied warranty.
 #

-#      @(#)mkdep.sh    5.8 (Berkeley) %G%
+#      @(#)mkdep.sh    5.9 (Berkeley) %G%

 #
 
 PATH=/bin:/usr/bin:/usr/ucb
 export PATH
 
 #
 
 PATH=/bin:/usr/bin:/usr/ucb
 export PATH
 

+MAKE=Makefile                  # default makefile name is "Makefile"
+
+while :
+       do case "$1" in
+               # -f allows you to select a makefile name
+               -f)
+                       MAKE=$2
+                       shift; shift ;;
+
+               # the -p flag produces "program: program.c" style dependencies
+               # so .o's don't get produced
+               -p)
+                       SED='-e s;\.o;;'
+                       shift ;;
+               *)
+                       break ;;
+       esac
+done
+

 if [ $# = 0 ] ; then
        echo 'usage: mkdep [-p] [-f makefile] [flags] file ...'
        exit 1
 fi
 
 if [ $# = 0 ] ; then
        echo 'usage: mkdep [-p] [-f makefile] [flags] file ...'
        exit 1
 fi
 

-MAKE=Makefile                  # default makefile name is "Makefile"
-case $1 in
-       # -f allows you to select a makefile name
-       -f)
-               MAKE=$2
-               shift; shift ;;
-
-       # the -p flag produces "program: program.c" style dependencies
-       # so .o's don't get produced
-       -p)
-               SED='-e s;\.o;;'
-               shift ;;
-esac
-

 if [ ! -w $MAKE ]; then
        echo "mkdep: no writeable file \"$MAKE\""
        exit 1
 if [ ! -w $MAKE ]; then
        echo "mkdep: no writeable file \"$MAKE\""
        exit 1