diff options
| author | Danilo Almeida <dalmeida@mit.edu> | 1999-12-04 01:50:44 +0000 |
|---|---|---|
| committer | Danilo Almeida <dalmeida@mit.edu> | 1999-12-04 01:50:44 +0000 |
| commit | 780f69ec5044e8862041cfd94180922166b5460f (patch) | |
| tree | d1477b584c1c232cb46d71e2e26c9538380da49b /src/windows/wintel | |
| parent | 2bd37be8b04977f8fc9bbdefffc1f2ebe89db1f7 (diff) | |
| download | krb5-780f69ec5044e8862041cfd94180922166b5460f.tar.gz krb5-780f69ec5044e8862041cfd94180922166b5460f.tar.xz krb5-780f69ec5044e8862041cfd94180922166b5460f.zip | |
Pull src/windows changes from krb5-1-1 branch
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11936 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows/wintel')
| -rw-r--r-- | src/windows/wintel/ChangeLog | 4 | ||||
| -rw-r--r-- | src/windows/wintel/Makefile.in | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/windows/wintel/ChangeLog b/src/windows/wintel/ChangeLog index 1bb010591..a9d690090 100644 --- a/src/windows/wintel/ChangeLog +++ b/src/windows/wintel/ChangeLog @@ -1,3 +1,7 @@ +1999-12-03 Danilo Almeida <dalmeida@mit.edu> + + * Makefile.in: Windows fix for updated win-pre.in. + Mon May 17 19:54:51 1999 Danilo Almeida <dalmeida@mit.edu> * Makefile.in: Add included version resouce script to diff --git a/src/windows/wintel/Makefile.in b/src/windows/wintel/Makefile.in index 6abad615c..56cddb188 100644 --- a/src/windows/wintel/Makefile.in +++ b/src/windows/wintel/Makefile.in @@ -15,13 +15,13 @@ KVERSION= 5 KRB = KRB$(KVERSION) BUILDTOP=..\.. -INCLUDES= /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 \ +LOCALINCLUDES= /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 -CFLAGS = $(CCOPTS2) $(INCLUDES) /D$(KRB)=1 $(KRBOPT) -RFLAGS = $(INCLUDES) +DEFINES = /D$(KRB)=1 $(KRBOPT) +RFLAGS = $(LOCALINCLUDES) RCFLAGS = $(RFLAGS) -D_WIN32 -DTELNET_APP ##### Linker |