diff options
| author | Danilo Almeida <dalmeida@mit.edu> | 1999-05-10 19:43:50 +0000 |
|---|---|---|
| committer | Danilo Almeida <dalmeida@mit.edu> | 1999-05-10 19:43:50 +0000 |
| commit | a852ce8806833825df450316321c5bee06a08d98 (patch) | |
| tree | 24f8a2540efcd83a3f189d2728b686e175957325 /src/windows/wintel | |
| parent | dc23272cbb13d0fdc9751ac4e13dc0459303ce0e (diff) | |
| download | krb5-a852ce8806833825df450316321c5bee06a08d98.tar.gz krb5-a852ce8806833825df450316321c5bee06a08d98.tar.xz krb5-a852ce8806833825df450316321c5bee06a08d98.zip | |
Do win32 build in subdir
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11432 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 | 39 |
2 files changed, 21 insertions, 22 deletions
diff --git a/src/windows/wintel/ChangeLog b/src/windows/wintel/ChangeLog index 9154d3fb25..6e7cc0671b 100644 --- a/src/windows/wintel/ChangeLog +++ b/src/windows/wintel/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:28:51 1999 Danilo Almeida <dalmeida@mit.edu> + + * Makefile.in: Do win32 build in subdir. + Fri Feb 5 01:42:07 1999 Theodore Y. Ts'o <tytso@mit.edu> * enc_des.c (fb64_session): Call des_init_random_number_generator diff --git a/src/windows/wintel/Makefile.in b/src/windows/wintel/Makefile.in index c27992cb29..32ca0abf95 100644 --- a/src/windows/wintel/Makefile.in +++ b/src/windows/wintel/Makefile.in @@ -1,11 +1,11 @@ # Makefile for the Kerberos for Windows telnet client # Works for both k4 and k5 releases. # -OBJS = telnet.obj negotiat.obj auth.obj edit.obj emul.obj \ - font.obj intern.obj screen.obj encrypt.obj genget.obj +OBJS = $(OUTPRE)telnet.obj $(OUTPRE)negotiat.obj $(OUTPRE)auth.obj $(OUTPRE)edit.obj $(OUTPRE)emul.obj \ + $(OUTPRE)font.obj $(OUTPRE)intern.obj $(OUTPRE)screen.obj $(OUTPRE)encrypt.obj $(OUTPRE)genget.obj ##### Options -DEBUG = 1 +# Set NODEBUG if building release instead of debug !IF ! defined(KVERSION) KRBOPT=-DFORWARD -DAUTHENTICATION -DENCRYPTION -DDES_ENCRYPTION KVERSION = 5 @@ -16,13 +16,9 @@ BUILDTOP =..\.. INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 \ /I$(BUILDTOP)\lib\crypto\des ##WIN16##XOBJS = k5stream.obj enc_des.obj -##WIN32##XOBJS = resource.obj k5stream.obj enc_des.obj +##WIN32##XOBJS = $(OUTPRE)resource.obj $(OUTPRE)k5stream.obj $(OUTPRE)enc_des.obj -!if defined(DEBUG) -CFLAGS = $(CCOPTS2) $(INCLUDES) /D$(KRB)=1 $(KRBOPT) /Zi -!else CFLAGS = $(CCOPTS2) $(INCLUDES) /D$(KRB)=1 $(KRBOPT) -!endif ##WIN32##RFLAGS = $(INCLUDES) ##WIN16##RFLAGS = /nologo $(INCLUDES) @@ -34,30 +30,29 @@ LIBS = $(KLIB) $(CLIB) $(WLIB) ##WIN16##SYSLIBS = libw llibcew commdlg winsock ##WIN32##SYSLIBS = kernel32.lib wsock32.lib user32.lib gdi32.lib \ ##WIN32## comdlg32.lib -!if defined(DEBUG) -##WIN16##LFLAGS = /co /nologo /nod /nopackcode /map:full -##WIN32##LFLAGS = /nologo /debug -!else +!ifdef NODEBUG ##WIN16##LFLAGS = /nologo /nod /nopackcode -##WIN32##LFLAGS = /nologo +!else +##WIN16##LFLAGS = /co /nologo /nod /nopackcode /map:full !endif +##WIN32##LFLAGS = /nologo $(LOPTS) -all:: makefile telnet.exe +all:: makefile $(OUTPRE)telnet.exe -telnet.exe: $*.def $(OBJS) $(XOBJS) $(LIBS) +$(OUTPRE)telnet.exe: telnet.def $(OBJS) $(XOBJS) $(LIBS) ##WIN16## $(LINK) $(LFLAGS) $(OBJS) $(XOBJS), $@, $*.map, \ -##WIN16## $(LIBS) $(SYSLIBS), $*.def +##WIN16## $(LIBS) $(SYSLIBS), telnet.def ##WIN16## $(RC) $(RFLAGS) /k -DTELNET_APP telnet.rc $@ ##WIN32## $(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \ ##WIN32## $(LIBS) $(SYSLIBS) -##WIN32##telnet.res: telnet.rc -##WIN32## $(RC) $(RFLAGS) -D_WIN32 -DTELNET_APP /r $*.rc -##WIN32##resource.obj: telnet.res -##WIN32## $(CVTRES) /nologo /out:resource.obj telnet.res +##WIN32##$(OUTPRE)telnet.res: telnet.rc +##WIN32## $(RC) $(RFLAGS) -D_WIN32 -DTELNET_APP -fo $@ /r $** +##WIN32##$(OUTPRE)resource.obj: $(OUTPRE)telnet.res +##WIN32## $(CVTRES) /nologo /out:$@ $** install:: - copy telnet.exe $(DESTDIR) + copy $(OUTPRE)telnet.exe $(DESTDIR) clean:: - $(RM) *.exe *.res *.map + $(RM) $(OUTPRE)*.exe $(OUTPRE)*.res $(OUTPRE)*.map |