Do win32 build in subdir

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

8 files changed, 117 insertions, 101 deletions

diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index 70a0bca39..1c0636f9b 100644
--- a/src/lib/gssapi/ChangeLog
+++ b/src/lib/gssapi/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 10 15:21:50 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Do win32 build in subdir.
+
 1999-02-19  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* Makefile.in (DLL_FILE_DEF): Tell the Makefile template that we
diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index f1514e094..30e6b9d54 100644
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -4,9 +4,9 @@ mydir=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
 LOCAL_SUBDIRS= generic krb5
 
-##DOSLIBNAME=gssapi.lib
-##DOSOBJFILELIST=@generic.lst @krb5.lst
-##DOSOBJFILEDEP=generic.lst krb5.lst
+##DOSLIBNAME=$(OUTPRE)gssapi.lib
+##DOSOBJFILELIST=@$(OUTPRE)generic.lst @$(OUTPRE)krb5.lst
+##DOSOBJFILEDEP=$(OUTPRE)generic.lst $(OUTPRE)krb5.lst
 
 ##DOS##DLL_EXP_TYPE=GSS
 
diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index ef41d06a2..08a0e1200 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 10 15:22:12 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Do win32 build in subdir.
+
 Thu Mar 25 22:41:30 1999  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* disp_major_status.c (display_unknown): Fix the length of the
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 036bbe774..1e21e04fd 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -6,13 +6,13 @@ CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir)
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=generic
-##DOS##OBJFILE=..\generic.lst
+##DOS##OBJFILE=..\$(OUTPRE)generic.lst
 ##WIN16##LIBNAME=..\gssapi.lib
 
 ##DOS##DLL_EXP_TYPE=GSS
 
 ETSRCS= gssapi_err_generic.c
-ETOBJS= gssapi_err_generic.$(OBJEXT)
+ETOBJS= $(OUTPRE)gssapi_err_generic.$(OBJEXT)
 ETHDRS= gssapi_err_generic.h
 
 EHDRDIR= $(BUILDTOP)$(S)include$(S)gssapi
@@ -25,7 +25,7 @@ $(EHDRDIR)$(S)gssapi.h: gssapi.h
 $(EHDRDIR)$(S)gssapi_generic.h: $(srcdir)$(S)gssapi_generic.h
 	$(CP) $(srcdir)$(S)gssapi_generic.h $@
 
-gssapi_err_generic.$(OBJEXT): gssapi_err_generic.c
+$(OUTPRE)gssapi_err_generic.$(OBJEXT): gssapi_err_generic.c
 gssapi_err_generic.h: gssapi_err_generic.et
 gssapi_err_generic.c: gssapi_err_generic.et
 
@@ -65,21 +65,21 @@ SRCS = \
 	gssapi_err_generic.c
 
 OBJS = \
-	disp_com_err_status.$(OBJEXT) \
-	disp_major_status.$(OBJEXT) \
-	gssapi_generic.$(OBJEXT) \
-	oid_ops.$(OBJEXT) \
-	rel_buffer.$(OBJEXT) \
-	rel_oid_set.$(OBJEXT) \
-	util_buffer.$(OBJEXT) \
-	util_canonhost.$(OBJEXT) \
-	util_dup.$(OBJEXT) \
-	util_oid.$(OBJEXT) \
-	util_ordering.$(OBJEXT) \
-	util_set.$(OBJEXT) \
-	util_token.$(OBJEXT) \
-	util_validate.$(OBJEXT) \
-	gssapi_err_generic.$(OBJEXT)
+	$(OUTPRE)disp_com_err_status.$(OBJEXT) \
+	$(OUTPRE)disp_major_status.$(OBJEXT) \
+	$(OUTPRE)gssapi_generic.$(OBJEXT) \
+	$(OUTPRE)oid_ops.$(OBJEXT) \
+	$(OUTPRE)rel_buffer.$(OBJEXT) \
+	$(OUTPRE)rel_oid_set.$(OBJEXT) \
+	$(OUTPRE)util_buffer.$(OBJEXT) \
+	$(OUTPRE)util_canonhost.$(OBJEXT) \
+	$(OUTPRE)util_dup.$(OBJEXT) \
+	$(OUTPRE)util_oid.$(OBJEXT) \
+	$(OUTPRE)util_ordering.$(OBJEXT) \
+	$(OUTPRE)util_set.$(OBJEXT) \
+	$(OUTPRE)util_token.$(OBJEXT) \
+	$(OUTPRE)util_validate.$(OBJEXT) \
+	$(OUTPRE)gssapi_err_generic.$(OBJEXT)
 
 STLIBOBJS = \
 	disp_com_err_status.o \
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index ddb73e024..e554d09b5 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 10 15:22:27 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Do win32 build in subdir.
+
 Fri Apr 30 12:27:14 1999  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* set_ccache.c (gss_krb5_ccache_name): Add call to free the
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index 2e0982cb5..0911be555 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -6,16 +6,16 @@ CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=krb5
-##DOS##OBJFILE = ..\krb5.lst
+##DOS##OBJFILE = ..\$(OUTPRE)krb5.lst
 ##WIN16##LIBNAME=..\gssapi.lib
 
 ##DOS##DLL_EXP_TYPE=GSS
 
 ETSRCS= gssapi_err_krb5.c
