diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/util/ChangeLog | 5 | ||||
| -rw-r--r-- | src/util/depgen.sed | 27 |
2 files changed, 6 insertions, 26 deletions
diff --git a/src/util/ChangeLog b/src/util/ChangeLog index 0ecbec2e1..5454b176d 100644 --- a/src/util/ChangeLog +++ b/src/util/ChangeLog @@ -1,3 +1,8 @@ +2005-04-20 Ken Raeburn <raeburn@mit.edu> + + * depgen.sed: Delete faulty check for $(srcdir), and redundant + check for $(SRCTOP). + 2004-12-30 Ken Raeburn <raeburn@mit.edu> * depfix.sed: Don't change foo.o to $(OUTPRE)foo.$(OBJEXT) here. diff --git a/src/util/depgen.sed b/src/util/depgen.sed index 370ff5351..29bc986bd 100644 --- a/src/util/depgen.sed +++ b/src/util/depgen.sed @@ -68,41 +68,16 @@ s|\([^ ][^ ]*\)|\ s;\1/[^ ]* ;;g\ s;\1/[^ ]*$;;g\ \ -# Recognize $(SRCTOP) and make it a variable reference.\ -# (Is this step needed, given the substitutions below?)| +# Recognize $(SRCTOP) and variants.| p x # Drop the last (possibly empty?) word, gcc's prefix. Then save four words. s, [^ ]*$,, - -h -s/ .*$// -s,\.,\\.,g -s,^,s; , -s,$,/; $(SRCTOP)/;g, -p -x - -# now recognize $(srcdir) and make it a variable reference -# too, unless followed by "/../" h -s/^[^ ]* [^ ]* // -s/[^ ]*$// -s/\./\\./g -s|^\(.*\)$|\ -# Now make $(srcdir) variable references, unless followed by "/../".\ -s; \1/; $(srcdir);g\ -s; $(srcdir)/\.\./; \1/../;\ -\ -# Recognize variants of $(SRCTOP).| -p -x # just process first "word" -h s/ .*$// - # replace multiple slashes with one single one s,///*,/,g # replace /./ with / |