Do win32 build in subdir

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11432 dc483132-0cff-0310-8789-dd5450dbe970

10 files changed, 98 insertions, 86 deletions

diff --git a/src/windows/cns/ChangeLog b/src/windows/cns/ChangeLog
index 402a88209..1c8b5f5b9 100644
--- a/src/windows/cns/ChangeLog
+++ b/src/windows/cns/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 10 15:27:57 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Do win32 build in subdir.
+
 Tue Jan  5 01:38:18 1999  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* cns.c (position_dialog): If the registry position for the window
diff --git a/src/windows/cns/Makefile.in b/src/windows/cns/Makefile.in
index 2c4eef30d..511f3dd27 100644
--- a/src/windows/cns/Makefile.in
+++ b/src/windows/cns/Makefile.in
@@ -2,10 +2,10 @@
 # Works for both k4 and k5 releases.
 #
 NAME 	 = krb5
-OBJS 	 = cns.obj tktlist.obj password.obj options.obj
+OBJS 	 = $(OUTPRE)cns.obj $(OUTPRE)tktlist.obj $(OUTPRE)password.obj $(OUTPRE)options.obj
 
 ##### Options
-DEBUG=yes
+# Set NODEBUG if building release instead of debug
 !IF ! defined(KVERSION)
 KVERSION = 5
 !endif
@@ -26,15 +26,15 @@ BUILDTOP =..\..
 LIBDIR	 = $(BUILDTOP)\lib
 INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5
 ##WIN16##XOBJS    = kpasswd.obj
-##WIN32##XOBJS    = cnsres5.obj kpasswd.obj cns_reg.obj
+##WIN32##XOBJS    = $(OUTPRE)cnsres5.obj $(OUTPRE)kpasswd.obj $(OUTPRE)cns_reg.obj
 !endif
 
 ##### C Compiler
 #CC 	 = cl
-!if defined(DEBUG)
-CFLAGS 	 = $(CCOPTS2) $(INCLUDES) /D$(KRB)=1 /Zi /Yd /DDEBUG
-!else
+!ifdef NODEBUG
 CFLAGS 	 = $(CCOPTS2) $(INCLUDES) /D$(KRB)=1
+!else
+CFLAGS 	 = $(CCOPTS2) $(INCLUDES) /D$(KRB)=1 /DDEBUG
 !endif
 
 ##### RC Compiler
@@ -47,21 +47,19 @@ CVTRES = cvtres
 
 ##### Linker
 LINK 	 = link
-LIBS 	 = $(KLIB) $(CLIB) $(WLIB) ../lib/libwin.lib
+LIBS 	 = $(KLIB) $(CLIB) $(WLIB) ../lib/$(OUTPRE)libwin.lib
 ##WIN16##SYSLIBS  = libw llibcew
-!if defined(DEBUG)
-##WIN16##LFLAGS 	 = /co /nologo /nod /nopackcode /map:full
-##WIN32##LFLAGS	 = /nologo /debug
-##WIN32##SYSLIBS  = kernel32.lib wsock32.lib user32.lib gdi32.lib advapi32.lib
+##WIN32##SYSLIBS = kernel32.lib wsock32.lib user32.lib gdi32.lib advapi32.lib
+!ifdef NODEBUG
+##WIN16##LFLAGS = /nologo /nod /nopackcode
 !else
-##WIN16##LFLAGS 	 = /nologo /nod /nopackcode
-##WIN32##LFLAGS	 = /nologo 
-##WIN32##SYSLIBS  = kernel32.lib wsock32.lib user32.lib gdi32.lib advapi32.lib
+##WIN16##LFLAGS = /co /nologo /nod /nopackcode /map:full
 !endif
+##WIN32##LFLAGS = /nologo $(LOPTS)
 
-all:: makefile $(NAME).exe
+all:: makefile $(OUTPRE)$(NAME).exe
 
-$(NAME).exe: $*.def $(OBJS) $(XOBJS) $(LIBS)
+$(OUTPRE)$(NAME).exe: $(NAME).def $(OBJS) $(XOBJS) $(LIBS)
 ##WIN16##	$(LINK) $(LFLAGS) $(OBJS) $(XOBJS), $@, $*.map, \
 ##WIN16##	  $(LIBS) $(SYSLIBS), $*.def
 ##WIN16##	$(RC) $(RFLAGS) -DKRB5_APP /k cnsres4.res $@
@@ -72,20 +70,24 @@ $(NAME).exe: $*.def $(OBJS) $(XOBJS) $(LIBS)
 ##WIN32##	$(RC) $(RFLAGS) -DKRB5_APP /r $*.rc
 ##WIN32##	$(CVTRES) /nologo /out:$*.obj $*.res
 
+##WIN32##{}.rc{$(OUTPRE)}.obj:
+##WIN32##	$(RC) $(RFLAGS) -DKRB5_APP -fo $*.res /r $<
+##WIN32##	$(CVTRES) /nologo /out:$*.obj $*.res
+
 install::