-ETOBJS= gssapi_err_krb5.$(OBJEXT)
+ETOBJS= $(OUTPRE)gssapi_err_krb5.$(OBJEXT)
 ETHDRS= gssapi_err_krb5.h
 
-gssapi_err_krb5.$(OBJEXT): gssapi_err_krb5.c
+$(OUTPRE)gssapi_err_krb5.$(OBJEXT): gssapi_err_krb5.c
 gssapi_err_krb5.h: gssapi_err_krb5.et
 gssapi_err_krb5.c: gssapi_err_krb5.et
 
@@ -68,49 +68,49 @@ SRCS = \
 #	$(srcdir)/k5mech.c
 
 OBJS = \
-	accept_sec_context.$(OBJEXT) \
-	acquire_cred.$(OBJEXT) \
-	add_cred.$(OBJEXT) \
-	canon_name.$(OBJEXT) \
-	compare_name.$(OBJEXT) \
-	context_time.$(OBJEXT) \
-	copy_ccache.$(OBJEXT) \
-	delete_sec_context.$(OBJEXT) \
-	disp_name.$(OBJEXT) \
-	disp_status.$(OBJEXT) \
-	duplicate_name.$(OBJEXT) \
-	export_name.$(OBJEXT) \
-	export_sec_context.$(OBJEXT) \
-	get_tkt_flags.$(OBJEXT) \
-	gssapi_krb5.$(OBJEXT) \
-	import_name.$(OBJEXT) \
-	import_sec_context.$(OBJEXT) \
-	indicate_mechs.$(OBJEXT) \
-	init_sec_context.$(OBJEXT) \
-	inq_context.$(OBJEXT) \
-	inq_cred.$(OBJEXT) \
-	inq_names.$(OBJEXT) \
-	k5seal.$(OBJEXT) \
-	k5unseal.$(OBJEXT) \
-	krb5_gss_glue.$(OBJEXT) \
-	process_context_token.$(OBJEXT) \
-	rel_cred.$(OBJEXT) \
-	rel_oid.$(OBJEXT) \
-	rel_name.$(OBJEXT) \
-	seal.$(OBJEXT) \
-	ser_sctx.$(OBJEXT) \
-	set_ccache.$(OBJEXT) \
-	sign.$(OBJEXT) \
-	unseal.$(OBJEXT) \
-	util_cksum.$(OBJEXT) \
-	util_crypt.$(OBJEXT) \
-	util_ctxsetup.$(OBJEXT) \
-	util_seed.$(OBJEXT) \
-	util_seqnum.$(OBJEXT) \
-	val_cred.$(OBJEXT) \
-	verify.$(OBJEXT) \
-	wrap_size_limit.$(OBJEXT) \
-	gssapi_err_krb5.$(OBJEXT)
+	$(OUTPRE)accept_sec_context.$(OBJEXT) \
+	$(OUTPRE)acquire_cred.$(OBJEXT) \
+	$(OUTPRE)add_cred.$(OBJEXT) \
+	$(OUTPRE)canon_name.$(OBJEXT) \
+	$(OUTPRE)compare_name.$(OBJEXT) \
+	$(OUTPRE)context_time.$(OBJEXT) \
+	$(OUTPRE)copy_ccache.$(OBJEXT) \
+	$(OUTPRE)delete_sec_context.$(OBJEXT) \
+	$(OUTPRE)disp_name.$(OBJEXT) \
+	$(OUTPRE)disp_status.$(OBJEXT) \
+	$(OUTPRE)duplicate_name.$(OBJEXT) \
+	$(OUTPRE)export_name.$(OBJEXT) \
+	$(OUTPRE)export_sec_context.$(OBJEXT) \
+	$(OUTPRE)get_tkt_flags.$(OBJEXT) \
+	$(OUTPRE)gssapi_krb5.$(OBJEXT) \
+	$(OUTPRE)import_name.$(OBJEXT) \
+	$(OUTPRE)import_sec_context.$(OBJEXT) \
+	$(OUTPRE)indicate_mechs.$(OBJEXT) \
+	$(OUTPRE)init_sec_context.$(OBJEXT) \
+	$(OUTPRE)inq_context.$(OBJEXT) \
+	$(OUTPRE)inq_cred.$(OBJEXT) \
+	$(OUTPRE)inq_names.$(OBJEXT) \
+	$(OUTPRE)k5seal.$(OBJEXT) \
+	$(OUTPRE)k5unseal.$(OBJEXT) \
+	$(OUTPRE)krb5_gss_glue.$(OBJEXT) \
+	$(OUTPRE)process_context_token.$(OBJEXT) \
+	$(OUTPRE)rel_cred.$(OBJEXT) \
+	$(OUTPRE)rel_oid.$(OBJEXT) \
+	$(OUTPRE)rel_name.$(OBJEXT) \
+	$(OUTPRE)seal.$(OBJEXT) \
+	$(OUTPRE)ser_sctx.$(OBJEXT) \
+	$(OUTPRE)set_ccache.$(OBJEXT) \
+	$(OUTPRE)sign.$(OBJEXT) \
+	$(OUTPRE)unseal.$(OBJEXT) \
+	$(OUTPRE)util_cksum.$(OBJEXT) \
+	$(OUTPRE)util_crypt.$(OBJEXT) \
+	$(OUTPRE)util_ctxsetup.$(OBJEXT) \
+	$(OUTPRE)util_seed.$(OBJEXT) \
+	$(OUTPRE)util_seqnum.$(OBJEXT) \
+	$(OUTPRE)val_cred.$(OBJEXT) \
+	$(OUTPRE)verify.$(OBJEXT) \
+	$(OUTPRE)wrap_size_limit.$(OBJEXT) \
+	$(OUTPRE)gssapi_err_krb5.$(OBJEXT)
 
 #	k5mech.$(OBJEXT) \
 #	pname_to_uid.$(OBJEXT)
