jorton 2004/02/15 13:06:33
Modified: build gen-build.py
Log:
* build/gen-build.py: Use values in deps dictionaries to store full
pathname of the headers.
Revision Changes Path
1.8 +7 -4 apr/build/gen-build.py
Index: gen-build.py
===================================================================
RCS file: /home/cvs/apr/build/gen-build.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -d -u -r1.7 -r1.8
--- gen-build.py 15 Feb 2004 17:09:42 -0000 1.7
+++ gen-build.py 15 Feb 2004 21:06:33 -0000 1.8
@@ -28,7 +28,10 @@
headers = get_files(parser.get('options', 'headers'))
# compute the relevant headers, along with the implied includes
- legal_deps = map(os.path.basename, headers)
+ legal_deps = { }
+ for fname in headers:
+ legal_deps[os.path.basename(fname)] = fname
+
h_deps = { }
for fname in headers:
h_deps[os.path.basename(fname)] = extract_deps(fname, legal_deps)
@@ -50,7 +53,7 @@
for hdr in deps.keys():
deps.update(h_deps.get(hdr, {}))
- f.write('%s: %s .make.dirs include/%s\n' % (obj, file,
string.join(deps.keys(), ' include/')))
+ f.write('%s: %s .make.dirs %s\n' % (obj, file,
string.join(deps.values())))
f.write('\nOBJECTS = %s\n\n' % string.join(objects))
f.write('HEADERS = $(top_srcdir)/%s\n\n' % string.join(headers, '
$(top_srcdir)/'))
@@ -80,8 +83,8 @@
if line[:8] != '#include':
continue
inc = _re_include.match(line).group(1)
- if inc in legal_deps:
- deps[inc] = None
+ if inc in legal_deps.keys():
+ deps[inc] = legal_deps[inc]
return deps
_re_include = re.compile('#include *["<](.*)[">]')
