X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=build%2Fmkdep;h=6e54d035a50824f84c06e38cc2fe4fdb3b0cd88e;hb=00b77ca088700c1ed51c2935cadc4b40c6cdb381;hp=852e7e636b698f1c63808e5f5b2f063424af8208;hpb=dd78d8f2d6f98a17572009193d66d61bb1cfd4b6;p=openldap

diff --git a/build/mkdep b/build/mkdep
index 852e7e636b..6e54d035a5 100755
--- a/build/mkdep
+++ b/build/mkdep
@@ -1,5 +1,10 @@
-#!/bin/sh -
+#! /bin/sh -
+# $OpenLDAP$
+## Copyright 1998-2000 The OpenLDAP Foundation
+## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
+## of this package for details.
 #
+# Portions
 # Copyright (c) 1987 Regents of the University of California.
 # All rights reserved.
 #
@@ -25,11 +30,15 @@ set -e				# exit immediately if any errors occur
 
 MAKE=Makefile			# default makefile name is "Makefile"
 NOSLASH="no"			# by default, / dependencies are included
-CC=${CC-cc}				# default compiler is cc
-: ${CC_MKDEP_FLAGS="-M"}	# cc -M usually produces dependencies
 SRCDIR=""
 SED=cat
 
+: ${CC=cc}					# use cc by default
+
+# We generally set these via the command line options
+: ${MKDEP_CC=$CC}			# select default compiler to generate dependencies
+: ${MKDEP_CFLAGS="-M"}	# cc -M usually produces dependencies
+
 while :
 	do case "$1" in
 		# the -s flag removes dependencies to files that begin with /
@@ -47,9 +56,15 @@ while :
 			SRCDIR=$2
 			shift; shift ;;
 
-		# -c allows you to select a compiler to use (default is cc)
+		# -c allows you to override the compiler used to generate dependencies
 		-c)
-			CC=$2
+			MKDEP_CC=$2
+			shift; shift ;;
+
+		# -m allows you to override the compiler flags used to generate
+		# dependencies.
+		-m)
+			MKDEP_CFLAGS=$2
 			shift; shift ;;
 
 		# the -p flag produces "program: program.c" style dependencies
@@ -58,7 +73,6 @@ while :
 			SED='sed -e s;\.o;;'
 			shift ;;
 
-
 		# the -l flag produces libtool compatible dependencies
 		-l)
 			SED='sed -e s;\.o:;.lo:;'
@@ -71,19 +85,19 @@ while :
 	esac
 done
 
-if [ $# = 0 ] ; then
-	echo 'usage: mkdep [-p] [-s] [-c cc] [-f makefile] [-d srcdir] [flags] file ...'
+if test $# = 0 ; then
+	echo 'usage: mkdep [-p] [-s] [-c cc] [-m flags] [-f makefile] [-d srcdir] [cppflags] file ...'
 	exit 1
 fi
 
-if [ ! -w $MAKE ]; then
+if test ! -w $MAKE ; then
 	echo "mkdep: no writeable file \"$MAKE\""
 	exit 1
 fi
 
 TMP=/tmp/mkdep$$
 
-trap 'rm -f $TMP ; exit 1' 1 2 3 13 15
+trap 'rm -f $TMP.sed $TMP ; exit 1' 1 2 3 13 15
 
 cp $MAKE ${MAKE}.bak
 
@@ -116,40 +130,46 @@ else
 			files="$files $i"
 		fi
 	done
-	CC="$CC -I$SRCDIR"
+
+	MKDEP_CFLAGS="$MKDEP_CFLAGS -I$SRCDIR"
 fi
 
 cat << _EOF_ >> $TMP
 
 #
 # files: $*
-# command: $CC -M $files
+# command: $MKDEP_CC $MKDEP_CFLAGS $files
 #
 
 _EOF_
 
-$CC $CC_MKDEP_FLAGS $files | \
-	sed -e 's; \./; ;g' | \
-	$SED | \
+$MKDEP_CC $MKDEP_CFLAGS $files | \
+	sed -e 's; \./; ;g' -e 's/ :/:/' | \
+	$SED > $TMP.sed
+# do not pipe to awk.  SGI awk wants a filename as argument.
+# (or '-', but I do not know if all other awks support that.)
 awk '
-$1 ~ /:/ {
-	filenm=$1;
-	dep=substr($0, length(filenm)+1);
+$1 ~ /:$/ {
+	filenm=$1
+	dep=substr($0, length(filenm)+1)
 }
-$1 !~ /:/ {
-	dep=$0;
+$1 !~ /:$/ {
+	dep=$0
 }
 /.*/ {
-	split(dep, depends, " ");
+	if ( length(filenm) < 2 ) next
+	if ( filenm ~ /:.*:$/ ) next
+	split(dep, depends, " ")
 	for(d in depends) {
-		dfile = depends[d];
-		if (( noslash == "yes") && (dfile ~ /^\// )) next
+		dfile = depends[d]
 		if ( length(dfile) < 2 ) continue
-		rec = filenm " " dfile;
-		print rec;
+		if ( dfile ~ /:/ ) continue
+		if (( noslash == "yes") && (dfile ~ /^\// )) continue
+		rec = filenm " " dfile
+		print rec
 	}
-    }
-' noslash="$NOSLASH" >> $TMP
+}
+' noslash="$NOSLASH" $TMP.sed >> $TMP
 
 
 cat << _EOF_ >> $TMP
@@ -159,5 +179,5 @@ _EOF_
 
 # copy to preserve permissions
 cp $TMP $MAKE
-rm -f ${MAKE}.bak $TMP
+rm -f ${MAKE}.bak $TMP.sed $TMP
 exit 0