Do win32 build in subdir

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

4 files changed, 35 insertions, 27 deletions

diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog
index 877f11cb2f..eeeac9f94a 100644
--- a/src/lib/krb5/keytab/ChangeLog
+++ b/src/lib/krb5/keytab/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 10 15:25:32 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Do win32 build in subdir.
+
 1998-11-13  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* Makefile.in: Set the myfulldir and mydir variables (which are
diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in
index 291541f9c1..d4f98f9b74 100644
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -8,7 +8,7 @@ CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=keytab
-##DOS##OBJFILE=..\$(PREFIXDIR).lst
+##DOS##OBJFILE=..\$(OUTPRE)$(PREFIXDIR).lst
 ##WIN16##LIBNAME=..\krb5.lib
 
 MAC_SUBDIRS = file
@@ -22,12 +22,12 @@ STLIBOBJS= \
 	read_servi.o
 
 OBJS=	\
-	ktadd.$(OBJEXT)		\
-	ktbase.$(OBJEXT)	\
-	ktdefault.$(OBJEXT)	\
-	ktfr_entry.$(OBJEXT)	\
-	ktremove.$(OBJEXT)	\
-	read_servi.$(OBJEXT)
+	$(OUTPRE)ktadd.$(OBJEXT)		\
+	$(OUTPRE)ktbase.$(OBJEXT)	\
+	$(OUTPRE)ktdefault.$(OBJEXT)	\
+	$(OUTPRE)ktfr_entry.$(OBJEXT)	\
+	$(OUTPRE)ktremove.$(OBJEXT)	\
+	$(OUTPRE)read_servi.$(OBJEXT)
 
 SRCS=	\
 	$(srcdir)/ktadd.c	\
@@ -39,17 +39,17 @@ SRCS=	\
 
 all-windows:: subdirs $(OBJFILE)
 
-##DOSsubdirs:: file\file.lst
-##DOSfile\file.lst::
+##DOSsubdirs:: file\$(OUTPRE)file.lst
+##DOSfile\$(OUTPRE)file.lst::
 ##DOS	cd file
 ##DOS	@echo Making in krb5\keytab\file
 ##DOS	-$(MAKE) -$(MFLAGS)
 ##DOS	cd ..
 
-##DOS$(OBJFILE): $(OBJS) file\file.lst
+##DOS$(OBJFILE): $(OBJS) file\$(OUTPRE)file.lst
 ##DOS	$(RM) $(OBJFILE)
 ##WIN16##	$(CP) nul: $(OBJFILE)
-##WIN32##	$(LIBECHO) -p $(PREFIXDIR)\ *.obj file\*.obj > $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(PREFIXDIR)\ $(OUTPRE)*.obj file\$(OUTPRE)*.obj > $(OBJFILE)
 
 all-unix:: all-libobjs
 clean-unix:: clean-libobjs
diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog
index f377ce47b3..7ca80a640c 100644
--- a/src/lib/krb5/keytab/file/ChangeLog
+++ b/src/lib/krb5/keytab/file/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 10 15:25:45 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Do win32 build in subdir.
+
 1998-11-13  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* Makefile.in: Set the myfulldir and mydir variables (which are
diff --git a/src/lib/krb5/keytab/file/Makefile.in b/src/lib/krb5/keytab/file/Makefile.in
index ffe3c6dbb7..1c0fa64dd5 100644
--- a/src/lib/krb5/keytab/file/Makefile.in
+++ b/src/lib/krb5/keytab/file/Makefile.in
@@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..\..
 ##DOS##PREFIXDIR=keytab\file
-##DOS##OBJFILE= file.lst
+##DOS##OBJFILE=$(OUTPRE)file.lst
 ##WIN16##LIBNAME=..\..\krb5.lib
 
 STLIBOBJS = \
@@ -44,21 +44,21 @@ SRCS= \
 	$(srcdir)/ser_ktf.c
 
 OBJS = \
-	ktf_add.$(OBJEXT)	\
-	ktf_close.$(OBJEXT)	\
-	ktf_endget.$(OBJEXT)	\
-	ktf_g_ent.$(OBJEXT)	\
-	ktf_g_name.$(OBJEXT)	\
-	ktf_next.$(OBJEXT)	\
-	ktf_resolv.$(OBJEXT)	\
-	ktf_remove.$(OBJEXT)	\
-	ktf_ssget.$(OBJEXT)	\
-	ktf_util.$(OBJEXT)	\
-	ktf_ops.$(OBJEXT)	\
-	ktf_wops.$(OBJEXT)	\
-	ktf_wreslv.$(OBJEXT)	\
-	ktf_defops.$(OBJEXT)	\
-	ser_ktf.$(OBJEXT)
+	$(OUTPRE)ktf_add.$(OBJEXT)	\
+	$(OUTPRE)ktf_close.$(OBJEXT)	\
+	$(OUTPRE)ktf_endget.$(OBJEXT)	\
+	$(OUTPRE)ktf_g_ent.$(OBJEXT)	\
+	$(OUTPRE)ktf_g_name.$(OBJEXT)	\
+	$(OUTPRE)ktf_next.$(OBJEXT)	\
+	$(OUTPRE)ktf_resolv.$(OBJEXT)	\
+	$(OUTPRE)ktf_remove.$(OBJEXT)	\
+	$(OUTPRE)ktf_ssget.$(OBJEXT)	\
+	$(OUTPRE)ktf_util.$(OBJEXT)	\
+	$(OUTPRE)ktf_ops.$(OBJEXT)	\
+	$(OUTPRE)ktf_wops.$(OBJEXT)	\
+	$(OUTPRE)ktf_wreslv.$(OBJEXT)	\
+	$(OUTPRE)ktf_defops.$(OBJEXT)	\
+	$(OUTPRE)ser_ktf.$(OBJEXT)
 
 ##DOS##LIBOBJS = $(OBJS)