X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=build%2Fmkdep;h=4384b2853f57e1abf2dd3d052d98305c7e8a7fd7;hb=f72dbc212fb1621896af98592567f87f003a3a72;hp=62e1ad02c859d546df8e97e47e80d21251dbf4df;hpb=8f921243eba058043e9c811e1b257267dbd22390;p=openldap

diff --git a/build/mkdep b/build/mkdep
index 62e1ad02c8..4384b2853f 100755
--- a/build/mkdep
+++ b/build/mkdep
@@ -1,5 +1,6 @@
 #! /bin/sh -
-## Copyright 1998,1999 The OpenLDAP Foundation
+# $OpenLDAP$
+## Copyright 1998-2002 The OpenLDAP Foundation
 ## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
 ## of this package for details.
 #
@@ -108,13 +109,11 @@ cat << _EOF_ >> $TMP
 
 _EOF_
 
-# If your compiler doesn't have -M, add it.  If you can't, the next two
-# lines will try and replace the "cc -M".  The real problem is that this
-# hack can't deal with anything that requires a search path, and doesn't
-# even try for anything using bracket (<>) syntax.
-#
-# egrep '^#include[ 	]*".*"' /dev/null $* |
-# sed -e 's/:[^"]*"\([^"]*\)".*/: \1/' -e 's/\.c/.o/' |
+# If your compiler doesn't have -M, you may be able to use -E instead.
+# The preprocessor must generate lines of the form
+#   #.* [0-9]* "dependent file" .*
+# This script will parse out the "dependent file"s to generate the
+# dependency list.
 
 if test "x$SRCDIR" = "x" ; then
 	files=$*
@@ -142,30 +141,67 @@ cat << _EOF_ >> $TMP
 
 _EOF_
 
+case $MKDEP_CFLAGS in
+# Using regular preprocessor output
+	-E*)
+FLAGS=""
+FILES=""
+for i in $files; do
+	case $i in
+	-*)	FLAGS="$FLAGS $i" ;;
+	*)	FILES="$FILES $i" ;;
+	esac
+done
+for i in $FILES; do
+	$MKDEP_CC $MKDEP_CFLAGS $FLAGS $i | egrep '^#.*"' > $TMP.sed
+awk '
+BEGIN {
+	file = "'$i'"
+	n = split(file, parts, "/")
+	filenm = substr(parts[n], 0, length(parts[n])-1) "o"
+}
+{
+	dep = split($3, parts, "\"")
+	dep = parts[2]
+	if (dep ~ "^\./.*") dep = substr(dep, 3, length(dep)-2)
+	if (( noslash == "yes") && (dep ~ /^\// )) continue
+	if (deps[dep] == 0) printf "%s: %s\n", filenm, dep
+	deps[dep] = 1
+}' noslash="$NOSLASH" $TMP.sed >> $TMP
+done
+	;;
+
+	*)
+# Using -M or some other specific dependency-generating option
 $MKDEP_CC $MKDEP_CFLAGS $files | \
-	sed -e 's; \./; ;g' | \
+	sed -e 's; \./; ;g' -e 's/ :/:/' | \
 	$SED > $TMP.sed
-# dont pipe to awk.  SGI awk wants a filename as argument.
+# 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.sed >> $TMP
+	;;
+esac
 
 
 cat << _EOF_ >> $TMP