diff --git a/src/lib/gssapi/mechglue/ChangeLog b/src/lib/gssapi/mechglue/ChangeLog
index de15c8510..da48eb036 100644
--- a/src/lib/gssapi/mechglue/ChangeLog
+++ b/src/lib/gssapi/mechglue/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 10 15:22:42 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Do win32 build in subdir.
+
 1999-02-19  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* Makefile.in (DLL_FILE_DEF): Tell the Makefile template that we
diff --git a/src/lib/gssapi/mechglue/Makefile.in b/src/lib/gssapi/mechglue/Makefile.in
index 321182e0e..3b7c17d77 100644
--- a/src/lib/gssapi/mechglue/Makefile.in
+++ b/src/lib/gssapi/mechglue/Makefile.in
@@ -5,7 +5,7 @@ BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir)
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\gssapi.$(LIBEXT)
+##DOSLIBNAME=..\$(OUTPRE)gssapi.$(LIBEXT)
 
 ##DOS##DLL_EXP_TYPE=GSS
 
@@ -50,37 +50,37 @@ SRCS	= $(srcdir)/g_acquire_cred.c \
 	  $(srcdir)/oid_ops.c \
 	  $(srcdir)/g_mechname.c 
 
-OBJS	= g_acquire_cred.$(OBJEXT) \
-	  g_rel_cred.$(OBJEXT) \
-	  g_init_sec_context.$(OBJEXT) \
-	  g_accept_sec_context.$(OBJEXT) \
-	  g_process_context.$(OBJEXT) \
-	  g_delete_sec_context.$(OBJEXT) \
-	  g_imp_sec_context.$(OBJEXT) \
-	  g_exp_sec_context.$(OBJEXT) \
-	  g_context_time.$(OBJEXT) \
-	  g_sign.$(OBJEXT) \
-	  g_verify.$(OBJEXT) \
-	  g_seal.$(OBJEXT) \
-	  g_unseal.$(OBJEXT) \
-	  g_dsp_status.$(OBJEXT) \
-	  g_indicate_mechs.$(OBJEXT) \
-	  g_compare_name.$(OBJEXT) \
-	  g_dsp_name.$(OBJEXT) \
-	  g_imp_name.$(OBJEXT) \
-	  g_rel_name.$(OBJEXT) \
-	  g_rel_buffer.$(OBJEXT) \
-	  g_rel_oid_set.$(OBJEXT) \
-	  g_oid_ops.$(OBJEXT) \
-	  g_inq_cred.$(OBJEXT) \
-	  g_inq_context.$(OBJEXT) \
-	  g_inq_names.$(OBJEXT) \
-	  g_initialize.$(OBJEXT) \
-	  g_glue.$(OBJEXT) \
-	  gssd_pname_to_uid.$(OBJEXT) \
-	  gen_oids.$(OBJEXT) \
-	  oid_ops.$(OBJEXT) \
-	  g_mechname.$(OBJEXT)
+OBJS	= $(OUTPRE)g_acquire_cred.$(OBJEXT) \
+	  $(OUTPRE)g_rel_cred.$(OBJEXT) \
+	  $(OUTPRE)g_init_sec_context.$(OBJEXT) \
+	  $(OUTPRE)g_accept_sec_context.$(OBJEXT) \
+	  $(OUTPRE)g_process_context.$(OBJEXT) \
+	  $(OUTPRE)g_delete_sec_context.$(OBJEXT) \
+	  $(OUTPRE)g_imp_sec_context.$(OBJEXT) \
+	  $(OUTPRE)g_exp_sec_context.$(OBJEXT) \
+	  $(OUTPRE)g_context_time.$(OBJEXT) \
+	  $(OUTPRE)g_sign.$(OBJEXT) \
+	  $(OUTPRE)g_verify.$(OBJEXT) \
+	  $(OUTPRE)g_seal.$(OBJEXT) \
+	  $(OUTPRE)g_unseal.$(OBJEXT) \
+	  $(OUTPRE)g_dsp_status.$(OBJEXT) \
+	  $(OUTPRE)g_indicate_mechs.$(OBJEXT) \
+	  $(OUTPRE)g_compare_name.$(OBJEXT) \
+	  $(OUTPRE)g_dsp_name.$(OBJEXT) \
+	  $(OUTPRE)g_imp_name.$(OBJEXT) \
+	  $(OUTPRE)g_rel_name.$(OBJEXT) \
+	  $(OUTPRE)g_rel_buffer.$(OBJEXT) \
+	  $(OUTPRE)g_rel_oid_set.$(OBJEXT) \
+	  $(OUTPRE)g_oid_ops.$(OBJEXT) \
+	  $(OUTPRE)g_inq_cred.$(OBJEXT) \
+	  $(OUTPRE)g_inq_context.$(OBJEXT) \
+	  $(OUTPRE)g_inq_names.$(OBJEXT) \
+	  $(OUTPRE)g_initialize.$(OBJEXT) \
+	  $(OUTPRE)g_glue.$(OBJEXT) \
+	  $(OUTPRE)gssd_pname_to_uid.$(OBJEXT) \
+	  $(OUTPRE)gen_oids.$(OBJEXT) \
+	  $(OUTPRE)oid_ops.$(OBJEXT) \
+	  $(OUTPRE)g_mechname.$(OBJEXT)
 
 EHDRDIR= $(BUILDTOP)$(S)include$(S)gssapi
 EXPORTED_HEADERS = mechglue.h
@@ -118,10 +118,10 @@ clean:: clean-$(WHAT)
 
 clean-unix::
 	$(RM) shared/*
- 
+
 clean-mac::
 	$(RM) shared/*
- 
+
 clean-windows::
 	$(RM) $(EHDRDIR)\gssapi.h $(EHDRDIR)\gssapi_generic.h
 	if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)