-	$(CP) $(NAME).exe $(DESTDIR)
+	$(CP) $(OUTPRE)$(NAME).exe $(DESTDIR)
 	$(CP) krb5.hlp $(DESTDIR)
 
 clean:: 
-	$(RM) *.exe
-	$(RM) *.res
-	$(RM) *.map
+	$(RM) $(OUTPRE)*.exe
+	$(RM) $(OUTPRE)*.res
+	$(RM) $(OUTPRE)*.map
 
 $(OBJS): cns.h tktlist.h
 
-cns.res: cns.h
+$(OUTPRE)cns.res: cns.h
 
-cns.res: clock00.ico clock05.ico clock10.ico clock15.ico clock20.ico \
+$(OUTPRE)cns.res: clock00.ico clock05.ico clock10.ico clock15.ico clock20.ico \
 	 clock25.ico clock30.ico clock35.ico clock40.ico clock45.ico \
 	 clock50.ico clock55.ico clock60.ico clockexp.ico clocktkt.ico \
 	 cns.ico
diff --git a/src/windows/gina/ChangeLog b/src/windows/gina/ChangeLog
new file mode 100644
index 000000000..d27edc344
--- /dev/null
+++ b/src/windows/gina/ChangeLog
@@ -0,0 +1,4 @@
+Mon May 10 15:28:12 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Do win32 build in subdir.
+
diff --git a/src/windows/gina/Makefile.in b/src/windows/gina/Makefile.in
index bcadf4acb..8b72ab16d 100644
--- a/src/windows/gina/Makefile.in
+++ b/src/windows/gina/Makefile.in
@@ -1,8 +1,8 @@
 ##DOSBUILDTOP=..\..
 
-OBJS=	ginastub.$(OBJEXT)
+OBJS=	$(OUTPRE)ginastub.$(OBJEXT)
 
-DEBUG=1
+# Set NODEBUG if building release instead of debug
 
 INCLUDES = -I$(BUILDTOP)\include
 
@@ -11,26 +11,26 @@ WINLIBS = advapi32.lib comctl32.lib \
 
 #comctl32.lib msvcrt.lib advapi32.lib gdi32.lib comdlg32.lib winspool.lib
 
-WINDLLFLAGS = /nodefaultlib /incremental:no /pdb:none /release \
-	/nologo /align:0x1000 /base:0x1c000000 /dll /debug
+WINDLLFLAGS = /nodefaultlib /incremental:no /release \
+	/nologo /base:0x1c000000 /dll $(LOPTS)
 
-##WIN32##!if defined(DEBUG)
-##WIN32##CFLAGS = $(CCOPTS2) $(INCLUDES) -DUNICODE -D_UNICODE -DDBG
-##WIN32##!else
+##WIN32##!ifdef NODEBUG
 ##WIN32##CFLAGS = $(CCOPTS2) $(INCLUDES) -DUNICODE -D_UNICODE
+##WIN32##!else
+##WIN32##CFLAGS = $(CCOPTS2) $(INCLUDES) -DUNICODE -D_UNICODE -DDBG
 ##WIN32##!endif
 
 all-windows::
-##WIN32##all-windows:: kgina.dll
+##WIN32##all-windows:: $(OUTPRE)kgina.dll
 
 clean-windows::
-	$(RM) kgina.dll
+	$(RM) $(OUTPRE)kgina.dll
 
-kgina.dll: $(OBJS) $(KLIB) $(CLIB)
+$(OUTPRE)kgina.dll: $(OBJS) $(KLIB) $(CLIB)
 	link $(WINDLLFLAGS) -def:gina.def -out:$*.dll \
 	   $** $(WINLIBS)
 
-ginastub.obj: ginastub.h
+$(OUTPRE)ginastub.obj: ginastub.h
 
-#gina.res: res.rc
+#$(OUTPRE)gina.res: res.rc
 #	$(RC) $(RFLAGS) -r -fo $@ res.rc
diff --git a/src/windows/gss/ChangeLog b/src/windows/gss/ChangeLog
index 97c6fc7d1..199831594 100644
--- a/src/windows/gss/ChangeLog
+++ b/src/windows/gss/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 10 15:28:27 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Do win32 build in subdir.
+
 Tue Aug  5 18:45:35 1997  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* Makefile.in, gss.rc: Use the version resource from
diff --git a/src/windows/gss/Makefile.in b/src/windows/gss/Makefile.in
index a6be399ae..0ac783705 100644
--- a/src/windows/gss/Makefile.in
+++ b/src/windows/gss/Makefile.in
@@ -1,20 +1,16 @@
 # makefile: Constructs the Kerberos for Windows ticket manager
 # Works for both k4 and k5 releases.
 #
-OBJS 	 = gss.obj gss-client.obj gss-misc.obj
-##WIN32##XOBJS	= resource.obj
+OBJS 	 = $(OUTPRE)gss.obj $(OUTPRE)gss-client.obj $(OUTPRE)gss-misc.obj
+##WIN32##XOBJS	= $(OUTPRE)resource.obj
 
 ##### Options
