Update mkdep to handle multiple files on same line

diff --git a/CHANGES b/CHANGES
index 506fb15105d6daae7a8990f62504c4136728b646..eba7c365de0832695e59ace73dc28a5e380e9cc5 100644 (file)
--- 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 102b932ebc2c45773f1e2c30fa7c2e1a9b35ad34..6620fbfe8f940ae7fe07595cb840e59375194820 100755 (executable)
--- 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