diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2006-03-11 22:23:28 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2006-03-11 22:23:28 +0000 |
| commit | cee79e98488ba138d1ebadb7488df7da54be627b (patch) | |
| tree | fd329cef103b8a0f5bddccc360f15cb6ca8c9d41 /src/config | |
| parent | 6b3217ad6ab98d4365f32d45948717e212684678 (diff) | |
| download | krb5-cee79e98488ba138d1ebadb7488df7da54be627b.tar.gz krb5-cee79e98488ba138d1ebadb7488df7da54be627b.tar.xz krb5-cee79e98488ba138d1ebadb7488df7da54be627b.zip | |
Instead of arbitrary division of headers into include and include/krb5, with
include directives sometimes using krb5/foo.h and sometimes using foo.h, and
-I options always given for both directories in both source and build trees,
push include/krb5/* up a level and drop the krb5 directory (except, for the
moment, the change log).
Updated #include directives, -I options, and dependencies accordingly, and
deleted one or two bits of old, unused code that was noticed in the process.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17730 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/ChangeLog | 4 | ||||
| -rw-r--r-- | src/config/pre.in | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/config/ChangeLog b/src/config/ChangeLog index 2daa78882..481de61ad 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * pre.in (KRB_INCLUDES): Drop include/krb5 directories. + 2006-03-10 Ken Raeburn <raeburn@mit.edu> * pre.in (generate-files-mac): New target. diff --git a/src/config/pre.in b/src/config/pre.in index 31a84b1ec..02aa75461 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -169,8 +169,7 @@ DEFS = @DEFS@ CC = @CC@ LD = $(PURE) @LD@ DEPLIBS = @DEPLIBS@ -KRB_INCLUDES = -I$(BUILDTOP)/include -I$(SRCTOP)/include \ - -I$(BUILDTOP)/include/krb5 -I$(SRCTOP)/include/krb5 +KRB_INCLUDES = -I$(BUILDTOP)/include -I$(SRCTOP)/include LDFLAGS = @LDFLAGS@ LD_UNRESOLVED_PREFIX = @LD_UNRESOLVED_PREFIX@ LD_SHLIBDIR_PREFIX = @LD_SHLIBDIR_PREFIX@ |