diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2005-04-21 21:44:37 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2005-04-21 21:44:37 +0000 |
| commit | ddbc9d85baab7fc1698e215afee7d3970065cfc3 (patch) | |
| tree | 0c0c8d4b30043753ffe14cb32e5b4859048c58b4 /src/config | |
| parent | 455cef6a7e8ec4bac9301748b818bf2ed47bee00 (diff) | |
| download | krb5-ddbc9d85baab7fc1698e215afee7d3970065cfc3.tar.gz krb5-ddbc9d85baab7fc1698e215afee7d3970065cfc3.tar.xz krb5-ddbc9d85baab7fc1698e215afee7d3970065cfc3.zip | |
Stop generating per-directory sed scripts, and use perl to compute the patterns
on the fly instead. (Next step, someday, integrate this script and depfix.sed,
so we only have to run one script.)
* config/post.in (depend-dependencies): Use (and depend on) depfix2.pl instead
of .depfix2.sed.
(.depfix2.sed): Target deleted.
(DEPTARGETS): Delete .depfix2.sed and .depfix2.tmp.
* util/depgen.sed: Deleted.
* util/depfix2.pl: New file.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17187 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/ChangeLog | 7 | ||||
| -rw-r--r-- | src/config/post.in | 17 |
2 files changed, 13 insertions, 11 deletions
diff --git a/src/config/ChangeLog b/src/config/ChangeLog index a5ccc5437..d25c11138 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,3 +1,10 @@ +2005-04-21 Ken Raeburn <raeburn@mit.edu> + + * post.in (depend-dependencies): Use (and depend on) depfix2.pl + instead of .depfix2.sed. + (.depfix2.sed): Target deleted. + (DEPTARGETS): Delete .depfix2.sed and .depfix2.tmp. + 2005-03-25 Ken Raeburn <raeburn@mit.edu> * lib.in (hpux10.exports): New target, constructed similar to diff --git a/src/config/post.in b/src/config/post.in index 573232cb4..32066a1a8 100644 --- a/src/config/post.in +++ b/src/config/post.in @@ -87,19 +87,14 @@ depend-dependencies: .dtmp: $(ALL_DEP_SRCS) $(CC) -M -DDEPEND $(ALL_CFLAGS) $? > .dtmp -# Generate a script for dropping in the appropriate make variables, using -# directory-specific parameters. General substitutions independent of local -# make variables happen in depfix.sed. -.depfix2.sed: $(BUILDTOP)/.depend-verify-gcc Makefile $(SRCTOP)/util/depgen.sed - x=`$(CC) -print-libgcc-file-name` ; \ - echo '$(SRCTOP)' '$(myfulldir)' '$(srcdir)' '$(BUILDTOP)' "$$x" '$(STLIBOBJS)' | sed -f $(SRCTOP)/util/depgen.sed > .depfix2.tmp - mv -f .depfix2.tmp .depfix2.sed - # NOTE: This will also generate spurious $(OUTPRE) and $(OBJEXT) # references in rules for non-library objects in a directory where # library objects happen to be built. It's mostly harmless. -.depend: .d .depfix2.sed $(SRCTOP)/util/depfix.sed - sed -f .depfix2.sed < .d | sed -f $(SRCTOP)/util/depfix.sed | \ +.depend: .d $(SRCTOP)/util/depfix.sed $(SRCTOP)/util/depfix2.pl + x=`$(CC) -print-libgcc-file-name` ; \ + perl $(SRCTOP)/util/depfix2.pl \ + '$(SRCTOP)' '$(myfulldir)' '$(srcdir)' '$(BUILDTOP)' "$$x" '$(STLIBOBJS)' \ + < .d | sed -f $(SRCTOP)/util/depfix.sed | \ sed -e '/^$$/d' > .depend depend-update-makefile: .depend depend-recurse @@ -110,7 +105,7 @@ depend-update-makefile: .depend depend-recurse $(SRCTOP)/config/move-if-changed $(srcdir)/Makefile.in.new $(srcdir)/Makefile.in ; \ else :; fi -DEPTARGETS = .depend .d .dtmp .depfix2.sed .depfix2.tmp $(DEP_VERIFY) +DEPTARGETS = .depend .d .dtmp $(DEP_VERIFY) # # end dependency generation |