diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2004-12-30 22:05:12 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2004-12-30 22:05:12 +0000 |
| commit | b4c3d53a6e88ea597a165289fd858b36aba03215 (patch) | |
| tree | eb18e852390ee935815f8d39769246855bb2fd64 /src/config/post.in | |
| parent | 037f6ea97299a496f38914289f7b28474765d9fc (diff) | |
| download | krb5-b4c3d53a6e88ea597a165289fd858b36aba03215.tar.gz krb5-b4c3d53a6e88ea597a165289fd858b36aba03215.tar.xz krb5-b4c3d53a6e88ea597a165289fd858b36aba03215.zip | |
Do the target object file name hacking in "make depend" earlier, before the
line breaks are recomputed, instead of after. This will result in lots of
whitespace changes in dependencies in directories that build library object
files, but the final output is nicer (fewer long lines), and running "make
depend" uses one fewer invocation of sed (balancing out the extra one I added
in another checkin earlier today).
* config/post.in (.depend): Don't do target name munging here.
(.depfix2.sed): Pass extra value $(STLIBOBJS).
* util/depfix.sed: Don't change foo.o to $(OUTPRE)foo.$(OBJEXT) here.
* util/depgen.sed: Add new argument for STLIBOBJS. Do the OUTPRE/OBJEXT
substitution here, and if STLIBOBJS is non-empty, add foo.so and foo.po while
we're at it.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16986 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/config/post.in')
| -rw-r--r-- | src/config/post.in | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/config/post.in b/src/config/post.in index dd34e1775..6a96c929e 100644 --- a/src/config/post.in +++ b/src/config/post.in @@ -92,17 +92,14 @@ depend-dependencies: # 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" | sed -f $(SRCTOP)/util/depgen.sed > .depfix2.tmp + echo '$(SRCTOP)' '$(myfulldir)' '$(srcdir)' '$(BUILDTOP)' "$$x" '$(STLIBOBJS)' | sed -f $(SRCTOP)/util/depgen.sed > .depfix2.tmp mv -f .depfix2.tmp .depfix2.sed -DEPLIBOBJNAMEFIX = sed -e 's;^\$$(OUTPRE)\([a-zA-Z0-9_\-]*\)\.\$$(OBJEXT):;\1.so \1.po &;' - # 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 | \ - (if test "x$(STLIBOBJS)" != "x"; then $(DEPLIBOBJNAMEFIX) ; else cat; fi ) | \ sed -e '/^$$/d' > .depend depend-update-makefile: .depend depend-recurse |