From 4243c94eff28b32f076cbdef7d5e58e7cac6c34e Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Fri, 1 Oct 2004 04:25:43 +0000 Subject: [PATCH] * update the include paths to allow patchlevel.h to be found ticket: new git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16798 dc483132-0cff-0310-8789-dd5450dbe970 --- src/windows/cns/ChangeLog | 4 ++++ src/windows/cns/Makefile.in | 4 ++-- src/windows/gss/ChangeLog | 4 ++++ src/windows/gss/Makefile.in | 2 +- src/windows/wintel/ChangeLog | 4 ++++ src/windows/wintel/Makefile.in | 2 +- 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/windows/cns/ChangeLog b/src/windows/cns/ChangeLog index 73960c0806..d79cf15448 100644 --- a/src/windows/cns/ChangeLog +++ b/src/windows/cns/ChangeLog @@ -1,3 +1,7 @@ +2004-09-30 Jeffrey Altman + + * Makefile.in: add $(BUILDTOP) to include path for patchlevel.h + 2004-01-30 Jeffrey Altman * options.c, cnsres5.rc, cns.h, cns_reg.c cns_reg.h, cns.c: diff --git a/src/windows/cns/Makefile.in b/src/windows/cns/Makefile.in index 2a1aa60b2e..7ea2def124 100644 --- a/src/windows/cns/Makefile.in +++ b/src/windows/cns/Makefile.in @@ -17,7 +17,7 @@ LIBDIR = $(BUILDTOP)\lib\krb KLIB = $(LIBDIR)\kerberos.lib RESFILE = $(OUTPRE)cnsres4.res XOBJS = $(RESFILE) -LOCALINCLUDES = /I$(BUILDTOP)\include +LOCALINCLUDES = /I$(BUILDTOP) /I$(BUILDTOP)\include !endif !if $(KVERSION) == 5 @@ -25,7 +25,7 @@ BUILDTOP =..\.. LIBDIR = $(BUILDTOP)\lib RESFILE = $(OUTPRE)cnsres5.res XOBJS = $(RESFILE) $(OUTPRE)kpasswd.obj $(OUTPRE)cns_reg.obj -LOCALINCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 +LOCALINCLUDES = /I$(BUILDTOP) /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 !endif ##### C Compiler diff --git a/src/windows/gss/ChangeLog b/src/windows/gss/ChangeLog index 64d57dd7dd..c513de9414 100644 --- a/src/windows/gss/ChangeLog +++ b/src/windows/gss/ChangeLog @@ -1,3 +1,7 @@ +2004-09-30 Jeffrey Altman + + * Makefile.in: Add $(BUILDTOP) to include path for patchlevel.h + 2004-02-12 Jeffrey Altman * Fix libpath for krbcc32.lib (only affects KRB5_KFW_COMPILE builds) diff --git a/src/windows/gss/Makefile.in b/src/windows/gss/Makefile.in index 9c87f185d4..60c54e8239 100644 --- a/src/windows/gss/Makefile.in +++ b/src/windows/gss/Makefile.in @@ -13,7 +13,7 @@ BUILDTOP=..\.. KFWINC= /I$(BUILDTOP)\..\..\krbcc\include KFWLIB= $(BUILDTOP)\..\..\..\..\target\lib\$(CPU)\$(OUTPRE_DBG)\krbcc32.lib !endif -LOCALINCLUDES= /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 $(KFWINC) +LOCALINCLUDES= /I$(BUILDTOP) /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 $(KFWINC) ##### RC Compiler RFLAGS = $(LOCALINCLUDES) diff --git a/src/windows/wintel/ChangeLog b/src/windows/wintel/ChangeLog index a741cfd547..63ad7a421e 100644 --- a/src/windows/wintel/ChangeLog +++ b/src/windows/wintel/ChangeLog @@ -1,3 +1,7 @@ +2004-09-30 Jeffrey Altman + + * Makefile.in: Add $(BUILDTOP) to include path for patchlevel.h + 2002-06-13 Ken Raeburn * Makefile.in (SYSLIBS): Use ws2_32.lib instead of wsock32.lib. diff --git a/src/windows/wintel/Makefile.in b/src/windows/wintel/Makefile.in index f1cdbc2690..3d2b382f04 100644 --- a/src/windows/wintel/Makefile.in +++ b/src/windows/wintel/Makefile.in @@ -15,7 +15,7 @@ KVERSION= 5 KRB = KRB$(KVERSION) BUILDTOP=..\.. -LOCALINCLUDES= /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 \ +LOCALINCLUDES= /I$(BUILDTOP) /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 \ /I$(BUILDTOP)\lib\crypto\des RESFILE = $(OUTPRE)telnet.res XOBJS = $(RESFILE) $(OUTPRE)k5stream.obj $(OUTPRE)enc_des.obj -- 2.47.3