From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 28 Jan 1999 19:26:21 +0000 (+0000)
Subject: Update mkdep to handle multiple files on same line
X-Git-Tag: OPENLDAP_REL_ENG_1_2_BETA2~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f878e9b3e3c5a11716d2019f3b7519277323f4e1;p=thirdparty%2Fopenldap.git

Update mkdep to handle multiple files on same line
---

diff --git a/CHANGES b/CHANGES
index 506fb15105..eba7c365de 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,8 @@ Changes included in OpenLDAP 1.2
 	CVS Tag: OPENLDAP_REL_ENG_1_2
 	Fixed slapd/ldbm/add cache set state deadlock bug
 	Update ldap_open(3) man page to note ldap_init() is preferred.
+	Build environment
+		Fixed mkdep to handle multiple dependent files on one line
 
 Changes included in OpenLDAP 1.2
 	CVS Tag: OPENLDAP_REL_ENG_1_2_BETA
diff --git a/build/mkdep b/build/mkdep
index 102b932ebc..6620fbfe8f 100755
--- a/build/mkdep
+++ b/build/mkdep
@@ -132,17 +132,21 @@ $CC -M $files | \
 	$SED | \
 awk '
 $1 ~ /:/ {
-	filenm=$1
-	dep=$2
+	filenm=$1;
+	dep=substr($0, length(filenm)+1);
 }
 $1 !~ /:/ {
-	dep=$1
+	dep=$0;
 }
 /.*/ {
-	if (( noslash == "yes") && (dep ~ /^\// )) next
-	if ( length(dep) < 2 ) next
-	rec = filenm " " dep;
-	print rec;
+	split(dep, depends, " ");
+	for(d in depends) {
+		dfile = depends[d];
+		if (( noslash == "yes") && (dfile ~ /^\// )) next
+		if ( length(dfile) < 2 ) continue
+		rec = filenm " " dfile;
+		print rec;
+	}
     }
 ' noslash="$NOSLASH" >> $TMP