-DEBUG 	 = 1
+# Set NODEBUG if building release instead of debug
 BUILDTOP =..\..
 INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5
 
 ##### C Compiler
-!if $(DEBUG)
-CFLAGS 	 = $(CCOPTS2) $(INCLUDES) /Zi
-!else
 CFLAGS 	 = $(CCOPTS2) $(INCLUDES)
-!endif
 
 ##### RC Compiler
 ##WIN16##RFLAGS 	 = /nologo $(INCLUDES)
@@ -26,40 +22,39 @@ LINK 	 = link
 LIBS 	 = $(GLIB) $(CLIB) $(WLIB)
 ##WIN16##SYSLIBS  = libw llibcew
 ##WIN32##SYSLIBS  = kernel32.lib wsock32.lib user32.lib gdi32.lib comdlg32.lib
-!if $(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 gss.exe
+all:: makefile $(OUTPRE)gss.exe
 
-gss.exe: $*.def $(OBJS) $(XOBJS) $(LIBS)
+$(OUTPRE)gss.exe: gss.def $(OBJS) $(XOBJS) $(LIBS)
 ##WIN16##	$(LINK) $(LFLAGS) $(OBJS), $@, $*.map, \
-##WIN16##	  $(LIBS) $(SYSLIBS), $*.def
+##WIN16##	  $(LIBS) $(SYSLIBS), gss.def
 ##WIN16##	$(RC) $(RFLAGS) /k -DGSS_APP $*.rc $@
 ##WIN32##	$(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \
 ##WIN32##	  $(LIBS) $(SYSLIBS)
 
-##WIN32##gss.res: gss.rc
-##WIN32##	$(RC) $(RFLAGS) -D_WIN32 -DGSS_APP /r $*.rc
+##WIN32##$(OUTPRE)gss.res: gss.rc
+##WIN32##	$(RC) $(RFLAGS) -D_WIN32 -DGSS_APP -fo $@ /r gss.rc
 
-##WIN32##resource.obj: gss.res
-##WIN32##	$(CVTRES) /nologo /out:$@ gss.res
+##WIN32##$(OUTPRE)resource.obj: $(OUTPRE)gss.res
+##WIN32##	$(CVTRES) /nologo /out:$@ $(OUTPRE)gss.res
 
-$(OBJS) gss.res: gss.h
+$(OBJS) $(OUTPRE)gss.res: gss.h
 
 install::
-	copy gss.exe ..\floppy
+	copy $(OUTPRE)gss.exe ..\floppy
 
 clean:: 
-	if exist *.exe del *.exe
+	if exist $(OUTPRE)*.exe del $(OUTPRE)*.exe
 	if exist ..\floppy\gss.exe del ..\floppy\gss.exe
-	if exist *.obj del *.obj
-	if exist *.res del *.res
-	if exist *.map del *.map
-	if exist *.pdb del *.pdb
+	if exist $(OUTPRE)*.obj del $(OUTPRE)*.obj
+	if exist $(OUTPRE)*.res del $(OUTPRE)*.res
+	if exist $(OUTPRE)*.map del $(OUTPRE)*.map
+	if exist $(OUTPRE)*.pdb del $(OUTPRE)*.pdb
 	if exist *.err del *.err
 
diff --git a/src/windows/lib/ChangeLog b/src/windows/lib/ChangeLog
index 686fb7e78..1fead4f8e 100644
--- a/src/windows/lib/ChangeLog
+++ b/src/windows/lib/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 10 15:28:40 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Do win32 build in subdir.
+
 1999-04-01  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	*  gic.c (gic_prompter), vardlg.c (vardlg_build), gic.h, vardlg.h:
diff --git a/src/windows/lib/Makefile.in b/src/windows/lib/Makefile.in
index ae1d0d1a5..0e8197a5a 100644
--- a/src/windows/lib/Makefile.in
+++ b/src/windows/lib/Makefile.in
@@ -2,18 +2,18 @@ CFLAGS = $(CCOPTS2) $(DEFS)
 
 ##DOSBUILDTOP = ..\..
 
-lib-windows: libwin.lib
+lib-windows: $(OUTPRE)libwin.lib
 
 SRCS=	vardlg.c gic.c registry.c
 
-OBJS=	vardlg.obj gic.obj registry.obj
+OBJS=	$(OUTPRE)vardlg.obj $(OUTPRE)gic.obj $(OUTPRE)registry.obj
 
-libwin.lib: $(OBJS)
+$(OUTPRE)libwin.lib: $(OBJS)
        lib /nologo /out:$*.lib $(OBJS)
 
 all-windows:: lib-windows
 
 clean-windows::
-	$(RM) *.exp *.map libwin.lib *.obj
+	$(RM) $(OUTPRE)*.exp $(OUTPRE)*.map $(OUTPRE)libwin.lib $(OUTPRE)*.obj
 
 install-windows::
diff --git a/src/windows/wintel/ChangeLog b/src/windows/wintel/ChangeLog
index 9154d3fb2..6e7cc0671 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 c27992cb2..32ca0abf9 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