diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2002-09-13 23:07:20 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2002-09-13 23:07:20 +0000 |
| commit | 3f2c06a0853fb5ac261a590d477cb90a67ee1b42 (patch) | |
| tree | ec1f1441123ea45f16e21e642b1746a92db4ac45 /src | |
| parent | 71b09c0dd54810322d34ad03d1ae24457dfa1629 (diff) | |
| download | krb5-3f2c06a0853fb5ac261a590d477cb90a67ee1b42.tar.gz krb5-3f2c06a0853fb5ac261a590d477cb90a67ee1b42.tar.xz krb5-3f2c06a0853fb5ac261a590d477cb90a67ee1b42.zip | |
Don't do 'make depend' if we're not using the in-tree versions of et,ss,db
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14856 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/ChangeLog | 10 | ||||
| -rw-r--r-- | src/config/post.in | 21 |
2 files changed, 29 insertions, 2 deletions
diff --git a/src/config/ChangeLog b/src/config/ChangeLog index 922a62ca0..2ee17c77d 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,5 +1,15 @@ 2002-09-13 Ken Raeburn <raeburn@mit.edu> + * post.in (depend-verify-et-sys, depend-verify-et-k5, + depend-verify-ss-sys, depend-verify-ss-k5, depend-verify-db-sys, + depend-verify-db-k5): New targets. Report errors in the -sys + versions. + (depend-verify-et, depend-verify-ss, depend-verify-db): New + targets. Depend on the above based on the _VERSION macro + corresponding. + (depend-verify-srcdir): New target, split out from .d rules. + (.d): Depend on depend-verify-{et,ss,db,srcdir}. + * pre.in (DB_DEPLIB-k5, DB_DEPLIB-sys, DB_DEPS-sys, DB_DEPS-k5, DB_DEPS-redirect): New variables. (DB_DEPLIB, DB_DEPS): Select from them. diff --git a/src/config/post.in b/src/config/post.in index 337a003e1..901d6c852 100644 --- a/src/config/post.in +++ b/src/config/post.in @@ -6,12 +6,29 @@ ALL_DEP_SRCS= $(SRCS) $(EXTRADEPSRCS) # be sure to check ALL_DEP_SRCS against *what it would be if SRCS and # EXTRADEPSRCS are both empty* -.d: $(ALL_DEP_SRCS) - if test "$(srcdir)" = "." ; then \ +depend-verify-srcdir: + @if test "$(srcdir)" = "." ; then \ echo 1>&2 error: cannot build dependencies with srcdir=. ; \ echo 1>&2 "(can't distinguish generated files from source files)" ; \ exit 1 ; \ fi +depend-verify-et: depend-verify-et-$(COM_ERR_VERSION) +depend-verify-et-k5: +depend-verify-et-sys: + @echo 1>&2 error: cannot build dependencies using system et package + @exit 1 +depend-verify-ss: depend-verify-ss-$(SS_VERSION) +depend-verify-ss-k5: +depend-verify-ss-sys: + @echo 1>&2 error: cannot build dependencies using system ss package + @exit 1 +depend-verify-db: depend-verify-db-$(DB_VERSION) +depend-verify-db-k5: +depend-verify-db-sys: + @echo 1>&2 error: cannot build dependencies using system db package + @exit 1 + +.d: $(ALL_DEP_SRCS) depend-verify-srcdir depend-verify-et depend-verify-ss depend-verify-db if test "$(ALL_DEP_SRCS)" != " " ; then \ $(CC) -M $(ALL_CFLAGS) $(ALL_DEP_SRCS) > .dtmp || exit 1 ; \ mv -f .dtmp .d ; \ |