From cee79e98488ba138d1ebadb7488df7da54be627b Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Sat, 11 Mar 2006 22:23:28 +0000 Subject: 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 --- src/config/ChangeLog | 4 ++++ src/config/pre.in | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/config') 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 + + * pre.in (KRB_INCLUDES): Drop include/krb5 directories. + 2006-03-10 Ken Raeburn * 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@ -- cgit