From a852ce8806833825df450316321c5bee06a08d98 Mon Sep 17 00:00:00 2001 From: Danilo Almeida Date: Mon, 10 May 1999 19:43:50 +0000 Subject: [PATCH] Do win32 build in subdir git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11432 dc483132-0cff-0310-8789-dd5450dbe970 --- src/clients/kdestroy/ChangeLog | 4 + src/clients/kdestroy/Makefile.in | 4 +- src/clients/kinit/ChangeLog | 4 + src/clients/kinit/Makefile.in | 4 +- src/clients/klist/ChangeLog | 4 + src/clients/klist/Makefile.in | 4 +- src/lib/ChangeLog | 4 + src/lib/Makefile.in | 86 +++++----- src/lib/crypto/ChangeLog | 4 + src/lib/crypto/Makefile.in | 58 +++---- src/lib/crypto/crc32/ChangeLog | 4 + src/lib/crypto/crc32/Makefile.in | 4 +- src/lib/crypto/des/ChangeLog | 4 + src/lib/crypto/des/Makefile.in | 28 ++-- src/lib/crypto/dk/ChangeLog | 4 + src/lib/crypto/dk/Makefile.in | 12 +- src/lib/crypto/enc_provider/ChangeLog | 3 + src/lib/crypto/enc_provider/Makefile.in | 4 +- src/lib/crypto/hash_provider/ChangeLog | 4 + src/lib/crypto/hash_provider/Makefile.in | 6 +- src/lib/crypto/keyhash_provider/ChangeLog | 4 + src/lib/crypto/keyhash_provider/Makefile.in | 4 +- src/lib/crypto/md4/ChangeLog | 4 + src/lib/crypto/md4/Makefile.in | 19 ++- src/lib/crypto/md5/ChangeLog | 4 + src/lib/crypto/md5/Makefile.in | 14 +- src/lib/crypto/old/ChangeLog | 4 + src/lib/crypto/old/Makefile.in | 4 +- src/lib/crypto/raw/ChangeLog | 4 + src/lib/crypto/raw/Makefile.in | 4 +- src/lib/crypto/sha1/ChangeLog | 4 + src/lib/crypto/sha1/Makefile.in | 12 +- src/lib/des425/ChangeLog | 4 + src/lib/des425/Makefile.in | 40 ++--- src/lib/gssapi/ChangeLog | 4 + src/lib/gssapi/Makefile.in | 6 +- src/lib/gssapi/generic/ChangeLog | 4 + src/lib/gssapi/generic/Makefile.in | 36 ++-- src/lib/gssapi/krb5/ChangeLog | 4 + src/lib/gssapi/krb5/Makefile.in | 92 +++++------ src/lib/gssapi/mechglue/ChangeLog | 4 + src/lib/gssapi/mechglue/Makefile.in | 68 ++++---- src/lib/krb4/ChangeLog | 4 + src/lib/krb4/Makefile.in | 100 ++++++------ src/lib/krb5/ChangeLog | 4 + src/lib/krb5/Makefile.in | 8 +- src/lib/krb5/asn.1/ChangeLog | 4 + src/lib/krb5/asn.1/Makefile.in | 22 +-- src/lib/krb5/ccache/ChangeLog | 4 + src/lib/krb5/ccache/Makefile.in | 26 +-- src/lib/krb5/ccache/ccapi/ChangeLog | 4 + src/lib/krb5/ccache/ccapi/Makefile.in | 4 +- src/lib/krb5/ccache/file/ChangeLog | 4 + src/lib/krb5/ccache/file/Makefile.in | 16 +- src/lib/krb5/ccache/memory/ChangeLog | 4 + src/lib/krb5/ccache/memory/Makefile.in | 14 +- src/lib/krb5/error_tables/ChangeLog | 4 + src/lib/krb5/error_tables/Makefile.in | 18 +- src/lib/krb5/keytab/ChangeLog | 4 + src/lib/krb5/keytab/Makefile.in | 22 +-- src/lib/krb5/keytab/file/ChangeLog | 4 + src/lib/krb5/keytab/file/Makefile.in | 32 ++-- src/lib/krb5/krb/ChangeLog | 4 + src/lib/krb5/krb/Makefile.in | 172 ++++++++++---------- src/lib/krb5/os/ChangeLog | 4 + src/lib/krb5/os/Makefile.in | 86 +++++----- src/lib/krb5/posix/ChangeLog | 4 + src/lib/krb5/posix/Makefile.in | 6 +- src/lib/krb5/rcache/ChangeLog | 4 + src/lib/krb5/rcache/Makefile.in | 14 +- src/util/et/ChangeLog | 4 + src/util/et/Makefile.in | 14 +- src/util/profile/ChangeLog | 4 + src/util/profile/Makefile.in | 32 ++-- src/util/windows/ChangeLog | 4 + src/util/windows/Makefile.in | 8 +- src/windows/cns/ChangeLog | 4 + src/windows/cns/Makefile.in | 46 +++--- src/windows/gina/ChangeLog | 4 + src/windows/gina/Makefile.in | 24 +-- src/windows/gss/ChangeLog | 4 + src/windows/gss/Makefile.in | 47 +++--- src/windows/lib/ChangeLog | 4 + src/windows/lib/Makefile.in | 8 +- src/windows/wintel/ChangeLog | 4 + src/windows/wintel/Makefile.in | 39 ++--- 86 files changed, 804 insertions(+), 634 deletions(-) create mode 100644 src/windows/gina/ChangeLog diff --git a/src/clients/kdestroy/ChangeLog b/src/clients/kdestroy/ChangeLog index 9d96b5ffa..f3d51232b 100644 --- a/src/clients/kdestroy/ChangeLog +++ b/src/clients/kdestroy/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:09:31 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + 1998-11-13 Theodore Ts'o * Makefile.in: Set the myfulldir and mydir variables (which are diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in index 6580a32a8..9489d2fa9 100644 --- a/src/clients/kdestroy/Makefile.in +++ b/src/clients/kdestroy/Makefile.in @@ -20,8 +20,8 @@ kdestroy: kdestroy.o $(KRB5_BASE_DEPLIBS) ##WIN32##INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 ##WIN32##CFLAGS = $(CCOPTS2) $(INCLUDES) -##WIN32##all-windows:: kdestroy.exe -##WIN32##kdestroy.exe: kdestroy.obj $(BUILDTOP)\util\windows\getopt.obj $(KLIB) $(CLIB) +##WIN32##all-windows:: $(OUTPRE)kdestroy.exe +##WIN32##$(OUTPRE)kdestroy.exe: $(OUTPRE)kdestroy.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.obj $(KLIB) $(CLIB) ##WIN32## link /nologo /out:$@ $** diff --git a/src/clients/kinit/ChangeLog b/src/clients/kinit/ChangeLog index 1c89a527f..fa18f1004 100644 --- a/src/clients/kinit/ChangeLog +++ b/src/clients/kinit/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:13:37 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + Mon Feb 8 22:10:36 1999 Theodore Y. Ts'o * kinit.c: If unistd.h is not available, use manual definitions diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in index bc9c73aa1..071d653f7 100644 --- a/src/clients/kinit/Makefile.in +++ b/src/clients/kinit/Makefile.in @@ -19,8 +19,8 @@ kinit: kinit.o $(KRB5_BASE_DEPLIBS) ##WIN32##INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 ##WIN32##CFLAGS = $(CCOPTS2) $(INCLUDES) -##WIN32##all-windows:: kinit.exe -##WIN32##kinit.exe: kinit.obj $(BUILDTOP)\util\windows\getopt.obj $(KLIB) $(CLIB) +##WIN32##all-windows:: $(OUTPRE)kinit.exe +##WIN32##$(OUTPRE)kinit.exe: $(OUTPRE)kinit.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.obj $(KLIB) $(CLIB) ##WIN32## link /nologo /out:$@ $** diff --git a/src/clients/klist/ChangeLog b/src/clients/klist/ChangeLog index ab75d77a1..3f1cc6930 100644 --- a/src/clients/klist/ChangeLog +++ b/src/clients/klist/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:13:58 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + Mon Feb 8 22:11:50 1999 Theodore Y. Ts'o * klist.c: Under Windows, #include winsock.h instead of diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in index 904d25473..b9be31653 100644 --- a/src/clients/klist/Makefile.in +++ b/src/clients/klist/Makefile.in @@ -19,8 +19,8 @@ klist: klist.o $(KRB5_BASE_DEPLIBS) ##WIN32##INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 ##WIN32##CFLAGS = $(CCOPTS2) $(INCLUDES) -##WIN32##all-windows:: klist.exe -##WIN32##klist.exe: klist.obj $(KLIB) $(CLIB) +##WIN32##all-windows:: $(OUTPRE)klist.exe +##WIN32##$(OUTPRE)klist.exe: $(OUTPRE)klist.obj $(KLIB) $(CLIB) ##WIN32## link /nologo /out:$@ $** wsock32.lib diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog index ff28ad6da..1fa2c7025 100644 --- a/src/lib/ChangeLog +++ b/src/lib/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:14:34 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + Fri May 7 18:27:08 1999 Danilo Almeida * xpprof32.def, krb4_32.def, gssapi32.def, comerr32.del: Remove diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 7d315f215..cc5c65d04 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -29,16 +29,16 @@ clean-windows:: # Windows stuff to make krb5 and gssapi DLLs. -CLIBS = $(BUILDTOP)\util\et\comerr.lib -PLIBS = $(BUILDTOP)\util\profile\profile.lib -KLIBS = krb5\krb5.lib crypto\crypto.lib \ - $(BUILDTOP)\util\profile\profile.lib des425\des425.lib -GLIBS = gssapi\gssapi.lib -K4LIBS = krb4\krb4.lib - -##WIN16##VERLIBS=..\mit\windows\lib\vswin.lib c:\msvc\lib\ver.lib -##WIN32##VERLIBS=..\mit\windows\lib\vsnt.lib \ -##WIN32## "c:\program files\devstudio\vc\lib\version.lib" +CLIBS = $(BUILDTOP)\util\et\$(OUTPRE)comerr.lib +PLIBS = $(BUILDTOP)\util\profile\$(OUTPRE)profile.lib +KLIBS = krb5\$(OUTPRE)krb5.lib crypto\$(OUTPRE)crypto.lib \ + $(BUILDTOP)\util\profile\$(OUTPRE)profile.lib \ + des425\$(OUTPRE)des425.lib +GLIBS = gssapi\$(OUTPRE)gssapi.lib +K4LIBS = krb4\$(OUTPRE)krb4.lib + +##WIN16##VERLIBS=..\mit\windows\lib\vswin.lib ver.lib +##WIN32##VERLIBS=..\mit\windows\lib\vsnt.lib version.lib ##MIT##MITLIBS= $(VERLIBS) ##MIT##MITFLAGS=-I..\mit\windows\include /DVERSERV=1 @@ -49,7 +49,7 @@ K4LIBS = krb4\krb4.lib ##WIN16##KDEF = krb5_16.def ##WIN32##KDEF = krb5_32.def ##WIN16##KRB5RC = krb5.rc -##WIN32##KRB5RC = krb5.obj +##WIN32##KRB5RC = $(OUTPRE)krb5.obj ##WIN16##GDEF = gssapi16.def ##WIN32##GDEF = gssapi32.def ##WIN16##K4DEF = krb4_16.def @@ -60,34 +60,34 @@ K4LIBS = krb4\krb4.lib ##WIN16##WINLIBS = $(WLIB) ldllcew libw oldnames ##WIN32##WINLIBS = kernel32.lib wsock32.lib \ ##WIN32## user32.lib shell32.lib oldnames.lib -##WIN32##WINDLLFLAGS = /incremental:no /pdb:none /debug \ -##WIN32## /nologo /align:0x1000 /base:0x1c000000 /dll \ +##WIN32##WINDLLFLAGS = /incremental:no /debug \ +##WIN32## /nologo /base:0x1c000000 /dll \ ##WIN32## /entry:DllMain -$(CLIB): $(CLIBS) $(WLIB) $(CDEF) no_glue.obj +##DOS##$(CLIB): $(CLIBS) $(WLIB) $(CDEF) $(OUTPRE)no_glue.obj ##WIN16## link /co /seg:400 /noe /nod /nol \ ##WIN16## no_glue, $*.dll, $*.map, $(CLIBS) $(WINLIBS), $(CDEF) ##WIN16## copy $(VERSIONRC) version.rc ##WIN16## rc /nologo /p /k $(CPPFLAGS) -DCE_LIB -D_MSDOS_ -DRES_ONLY version.rc $*.dll ##WIN16## implib /nologo $@ $*.dll -##WIN32## rc $(CPPFLAGS) -DCE_LIB -D_WIN32 -D_MSDOS_ -DRES_ONLY -fo version.res $(VERSIONRC) +##WIN32## rc $(CPPFLAGS) -DCE_LIB -D_WIN32 -D_MSDOS_ -DRES_ONLY -fo $(OUTPRE)version.res $(VERSIONRC) ##WIN32## link $(WINDLLFLAGS) /def:$(CDEF) /out:$*.dll \ -##WIN32## no_glue.obj version.res $(CLIBS) $(WINLIBS) +##WIN32## $(OUTPRE)no_glue.obj $(OUTPRE)version.res $(CLIBS) $(WINLIBS) -$(PLIB): $(PLIBS) $(WLIB) $(CLIB) $(PDEF) no_glue.obj +##DOS##$(PLIB): $(PLIBS) $(WLIB) $(CLIB) $(PDEF) $(OUTPRE)no_glue.obj ##WIN16## link /co /seg:400 /noe /nod /nol \ ##WIN16## no_glue, $*.dll, $*.map, $(PLIBS) $(CLIB) $(WINLIBS), \ ##WIN16## $(PDEF) ##WIN16## copy $(VERSIONRC) version.rc ##WIN16## rc /nologo /p /k $(CPPFLAGS) -DPROF_LIB -D_MSDOS_ -DRES_ONLY version.rc $*.dll ##WIN16## implib /nologo $@ $*.dll -##WIN32## rc $(CPPFLAGS) -DPROF_LIB -D_WIN32 -D_MSDOS_ -DRES_ONLY -fo version.res $(VERSIONRC) +##WIN32## rc $(CPPFLAGS) -DPROF_LIB -D_WIN32 -D_MSDOS_ -DRES_ONLY -fo $(OUTPRE)version.res $(VERSIONRC) ##WIN32## link $(WINDLLFLAGS) /def:$(PDEF) /out:$*.dll \ -##WIN32## no_glue.obj version.res $(PLIBS) $(CLIB) $(WINLIBS) +##WIN32## $(OUTPRE)no_glue.obj $(OUTPRE)version.res $(PLIBS) $(CLIB) $(WINLIBS) -$(KLIB): $(KLIBS) $(CLIB) $(PLIB) $(WLIB) $(KDEF) k5_glue.obj $(KRB5RC) +##DOS##$(KLIB): $(KLIBS) $(CLIB) $(PLIB) $(WLIB) $(KDEF) $(OUTPRE)k5_glue.obj $(KRB5RC) ##WIN16## link /co /seg:400 /noe /nod /nol \ ##WIN16## k5_glue, $*.dll, $*.map, \ ##WIN16## $(MITLIBS) $(KLIBS) $(CLIB) $(PLIB) $(WINLIBS), $(KDEF) @@ -95,24 +95,24 @@ $(KLIB): $(KLIBS) $(CLIB) $(PLIB) $(WLIB) $(KDEF) k5_glue.obj $(KRB5RC) ##WIN16## $(KRB5RC) $*.dll ##WIN16## implib /nologo $@ $*.dll ##WIN32## rc $(CPPFLAGS) -DKRB5_LIB -D_WIN32 -D_MSDOS -DRES_ONLY \ -##WIN32## -fo version.res $(VERSIONRC) +##WIN32## -fo $(OUTPRE)version.res $(VERSIONRC) ##WIN32## link $(WINDLLFLAGS) /def:$(KDEF) /out:$*.dll \ -##WIN32## k5_glue.obj version.res $(KRB5RC) $(MITLIBS) $(KLIBS) \ +##WIN32## $(OUTPRE)k5_glue.obj $(OUTPRE)version.res $(KRB5RC) $(MITLIBS) $(KLIBS) \ ##WIN32## $(CLIB) $(PLIB) \ ##WIN32## $(WINLIBS) advapi32.lib gdi32.lib -$(GLIB): $(GLIBS) $(KLIB) $(CLIB) $(GDEF) gss_glue.obj +##DOS##$(GLIB): $(GLIBS) $(KLIB) $(CLIB) $(GDEF) $(OUTPRE)gss_glue.obj ##WIN16## link /co /seg:400 /noe /nod /nol \ ##WIN16## gss_glue, $*.dll, $*.map, \ ##WIN16## $(GLIBS) $(KLIB) $(CLIB) $(WINLIBS), $(GDEF) ##WIN16## copy $(VERSIONRC) version.rc ##WIN16## rc /nologo /p /k -DGSSAPI_LIB version.rc $*.dll ##WIN16## implib /nologo $@ $*.dll -##WIN32## rc -D_WIN32 -DGSSAPI_LIB -fo version.res $(VERSIONRC) +##WIN32## rc -D_WIN32 -DGSSAPI_LIB -fo $(OUTPRE)version.res $(VERSIONRC) ##WIN32## link $(WINDLLFLAGS) /def:$(GDEF) /out:$*.dll \ -##WIN32## gss_glue.obj version.res $(GLIBS) $(KLIB) $(CLIB) $(WINLIBS) +##WIN32## $(OUTPRE)gss_glue.obj $(OUTPRE)version.res $(GLIBS) $(KLIB) $(CLIB) $(WINLIBS) -$(K4LIB): $(K4LIBS) $(KLIB) $(CLIB) $(PLIB) $(K4DEF) k4_glue.obj +##DOS##$(K4LIB): $(K4LIBS) $(KLIB) $(CLIB) $(PLIB) $(K4DEF) $(OUTPRE)k4_glue.obj ##WIN16## link /co /seg:400 /noe /nod /nol \ ##WIN16## k4_glue, $*.dll, $*.map, \ ##WIN16## $(K4LIBS) $(KLIB) $(CLIB) $(PLIB) $(WINLIBS) llibcew, \ @@ -120,9 +120,9 @@ $(K4LIB): $(K4LIBS) $(KLIB) $(CLIB) $(PLIB) $(K4DEF) k4_glue.obj ##WIN16## copy $(VERSIONRC) version.rc ##WIN16## rc /nologo /p /k -DKRB4_LIB version.rc $*.dll ##WIN16## implib /nologo $@ $*.dll -##WIN32## rc -D_WIN32 -DKRB4_LIB -fo version.res $(VERSIONRC) +##WIN32## rc -D_WIN32 -DKRB4_LIB -fo $(OUTPRE)version.res $(VERSIONRC) ##WIN32## link $(WINDLLFLAGS) /def:$(K4DEF) /out:$*.dll \ -##WIN32## k4_glue.obj version.res $(K4LIBS) $(KLIB) $(CLIB) $(PLIB) \ +##WIN32## $(OUTPRE)k4_glue.obj $(OUTPRE)version.res $(K4LIBS) $(KLIB) $(CLIB) $(PLIB) \ ##WIN32## $(WINLIBS) # @@ -135,14 +135,14 @@ $(K4LIB): $(K4LIBS) $(KLIB) $(CLIB) $(PLIB) $(K4DEF) k4_glue.obj ##WIN32##SKDEF = krb5_32.def ##WIN16##SGLIB = sapgss16.lib ##WIN16##SKLIB = sapkrb16.lib -##WIN32##SGLIB = sapgss32.lib -##WIN32##SKLIB = sapkrb32.lib +##WIN32##SGLIB = $(OUTPRE)sapgss32.lib +##WIN32##SKLIB = $(OUTPRE)sapkrb32.lib -sap_glue.obj: win_glue.c +$(OUTPRE)sap_glue.obj: win_glue.c $(CC) $(CFLAGS) $(MITFLAGS) /DSAP_VERSERV=1 /DKRB5=1 /c \ /Fo$@ win_glue.c -$(SKLIB): $(KLIBS) $(CLIB) $(WLIB) $(KDEF) sap_glue.obj $(KRB5RC) +##DOS##$(SKLIB): $(KLIBS) $(CLIB) $(WLIB) $(KDEF) $(OUTPRE)sap_glue.obj $(KRB5RC) ##WIN16## link /co /seg:400 /noe /nod /nol \ ##WIN16## sap_glue, $*.dll, $*.map, \ ##WIN16## $(MITLIBS) $(KLIBS) $(CLIB) $(WINLIBS), $(SKDEF) @@ -150,37 +150,41 @@ $(SKLIB): $(KLIBS) $(CLIB) $(WLIB) $(KDEF) sap_glue.obj $(KRB5RC) ##WIN16## $(KRB5RC) $*.dll ##WIN16## implib /nologo $@ $*.dll ##WIN32## rc $(CPPFLAGS) -DSAPKRB_LIB -D_WIN32 -D_MSDOS -DRES_ONLY \ -##WIN32## -fo version.res $(VERSIONRC) +##WIN32## -fo $(OUTPRE)version.res $(VERSIONRC) ##WIN32## link $(WINDLLFLAGS) /def:$(SKDEF) /out:$*.dll \ -##WIN32## sap_glue.obj version.res $(KRB5RC) $(MITLIBS) $(KLIBS) $(CLIB) \ +##WIN32## $(OUTPRE)sap_glue.obj $(OUTPRE)version.res $(KRB5RC) $(MITLIBS) $(KLIBS) $(CLIB) \ ##WIN32## $(WINLIBS) advapi32.lib gdi32.lib -$(SGLIB): $(GLIBS) $(SKLIB) $(CLIB) $(GDEF) gss_glue.obj +##DOS##$(SGLIB): $(GLIBS) $(SKLIB) $(CLIB) $(GDEF) $(OUTPRE)gss_glue.obj ##WIN16## link /co /seg:400 /noe /nod /nol \ ##WIN16## gss_glue, $*.dll, $*.map, \ ##WIN16## $(MITLIBS) $(GLIBS) $(SKLIB) $(CLIB) $(WINLIBS), $(SGDEF) ##WIN16## copy $(VERSIONRC) version.rc ##WIN16## rc /nologo /p /k -DSAPGSS_LIB version.rc $*.dll ##WIN16## implib /nologo $@ $*.dll -##WIN32## rc -D_WIN32 -DSAPGSS_LIB -fo version.res $(VERSIONRC) +##WIN32## rc -D_WIN32 -DSAPGSS_LIB -fo $(OUTPRE)version.res $(VERSIONRC) ##WIN32## link $(WINDLLFLAGS) /def:$(SGDEF) /out:$*.dll \ -##WIN32## gss_glue.obj version.res $(MITLIBS) $(GLIBS) $(SKLIB) $(CLIB) $(WINLIBS) +##WIN32## $(OUTPRE)gss_glue.obj $(OUTPRE)version.res $(MITLIBS) $(GLIBS) $(SKLIB) $(CLIB) $(WINLIBS) ##MIT##lib-windows:: $(SKLIB) $(SGLIB) -k5_glue.obj: win_glue.c +$(OUTPRE)k5_glue.obj: win_glue.c $(CC) $(CFLAGS) $(MITFLAGS) /c /DKRB5=1 /Fo$@ $** -k4_glue.obj: win_glue.c +$(OUTPRE)k4_glue.obj: win_glue.c $(CC) $(CFLAGS) /c /DKRB4=1 /Fo$@ $** -gss_glue.obj: win_glue.c +$(OUTPRE)gss_glue.obj: win_glue.c $(CC) $(CFLAGS) /c /DGSSAPI=1 /Fo$@ $** -no_glue.obj: win_glue.c +$(OUTPRE)no_glue.obj: win_glue.c $(CC) $(CFLAGS) /c /Fo$@ $** ##WIN32##.rc.obj: ##WIN32## $(RC) $(CPPFLAGS) -DKRB5 /r $** ##WIN32## $(CVTRES) /nologo /out:$@ $*.res +##WIN32##{}.rc{$(OUTPRE)}.obj: +##WIN32## $(RC) $(CPPFLAGS) -DKRB5 -fo $*.res /r $** +##WIN32## $(CVTRES) /nologo /out:$@ $*.res + ##WIN16##$(WLIB): winsock.def ##WIN16## implib /nologo $@ winsock.def diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index ccce05aec..9e5e9c60f 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:15:00 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + Tue Jan 5 00:06:02 1999 Tom Yu * make_checksum.c (krb5_c_make_checksum): Note the fact that we're diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in index ced76b819..5717655e1 100644 --- a/src/lib/crypto/Makefile.in +++ b/src/lib/crypto/Makefile.in @@ -9,10 +9,10 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/enc_provider \ -I$(srcdir)/old -I$(srcdir)/raw -I$(srcdir)/dk ##DOSBUILDTOP = ..\.. -##DOSLIBNAME=crypto.lib -##DOSOBJFILE=crypto.lst -##DOSOBJFILELIST=@crypto.lst @des.lst @md4.lst @md5.lst @sha1.lst @crc32.lst @dk.lst @old.lst @raw.lst @enc_prov.lst @hash_pro.lst @kh_pro.lst -##DOSOBJFILEDEP =crypto.lst des.lst md4.lst md5.lst sha1.lst crc32.lst dk.lst old.lst raw.lst enc_prov.lst hash_pro.lst kh_pro.lst +##DOSLIBNAME=$(OUTPRE)crypto.lib +##DOSOBJFILE=$(OUTPRE)crypto.lst +##DOSOBJFILELIST=@$(OUTPRE)crypto.lst @$(OUTPRE)des.lst @$(OUTPRE)md4.lst @$(OUTPRE)md5.lst @$(OUTPRE)sha1.lst @$(OUTPRE)crc32.lst @$(OUTPRE)dk.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)enc_prov.lst @$(OUTPRE)hash_pro.lst @$(OUTPRE)kh_pro.lst +##DOSOBJFILEDEP =$(OUTPRE)crypto.lst $(OUTPRE)des.lst $(OUTPRE)md4.lst $(OUTPRE)md5.lst $(OUTPRE)sha1.lst $(OUTPRE)crc32.lst $(OUTPRE)dk.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)enc_prov.lst $(OUTPRE)hash_pro.lst $(OUTPRE)kh_pro.lst MAC_SUBDIRS = crc32 des dk enc_provider hash_provider keyhash_provider \ md4 md5 old raw sha1 @@ -48,31 +48,31 @@ STLIBOBJS=\ verify_checksum.o OBJS=\ - block_size.$(OBJEXT) \ - checksum_length.$(OBJEXT) \ - cksumtype_to_string.$(OBJEXT) \ - cksumtypes.$(OBJEXT) \ - coll_proof_cksum.$(OBJEXT) \ - decrypt.$(OBJEXT) \ - encrypt.$(OBJEXT) \ - encrypt_length.$(OBJEXT) \ - enctype_compare.$(OBJEXT) \ - enctype_to_string.$(OBJEXT) \ - etypes.$(OBJEXT) \ - hmac.$(OBJEXT) \ - keyed_cksum.$(OBJEXT) \ - keyed_checksum_types.$(OBJEXT) \ - make_checksum.$(OBJEXT) \ - make_random_key.$(OBJEXT) \ - nfold.$(OBJEXT) \ - old_api_glue.$(OBJEXT) \ - prng.$(OBJEXT) \ - string_to_cksumtype.$(OBJEXT) \ - string_to_enctype.$(OBJEXT) \ - string_to_key.$(OBJEXT) \ - valid_cksumtype.$(OBJEXT) \ - valid_enctype.$(OBJEXT) \ - verify_checksum.$(OBJEXT) + $(OUTPRE)block_size.$(OBJEXT) \ + $(OUTPRE)checksum_length.$(OBJEXT) \ + $(OUTPRE)cksumtype_to_string.$(OBJEXT) \ + $(OUTPRE)cksumtypes.$(OBJEXT) \ + $(OUTPRE)coll_proof_cksum.$(OBJEXT) \ + $(OUTPRE)decrypt.$(OBJEXT) \ + $(OUTPRE)encrypt.$(OBJEXT) \ + $(OUTPRE)encrypt_length.$(OBJEXT) \ + $(OUTPRE)enctype_compare.$(OBJEXT) \ + $(OUTPRE)enctype_to_string.$(OBJEXT) \ + $(OUTPRE)etypes.$(OBJEXT) \ + $(OUTPRE)hmac.$(OBJEXT) \ + $(OUTPRE)keyed_cksum.$(OBJEXT) \ + $(OUTPRE)keyed_checksum_types.$(OBJEXT) \ + $(OUTPRE)make_checksum.$(OBJEXT) \ + $(OUTPRE)make_random_key.$(OBJEXT) \ + $(OUTPRE)nfold.$(OBJEXT) \ + $(OUTPRE)old_api_glue.$(OBJEXT) \ + $(OUTPRE)prng.$(OBJEXT) \ + $(OUTPRE)string_to_cksumtype.$(OBJEXT) \ + $(OUTPRE)string_to_enctype.$(OBJEXT) \ + $(OUTPRE)string_to_key.$(OBJEXT) \ + $(OUTPRE)valid_cksumtype.$(OBJEXT) \ + $(OUTPRE)valid_enctype.$(OBJEXT) \ + $(OUTPRE)verify_checksum.$(OBJEXT) SRCS=\ $(subdir)/block_size.c \ diff --git a/src/lib/crypto/crc32/ChangeLog b/src/lib/crypto/crc32/ChangeLog index 7ae63a628..850d845f3 100644 --- a/src/lib/crypto/crc32/ChangeLog +++ b/src/lib/crypto/crc32/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:15:59 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + 1998-11-13 Theodore Ts'o * Makefile.in: Set the myfulldir and mydir variables (which are diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in index b9c3647e0..03dbc1519 100644 --- a/src/lib/crypto/crc32/Makefile.in +++ b/src/lib/crypto/crc32/Makefile.in @@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=crc32 -##DOS##OBJFILE=..\crc32.lst +##DOS##OBJFILE=..\$(OUTPRE)crc32.lst ##WIN16##LIBNAME=..\crypto.lib PROG_LIBPATH=-L$(TOPLIBD) @@ -16,7 +16,7 @@ RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf STLIBOBJS= crc32.o -OBJS= crc32.$(OBJEXT) +OBJS= $(OUTPRE)crc32.$(OBJEXT) SRCS= $(srcdir)/crc32.c diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog index 37e78a695..34ac883cc 100644 --- a/src/lib/crypto/des/ChangeLog +++ b/src/lib/crypto/des/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:16:18 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + 1998-11-13 Theodore Ts'o * Makefile.in: Set the myfulldir and mydir variables (which are diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in index 7702db231..3e25c4723 100644 --- a/src/lib/crypto/des/Makefile.in +++ b/src/lib/crypto/des/Makefile.in @@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=des -##DOS##OBJFILE=..\des.lst +##DOS##OBJFILE=..\$(OUTPRE)des.lst ##WIN16##LIBNAME=..\crypto.lib PROG_LIBPATH=-L$(TOPLIBD) @@ -27,17 +27,17 @@ STLIBOBJS=\ string2key.o \ weak_key.o -OBJS= afsstring2key.$(OBJEXT) \ - d3_cbc.$(OBJEXT) \ - d3_kysched.$(OBJEXT) \ - f_cbc.$(OBJEXT) \ - f_cksum.$(OBJEXT) \ - f_parity.$(OBJEXT) \ - f_sched.$(OBJEXT) \ - f_tables.$(OBJEXT) \ - key_sched.$(OBJEXT) \ - string2key.$(OBJEXT) \ - weak_key.$(OBJEXT) +OBJS= $(OUTPRE)afsstring2key.$(OBJEXT) \ + $(OUTPRE)d3_cbc.$(OBJEXT) \ + $(OUTPRE)d3_kysched.$(OBJEXT) \ + $(OUTPRE)f_cbc.$(OBJEXT) \ + $(OUTPRE)f_cksum.$(OBJEXT) \ + $(OUTPRE)f_parity.$(OBJEXT) \ + $(OUTPRE)f_sched.$(OBJEXT) \ + $(OUTPRE)f_tables.$(OBJEXT) \ + $(OUTPRE)key_sched.$(OBJEXT) \ + $(OUTPRE)string2key.$(OBJEXT) \ + $(OUTPRE)weak_key.$(OBJEXT) SRCS= $(srcdir)/afsstring2key.c \ $(srcdir)/d3_cbc.c \ @@ -59,8 +59,8 @@ includes:: depend depend:: $(SRCS) -TOBJS = key_sched.$(OBJEXT) f_sched.$(OBJEXT) f_cbc.$(OBJEXT) \ - f_tables.$(OBJEXT) f_cksum.$(OBJEXT) +TOBJS = $(OUTPRE)key_sched.$(OBJEXT) $(OUTPRE)f_sched.$(OBJEXT) $(OUTPRE)f_cbc.$(OBJEXT) \ + $(OUTPRE)f_tables.$(OBJEXT) $(OUTPRE)f_cksum.$(OBJEXT) verify$(EXEEXT): t_verify.$(OBJEXT) $(TOBJS) f_parity.$(OBJEXT) \ $(COM_ERR_DEPLIB) diff --git a/src/lib/crypto/dk/ChangeLog b/src/lib/crypto/dk/ChangeLog index 7f3300a94..566ce30ea 100644 --- a/src/lib/crypto/dk/ChangeLog +++ b/src/lib/crypto/dk/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:16:34 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + Tue Jan 5 00:09:13 1999 Tom Yu * dk.h: Add prototypes for krb5_marc_dk_*. diff --git a/src/lib/crypto/dk/Makefile.in b/src/lib/crypto/dk/Makefile.in index e389d5355..88c3ad31c 100644 --- a/src/lib/crypto/dk/Makefile.in +++ b/src/lib/crypto/dk/Makefile.in @@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/.. ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=dk -##DOS##OBJFILE=..\dk.lst +##DOS##OBJFILE=..\$(OUTPRE)dk.lst ##WIN16##LIBNAME=..\crypto.lib PROG_LIBPATH=-L$(TOPLIBD) @@ -22,11 +22,11 @@ STLIBOBJS=\ stringtokey.o OBJS=\ - checksum.$(OBJEXT) \ - dk_decrypt.$(OBJEXT) \ - dk_encrypt.$(OBJEXT) \ - derive.$(OBJEXT) \ - stringtokey.$(OBJEXT) + $(OUTPRE)checksum.$(OBJEXT) \ + $(OUTPRE)dk_decrypt.$(OBJEXT) \ + $(OUTPRE)dk_encrypt.$(OBJEXT) \ + $(OUTPRE)derive.$(OBJEXT) \ + $(OUTPRE)stringtokey.$(OBJEXT) SRCS=\ $(srcdir)/checksum.c \ diff --git a/src/lib/crypto/enc_provider/ChangeLog b/src/lib/crypto/enc_provider/ChangeLog index 6462758ab..0a6e666da 100644 --- a/src/lib/crypto/enc_provider/ChangeLog +++ b/src/lib/crypto/enc_provider/ChangeLog @@ -1,3 +1,6 @@ +Mon May 10 15:16:54 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. 1998-11-13 Theodore Ts'o diff --git a/src/lib/crypto/enc_provider/Makefile.in b/src/lib/crypto/enc_provider/Makefile.in index f6e679578..f757bf66a 100644 --- a/src/lib/crypto/enc_provider/Makefile.in +++ b/src/lib/crypto/enc_provider/Makefile.in @@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=enc_provider -##DOS##OBJFILE=..\enc_prov.lst +##DOS##OBJFILE=..\$(OUTPRE)enc_prov.lst ##WIN16##LIBNAME=..\crypto.lib PROG_LIBPATH=-L$(TOPLIBD) @@ -16,7 +16,7 @@ RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf STLIBOBJS= des.o des3.o -OBJS= des.$(OBJEXT) des3.$(OBJEXT) +OBJS= $(OUTPRE)des.$(OBJEXT) $(OUTPRE)des3.$(OBJEXT) SRCS= $(srcdir)/des.c $(srcdir)/des3.c diff --git a/src/lib/crypto/hash_provider/ChangeLog b/src/lib/crypto/hash_provider/ChangeLog index a8a4bda50..acdc4b0e7 100644 --- a/src/lib/crypto/hash_provider/ChangeLog +++ b/src/lib/crypto/hash_provider/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:19:03 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + 1998-11-13 Theodore Ts'o * Makefile.in: Set the myfulldir and mydir variables (which are diff --git a/src/lib/crypto/hash_provider/Makefile.in b/src/lib/crypto/hash_provider/Makefile.in index 6c4646a8a..1b2c988c5 100644 --- a/src/lib/crypto/hash_provider/Makefile.in +++ b/src/lib/crypto/hash_provider/Makefile.in @@ -7,7 +7,7 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../crc32 -I$(srcdir)/../md4 \ ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=hash_provider -##DOS##OBJFILE=..\hash_pro.lst +##DOS##OBJFILE=..\$(OUTPRE)hash_pro.lst ##WIN16##LIBNAME=..\crypto.lib PROG_LIBPATH=-L$(TOPLIBD) @@ -17,8 +17,8 @@ RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf STLIBOBJS= hash_crc32.o hash_md4.o hash_md5.o hash_sha1.o -OBJS= hash_crc32.$(OBJEXT) hash_md4.$(OBJEXT) \ - hash_md5.$(OBJEXT) hash_sha1.$(OBJEXT) +OBJS= $(OUTPRE)hash_crc32.$(OBJEXT) $(OUTPRE)hash_md4.$(OBJEXT) \ + $(OUTPRE)hash_md5.$(OBJEXT) $(OUTPRE)hash_sha1.$(OBJEXT) SRCS= $(srcdir)/hash_crc32.c $(srcdir)/hash_md4.c \ $(srcdir)/hash_md5.c $(srcdir)/hash_sha1.c diff --git a/src/lib/crypto/keyhash_provider/ChangeLog b/src/lib/crypto/keyhash_provider/ChangeLog index a8a4bda50..f1d25b37f 100644 --- a/src/lib/crypto/keyhash_provider/ChangeLog +++ b/src/lib/crypto/keyhash_provider/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:19:24 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + 1998-11-13 Theodore Ts'o * Makefile.in: Set the myfulldir and mydir variables (which are diff --git a/src/lib/crypto/keyhash_provider/Makefile.in b/src/lib/crypto/keyhash_provider/Makefile.in index 26501092c..a9317a9b5 100644 --- a/src/lib/crypto/keyhash_provider/Makefile.in +++ b/src/lib/crypto/keyhash_provider/Makefile.in @@ -7,7 +7,7 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des -I$(srcdir)/../md4 \ ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=keyhash_provider -##DOS##OBJFILE=..\kh_pro.lst +##DOS##OBJFILE=..\$(OUTPRE)kh_pro.lst ##WIN16##LIBNAME=..\crypto.lib PROG_LIBPATH=-L$(TOPLIBD) @@ -17,7 +17,7 @@ RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf STLIBOBJS= descbc.o k5_md4des.o k5_md5des.o -OBJS= descbc.$(OBJEXT) k5_md4des.$(OBJEXT) k5_md5des.$(OBJEXT) +OBJS= $(OUTPRE)descbc.$(OBJEXT) $(OUTPRE)k5_md4des.$(OBJEXT) $(OUTPRE)k5_md5des.$(OBJEXT) SRCS= $(srcdir)/descbc.c $(srcdir)/k5_md4des.c $(srcdir)/k5_md5des.c diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog index 18d62e698..254ecd6a5 100644 --- a/src/lib/crypto/md4/ChangeLog +++ b/src/lib/crypto/md4/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:19:48 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + 1998-11-13 Theodore Ts'o * Makefile.in: Set the myfulldir and mydir variables (which are diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in index 8f9a7bac8..ba212a73a 100644 --- a/src/lib/crypto/md4/Makefile.in +++ b/src/lib/crypto/md4/Makefile.in @@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir) ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=md4 -##DOS##OBJFILE=..\md4.lst +##DOS##OBJFILE=..\$(OUTPRE)md4.lst ##WIN16##LIBNAME=..\crypto.lib PROG_LIBPATH=-L$(TOPLIBD) @@ -16,7 +16,7 @@ RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf STLIBOBJS= md4.o -OBJS= md4.$(OBJEXT) +OBJS= $(OUTPRE)md4.$(OBJEXT) SRCS= $(srcdir)/md4.c @@ -37,18 +37,19 @@ t_mddriver.o: t_mddriver.c t_mddriver: t_mddriver.o md4.o $(CC) $(CFLAGS) -o t_mddriver t_mddriver.o md4.o -t_mddriver.exe: - $(CP) $(srcdir)\..\md5\t_mddriver.c t_mddriver.c - $(CC) -DMD=4 $(CFLAGS2) -o t_mddriver t_mddriver.c md4.c - $(RM) md4.obj +$(OUTPRE)t_mddriver.obj: t_mddriver.c + $(CC) -DMD=4 $(CFLAGS) -Fo$@ -c $** + +$(OUTPRE)t_mddriver.exe: $(OUTPRE)t_mddriver.obj $(OUTPRE)md4.obj + link -out:$@ $** check-unix:: t_mddriver $(RUN_SETUP) $(C)t_mddriver -x -check-windows:: t_mddriver$(EXEEXT) - $(C)t_mddriver$(EXEEXT) -x +check-windows:: $(OUTPRE)t_mddriver.exe + $(OUTPRE)$(C)t_mddriver.exe -x clean:: - $(RM) t_mddriver$(EXEEXT) t_mddriver.$(OBJEXT) t_mddriver.c + $(RM) $(OUTPRE)t_mddriver$(EXEEXT) $(OUTPRE)t_mddriver.$(OBJEXT) t_mddriver.c clean-unix:: clean-libobjs diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog index c0a63c504..06698f7c5 100644 --- a/src/lib/crypto/md5/ChangeLog +++ b/src/lib/crypto/md5/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:20:16 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + 1998-11-13 Theodore Ts'o * Makefile.in: Set the myfulldir and mydir variables (which are diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in index 24e2b5ff3..896de961e 100644 --- a/src/lib/crypto/md5/Makefile.in +++ b/src/lib/crypto/md5/Makefile.in @@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=md5 -##DOS##OBJFILE=..\md5.lst +##DOS##OBJFILE=..\$(OUTPRE)md5.lst ##WIN16##LIBNAME=..\crypto.lib PROG_LIBPATH=-L$(TOPLIBD) @@ -16,7 +16,7 @@ RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf STLIBOBJS= md5.o -OBJS= md5.$(OBJEXT) +OBJS= $(OUTPRE)md5.$(OBJEXT) SRCS= $(srcdir)/md5.c @@ -31,16 +31,16 @@ depend:: $(SRCS) t_mddriver: t_mddriver.o md5.o $(CC) $(CFLAGS) $(LDFLAGS) -o t_mddriver t_mddriver.o md5.o -t_mddriver.exe: - $(CC) $(CFLAGS2) -o t_mddriver.exe t_mddriver.c md5.c +$(OUTPRE)t_mddriver.exe: $(OUTPRE)t_mddriver.obj $(OUTPRE)md5.obj + link -out:$@ $** check-unix:: t_mddriver $(RUN_SETUP) $(C)t_mddriver -x -check-windows:: t_mddriver$(EXEEXT) - $(C)t_mddriver$(EXEEXT) -x +check-windows:: $(OUTPRE)t_mddriver.exe + $(OUTPRE)$(C)t_mddriver.exe -x clean:: - $(RM) t_mddriver$(EXEEXT) t_mddriver.$(OBJEXT) + $(RM) $(OUTPRE)t_mddriver$(EXEEXT) $(OUTPRE)t_mddriver.$(OBJEXT) clean-unix:: clean-libobjs diff --git a/src/lib/crypto/old/ChangeLog b/src/lib/crypto/old/ChangeLog index 699aaebaa..c3368c68d 100644 --- a/src/lib/crypto/old/ChangeLog +++ b/src/lib/crypto/old/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:20:32 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + Wed Dec 16 16:14:02 1998 Tom Yu * old_decrypt.c (krb5_old_decrypt): Initialize the ivec to the key diff --git a/src/lib/crypto/old/Makefile.in b/src/lib/crypto/old/Makefile.in index afae6d9d8..f808ed66b 100644 --- a/src/lib/crypto/old/Makefile.in +++ b/src/lib/crypto/old/Makefile.in @@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=old -##DOS##OBJFILE=..\old.lst +##DOS##OBJFILE=..\$(OUTPRE)old.lst ##WIN16##LIBNAME=..\crypto.lib PROG_LIBPATH=-L$(TOPLIBD) @@ -16,7 +16,7 @@ RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf STLIBOBJS= des_stringtokey.o old_decrypt.o old_encrypt.o -OBJS= des_stringtokey.$(OBJEXT) old_decrypt.$(OBJEXT) old_encrypt.$(OBJEXT) +OBJS= $(OUTPRE)des_stringtokey.$(OBJEXT) $(OUTPRE)old_decrypt.$(OBJEXT) $(OUTPRE)old_encrypt.$(OBJEXT) SRCS= $(srcdir)/des_stringtokey.c $(srcdir)/old_decrypt.c \ $(srcdir)/old_encrypt.c diff --git a/src/lib/crypto/raw/ChangeLog b/src/lib/crypto/raw/ChangeLog index a8a4bda50..f8f2244e9 100644 --- a/src/lib/crypto/raw/ChangeLog +++ b/src/lib/crypto/raw/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:20:51 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + 1998-11-13 Theodore Ts'o * Makefile.in: Set the myfulldir and mydir variables (which are diff --git a/src/lib/crypto/raw/Makefile.in b/src/lib/crypto/raw/Makefile.in index 879190192..427bb6b4e 100644 --- a/src/lib/crypto/raw/Makefile.in +++ b/src/lib/crypto/raw/Makefile.in @@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=raw -##DOS##OBJFILE=..\raw.lst +##DOS##OBJFILE=..\$(OUTPRE)raw.lst ##WIN16##LIBNAME=..\crypto.lib PROG_LIBPATH=-L$(TOPLIBD) @@ -16,7 +16,7 @@ RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf STLIBOBJS= raw_decrypt.o raw_encrypt.o -OBJS= raw_decrypt.$(OBJEXT) raw_encrypt.$(OBJEXT) +OBJS= $(OUTPRE)raw_decrypt.$(OBJEXT) $(OUTPRE)raw_encrypt.$(OBJEXT) SRCS= $(srcdir)/raw_decrypt.c $(srcdir)/raw_encrypt.c diff --git a/src/lib/crypto/sha1/ChangeLog b/src/lib/crypto/sha1/ChangeLog index a8a4bda50..426acc040 100644 --- a/src/lib/crypto/sha1/ChangeLog +++ b/src/lib/crypto/sha1/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:21:10 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + 1998-11-13 Theodore Ts'o * Makefile.in: Set the myfulldir and mydir variables (which are diff --git a/src/lib/crypto/sha1/Makefile.in b/src/lib/crypto/sha1/Makefile.in index 9c173ac88..2f8cea108 100644 --- a/src/lib/crypto/sha1/Makefile.in +++ b/src/lib/crypto/sha1/Makefile.in @@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=sha1 -##DOS##OBJFILE=..\sha1.lst +##DOS##OBJFILE=..\$(OUTPRE)sha1.lst ##WIN16##LIBNAME=..\crypto.lib PROG_LIBPATH=-L$(TOPLIBD) @@ -16,7 +16,7 @@ RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf STLIBOBJS= shs.o -OBJS= shs.$(OBJEXT) +OBJS= $(OUTPRE)shs.$(OBJEXT) SRCS= $(srcdir)/shs.c @@ -31,14 +31,14 @@ depend:: $(SRCS) t_shs: t_shs.o shs.o $(CC) $(CFLAGS) $(LDFLAGS) -o t_shs t_shs.o shs.o -t_shs.exe: - $(CC) $(CFLAGS2) -o t_shs.exe t_shs.c shs.c +$(OUTPRE)t_shs.exe: $(OUTPRE)t_shs.obj $(OUTPRE)shs.obj + link -out:$@ $** check-unix:: t_shs $(C)t_shs -x -check-windows:: t_shs$(EXEEXT) - $(C)t_shs$(EXEEXT) -x +check-windows:: $(OUTPRE)t_shs.exe + $(OUTPRE)$(C)t_shs.exe -x clean:: $(RM) t_shs$(EXEEXT) t_shs.$(OBJEXT) diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog index f0c9f8326..3fd4f3315 100644 --- a/src/lib/des425/ChangeLog +++ b/src/lib/des425/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:21:30 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + 1998-11-13 Theodore Ts'o * Makefile.in: Set the myfulldir and mydir variables (which are diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in index c0ea26afa..57e6a0466 100644 --- a/src/lib/des425/Makefile.in +++ b/src/lib/des425/Makefile.in @@ -5,10 +5,10 @@ BUILDTOP=$(REL)$(U)$(S)$(U) CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../crypto/des -I$(srcdir)/../../include/kerberosIV ##DOS##BUILDTOP = ..\.. -##DOS##LIBNAME=des425.lib -##DOS##OBJFILE=des425.lst -##DOS##OBJFILEDEP=des425.lst -##DOS##OBJFILELIST=@des425.lst +##DOS##LIBNAME=$(OUTPRE)des425.lib +##DOS##OBJFILE=$(OUTPRE)des425.lst +##DOS##OBJFILEDEP=$(OUTPRE)des425.lst +##DOS##OBJFILELIST=@$(OUTPRE)des425.lst PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -45,21 +45,21 @@ STLIBOBJS=cksum.o \ k4_glue.o -OBJS= cksum.$(OBJEXT) \ - des.$(OBJEXT) \ - enc_dec.$(OBJEXT) \ - key_parity.$(OBJEXT) \ - key_sched.$(OBJEXT) \ - new_rnd_key.$(OBJEXT) \ - pcbc_encrypt.$(OBJEXT) \ - quad_cksum.$(OBJEXT) \ - random_key.$(OBJEXT) \ - read_passwd.$(OBJEXT) \ - str_to_key.$(OBJEXT) \ - unix_time.$(OBJEXT) \ - util.$(OBJEXT) \ - weak_key.$(OBJEXT) \ - k4_glue.$(OBJEXT) +OBJS= $(OUTPRE)cksum.$(OBJEXT) \ + $(OUTPRE)des.$(OBJEXT) \ + $(OUTPRE)enc_dec.$(OBJEXT) \ + $(OUTPRE)key_parity.$(OBJEXT) \ + $(OUTPRE)key_sched.$(OBJEXT) \ + $(OUTPRE)new_rnd_key.$(OBJEXT) \ + $(OUTPRE)pcbc_encrypt.$(OBJEXT) \ + $(OUTPRE)quad_cksum.$(OBJEXT) \ + $(OUTPRE)random_key.$(OBJEXT) \ + $(OUTPRE)read_passwd.$(OBJEXT) \ + $(OUTPRE)str_to_key.$(OBJEXT) \ + $(OUTPRE)unix_time.$(OBJEXT) \ + $(OUTPRE)util.$(OBJEXT) \ + $(OUTPRE)weak_key.$(OBJEXT) \ + $(OUTPRE)k4_glue.$(OBJEXT) SRCS= $(srcdir)/cksum.c \ $(srcdir)/des.c \ @@ -96,7 +96,7 @@ check-unix:: verify check-windows:: clean:: - $(RM) verify$(EXEEXT) verify.$(OBJEXT) + $(RM) $(OUTPRE)verify$(EXEEXT) $(OUTPRE)verify.$(OBJEXT) clean-unix:: clean-liblinks clean-libs clean-libobjs 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 + + * Makefile.in: Do win32 build in subdir. + 1999-02-19 Theodore Ts'o * 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 + + * Makefile.in: Do win32 build in subdir. + Thu Mar 25 22:41:30 1999 Theodore Y. Ts'o * 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 + + * Makefile.in: Do win32 build in subdir. + Fri Apr 30 12:27:14 1999 Theodore Y. Ts'o * 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 + + * Makefile.in: Do win32 build in subdir. + 1999-02-19 Theodore Ts'o * 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) diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index 64601398a..ee823a9a1 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:23:15 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + Thu Apr 15 20:18:38 1999 Tom Yu * g_cnffile.c (krb__get_srvtabname): Fix to actually extract diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in index f3be7d1eb..ca9fb8dc7 100644 --- a/src/lib/krb4/Makefile.in +++ b/src/lib/krb4/Makefile.in @@ -6,8 +6,8 @@ CFLAGS = $(CCOPTS) $(DEFS) $(DEFINES) DEFINES=-I$(srcdir)/../../include/kerberosIV ##DOS##BUILDTOP = ..\.. -##DOS##LIBNAME=krb4.lib -##DOS##OBJFILE=krb4.lst +##DOS##LIBNAME=$(OUTPRE)krb4.lib +##DOS##OBJFILE=$(OUTPRE)krb4.lst LIB=krb4 LIBMAJOR=2 @@ -31,37 +31,37 @@ SHLIB_RDIRS=$(KRB5_LIBDIR) EHDRDIR=$(BUILDTOP)$(S)include OBJS = \ - cr_auth_repl.$(OBJEXT) \ - cr_ciph.$(OBJEXT) \ - cr_tkt.$(OBJEXT) \ - debug.$(OBJEXT) \ - decomp_tkt.$(OBJEXT) \ - err_txt.$(OBJEXT) \ - g_ad_tkt.$(OBJEXT) \ - g_in_tkt.$(OBJEXT) \ - g_phost.$(OBJEXT) \ - g_pw_in_tkt.$(OBJEXT) \ - g_pw_tkt.$(OBJEXT) \ - g_tkt_svc.$(OBJEXT) \ - gethostname.$(OBJEXT) \ - getst.$(OBJEXT) \ - kname_parse.$(OBJEXT) \ - mk_auth.$(OBJEXT) \ - mk_err.$(OBJEXT) \ - mk_priv.$(OBJEXT) \ - mk_req.$(OBJEXT) \ - mk_safe.$(OBJEXT) \ - month_sname.$(OBJEXT) \ - one.$(OBJEXT) \ - pkt_cipher.$(OBJEXT) \ - pkt_clen.$(OBJEXT) \ - rd_err.$(OBJEXT) \ - rd_priv.$(OBJEXT) \ - rd_safe.$(OBJEXT) \ - send_to_kdc.$(OBJEXT) \ - stime.$(OBJEXT) \ - rd_preauth.$(OBJEXT) \ - mk_preauth.$(OBJEXT) \ + $(OUTPRE)cr_auth_repl.$(OBJEXT) \ + $(OUTPRE)cr_ciph.$(OBJEXT) \ + $(OUTPRE)cr_tkt.$(OBJEXT) \ + $(OUTPRE)debug.$(OBJEXT) \ + $(OUTPRE)decomp_tkt.$(OBJEXT) \ + $(OUTPRE)err_txt.$(OBJEXT) \ + $(OUTPRE)g_ad_tkt.$(OBJEXT) \ + $(OUTPRE)g_in_tkt.$(OBJEXT) \ + $(OUTPRE)g_phost.$(OBJEXT) \ + $(OUTPRE)g_pw_in_tkt.$(OBJEXT) \ + $(OUTPRE)g_pw_tkt.$(OBJEXT) \ + $(OUTPRE)g_tkt_svc.$(OBJEXT) \ + $(OUTPRE)gethostname.$(OBJEXT) \ + $(OUTPRE)getst.$(OBJEXT) \ + $(OUTPRE)kname_parse.$(OBJEXT) \ + $(OUTPRE)mk_auth.$(OBJEXT) \ + $(OUTPRE)mk_err.$(OBJEXT) \ + $(OUTPRE)mk_priv.$(OBJEXT) \ + $(OUTPRE)mk_req.$(OBJEXT) \ + $(OUTPRE)mk_safe.$(OBJEXT) \ + $(OUTPRE)month_sname.$(OBJEXT) \ + $(OUTPRE)one.$(OBJEXT) \ + $(OUTPRE)pkt_cipher.$(OBJEXT) \ + $(OUTPRE)pkt_clen.$(OBJEXT) \ + $(OUTPRE)rd_err.$(OBJEXT) \ + $(OUTPRE)rd_priv.$(OBJEXT) \ + $(OUTPRE)rd_safe.$(OBJEXT) \ + $(OUTPRE)send_to_kdc.$(OBJEXT) \ + $(OUTPRE)stime.$(OBJEXT) \ + $(OUTPRE)rd_preauth.$(OBJEXT) \ + $(OUTPRE)mk_preauth.$(OBJEXT) \ $(OSOBJS) $(CACHEOBJS) $(SETENVOBJS) $(STRCASEOBJS) $(SHMOBJS) \ $(LIB_KRB_HOSTOBJS) $(SERVER_KRB_OBJS) $(NETIO_OBJS) $(REALMDBOBJS) @@ -107,10 +107,10 @@ STOBJLISTS=OBJS.ST # # These objects implement the time computation routines. # -OSOBJS = unix_time.$(OBJEXT) +OSOBJS = $(OUTPRE)unix_time.$(OBJEXT) OSSRCS = $(srcdir)/unix_time.c -##DOS##OSOBJS = win_time.obj +##DOS##OSOBJS = $(OUTPRE)win_time.obj # # These objects implement ticket cacheing for Unix. They are @@ -119,11 +119,11 @@ OSSRCS = $(srcdir)/unix_time.c CACHESRCS=$(srcdir)/tf_util.c $(srcdir)/dest_tkt.c $(srcdir)/in_tkt.c \ $(srcdir)/tkt_string.c $(srcdir)/g_tf_fname.c \ $(srcdir)/g_tf_realm.c $(srcdir)/g_cred.c $(srcdir)/save_creds.c -CACHEOBJS=tf_util.$(OBJEXT) dest_tkt.$(OBJEXT) in_tkt.$(OBJEXT) \ - tkt_string.$(OBJEXT) g_tf_fname.$(OBJEXT) g_tf_realm.$(OBJEXT) \ - g_cred.$(OBJEXT) save_creds.$(OBJEXT) +CACHEOBJS=$(OUTPRE)tf_util.$(OBJEXT) $(OUTPRE)dest_tkt.$(OBJEXT) $(OUTPRE)in_tkt.$(OBJEXT) \ + $(OUTPRE)tkt_string.$(OBJEXT) $(OUTPRE)g_tf_fname.$(OBJEXT) $(OUTPRE)g_tf_realm.$(OBJEXT) \ + $(OUTPRE)g_cred.$(OBJEXT) $(OUTPRE)save_creds.$(OBJEXT) -##DOS##CACHEOBJS = memcache.$(OBJEXT) +##DOS##CACHEOBJS = $(OUTPRE)memcache.$(OBJEXT) # # These objects implement Kerberos realm<->host database lookup. @@ -136,8 +136,8 @@ CNFFILE = g_cnffile REALMDBSRCS= $(srcdir)/$(CNFFILE).c $(srcdir)/g_krbhst.c $(srcdir)/g_krbrlm.c \ $(srcdir)/g_admhst.c $(srcdir)/realmofhost.c -REALMDBOBJS= $(CNFFILE).$(OBJEXT) g_krbhst.$(OBJEXT) g_krbrlm.$(OBJEXT) \ - g_admhst.$(OBJEXT) realmofhost.$(OBJEXT) +REALMDBOBJS= $(OUTPRE)$(CNFFILE).$(OBJEXT) $(OUTPRE)g_krbhst.$(OBJEXT) $(OUTPRE)g_krbrlm.$(OBJEXT) \ + $(OUTPRE)g_admhst.$(OBJEXT) $(OUTPRE)realmofhost.$(OBJEXT) # # These objects are only used on server or debug implementations of Kerberos, @@ -151,18 +151,18 @@ SERVER_KRB_SRCS=$(srcdir)/klog.c $(srcdir)/kuserok.c $(srcdir)/log.c \ krb_err.c $(srcdir)/ad_print.c \ $(srcdir)/cr_death_pkt.c $(srcdir)/kparse.c \ $(srcdir)/put_svc_key.c $(srcdir)/sendauth.c -SERVER_KRB_OBJS=klog.$(OBJEXT) kuserok.$(OBJEXT) log.$(OBJEXT) \ - kntoln.$(OBJEXT) \ - fgetst.$(OBJEXT) rd_svc_key.$(OBJEXT) cr_err_repl.$(OBJEXT) \ - rd_req.$(OBJEXT) g_svc_in_tkt.$(OBJEXT) recvauth.$(OBJEXT) \ - krb_err.$(OBJEXT) ad_print.$(OBJEXT) cr_death_pkt.$(OBJEXT) \ - kparse.$(OBJEXT) put_svc_key.$(OBJEXT) sendauth.$(OBJEXT) +SERVER_KRB_OBJS=$(OUTPRE)klog.$(OBJEXT) $(OUTPRE)kuserok.$(OBJEXT) $(OUTPRE)log.$(OBJEXT) \ + $(OUTPRE)kntoln.$(OBJEXT) \ + $(OUTPRE)fgetst.$(OBJEXT) $(OUTPRE)rd_svc_key.$(OBJEXT) $(OUTPRE)cr_err_repl.$(OBJEXT) \ + $(OUTPRE)rd_req.$(OBJEXT) $(OUTPRE)g_svc_in_tkt.$(OBJEXT) $(OUTPRE)recvauth.$(OBJEXT) \ + $(OUTPRE)krb_err.$(OBJEXT) $(OUTPRE)ad_print.$(OBJEXT) $(OUTPRE)cr_death_pkt.$(OBJEXT) \ + $(OUTPRE)kparse.$(OBJEXT) $(OUTPRE)put_svc_key.$(OBJEXT) $(OUTPRE)sendauth.$(OBJEXT) # # These objects are included on Unix and Windows (for kstream and kadm) # but not under Mac (there are no file descriptors). # NETIO_SRCS=$(srcdir)/netread.c $(srcdir)/netwrite.c -NETIO_OBJS=netread.$(OBJEXT) netwrite.$(OBJEXT) +NETIO_OBJS=$(OUTPRE)netread.$(OBJEXT) $(OUTPRE)netwrite.$(OBJEXT) # # These objects glue the Kerberos library to the operating system @@ -170,9 +170,9 @@ NETIO_OBJS=netread.$(OBJEXT) netwrite.$(OBJEXT) # by other _glue.* routines. # LIB_KRB_HOSTSRCS=$(srcdir)/unix_glue.c -LIB_KRB_HOSTOBJS=unix_glue.$(OBJEXT) +LIB_KRB_HOSTOBJS=$(OUTPRE)unix_glue.$(OBJEXT) -##DOS##LIB_KRB_HOSTOBJS=win_glue.obj +##DOS##LIB_KRB_HOSTOBJS=$(OUTPRE)win_glue.obj ARCHIVEARGS= $@ $(OBJS) diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog index 497c306de..bf5ca27ca 100644 --- a/src/lib/krb5/ChangeLog +++ b/src/lib/krb5/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:23:34 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + 1998-11-13 Theodore Ts'o * Makefile.in: Set the myfulldir and mydir variables (which are diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in index 9ba1fe9b4..1d784e395 100644 --- a/src/lib/krb5/Makefile.in +++ b/src/lib/krb5/Makefile.in @@ -6,9 +6,9 @@ LOCAL_SUBDIRS= error_tables asn.1 ccache ccache/stdio ccache/file \ ccache/memory keytab keytab/file krb os rcache posix ##DOSBUILDTOP = ..\.. -##DOSLIBNAME=krb5.lib -##DOSOBJFILEDEP=asn1.lst ccache.lst err_tbls.lst keytab.lst krb.lst os.lst posix.lst rcache.lst -##DOSOBJFILELIST=@asn1.lst @ccache.lst @err_tbls.lst @keytab.lst @krb.lst @os.lst @posix.lst @rcache.lst +##DOSLIBNAME=$(OUTPRE)krb5.lib +##DOSOBJFILEDEP=$(OUTPRE)asn1.lst $(OUTPRE)ccache.lst $(OUTPRE)err_tbls.lst $(OUTPRE)keytab.lst $(OUTPRE)krb.lst $(OUTPRE)os.lst $(OUTPRE)posix.lst $(OUTPRE)rcache.lst +##DOSOBJFILELIST=@$(OUTPRE)asn1.lst @$(OUTPRE)ccache.lst @$(OUTPRE)err_tbls.lst @$(OUTPRE)keytab.lst @$(OUTPRE)krb.lst @$(OUTPRE)os.lst @$(OUTPRE)posix.lst @$(OUTPRE)rcache.lst TST=if test -n "`cat DONE`" ; then @@ -60,7 +60,7 @@ all-windows:: clean-unix:: clean-liblinks clean-libs clean-windows:: - $(RM) krb5.lib krb5.bak + $(RM) $(OUTPRE)krb5.lib krb5.bak all-windows:: cd asn.1 diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog index e819d52b2..13b4e638b 100644 --- a/src/lib/krb5/asn.1/ChangeLog +++ b/src/lib/krb5/asn.1/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:23:51 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + 1998-11-13 Theodore Ts'o * Makefile.in: Set the myfulldir and mydir variables (which are diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in index 79b7c2c91..4cd003e2d 100644 --- a/src/lib/krb5/asn.1/Makefile.in +++ b/src/lib/krb5/asn.1/Makefile.in @@ -6,7 +6,7 @@ CFLAGS=$(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=asn.1 -##DOS##OBJFILE=..\asn1.lst +##DOS##OBJFILE=..\$(OUTPRE)asn1.lst ##WIN16##LIBNAME=..\krb5.lib EHDRDIR=$(BUILDTOP)/include/krb5/asn.1 @@ -36,16 +36,16 @@ SRCS= \ $(srcdir)/asn1_misc.c OBJS= \ - asn1_decode.$(OBJEXT)\ - asn1_k_decode.$(OBJEXT)\ - asn1_encode.$(OBJEXT)\ - asn1_get.$(OBJEXT)\ - asn1_make.$(OBJEXT)\ - asn1buf.$(OBJEXT)\ - krb5_decode.$(OBJEXT)\ - krb5_encode.$(OBJEXT)\ - asn1_k_encode.$(OBJEXT)\ - asn1_misc.$(OBJEXT) + $(OUTPRE)asn1_decode.$(OBJEXT)\ + $(OUTPRE)asn1_k_decode.$(OBJEXT)\ + $(OUTPRE)asn1_encode.$(OBJEXT)\ + $(OUTPRE)asn1_get.$(OBJEXT)\ + $(OUTPRE)asn1_make.$(OBJEXT)\ + $(OUTPRE)asn1buf.$(OBJEXT)\ + $(OUTPRE)krb5_decode.$(OBJEXT)\ + $(OUTPRE)krb5_encode.$(OBJEXT)\ + $(OUTPRE)asn1_k_encode.$(OBJEXT)\ + $(OUTPRE)asn1_misc.$(OBJEXT) ##DOS##LIBOBJS = $(OBJS) diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog index 4671dccf8..947ccfed6 100644 --- a/src/lib/krb5/ccache/ChangeLog +++ b/src/lib/krb5/ccache/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:24:08 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + 1999-03-31 Theodore Ts'o * ccdefops.c: Change the default ccache type under windows to be diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in index 11135b6ca..1845f348f 100644 --- a/src/lib/krb5/ccache/Makefile.in +++ b/src/lib/krb5/ccache/Makefile.in @@ -11,7 +11,7 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)$(S)file -I$(srcdir)$(S)stdio \ ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=ccache -##DOS##OBJFILE=..\$(PREFIXDIR).lst +##DOS##OBJFILE=..\$(OUTPRE)$(PREFIXDIR).lst ##WIN16##LIBNAME=..\krb5.lib MAC_SUBDIRS = file stdio memory ccapi @@ -23,11 +23,11 @@ STLIBOBJS= \ ccdefops.o \ ser_cc.o -OBJS= ccbase.$(OBJEXT) \ - cccopy.$(OBJEXT) \ - ccdefault.$(OBJEXT) \ - ccdefops.$(OBJEXT) \ - ser_cc.$(OBJEXT) +OBJS= $(OUTPRE)ccbase.$(OBJEXT) \ + $(OUTPRE)cccopy.$(OBJEXT) \ + $(OUTPRE)ccdefault.$(OBJEXT) \ + $(OUTPRE)ccdefops.$(OBJEXT) \ + $(OUTPRE)ser_cc.$(OBJEXT) SRCS= $(srcdir)/ccbase.c \ $(srcdir)/cccopy.c \ @@ -39,31 +39,31 @@ all-unix:: all-libobjs all-windows:: subdirs $(OBJFILE) -##DOS##subdirs:: file\file.lst memory\file.lst ccapi\file.lst +##DOS##subdirs:: file\$(OUTPRE)file.lst memory\$(OUTPRE)file.lst ccapi\$(OUTPRE)file.lst ##DOS## -##DOS##file\file.lst:: +##DOS##file\$(OUTPRE)file.lst:: ##DOS## cd file ##DOS## @echo Making in krb5\ccache\file ##DOS## -$(MAKE) -$(MFLAGS) ##DOS## cd .. -##DOS##memory\file.lst:: +##DOS##memory\$(OUTPRE)file.lst:: ##DOS## cd memory ##DOS## @echo Making in krb5\ccache\memory ##DOS## -$(MAKE) -$(MFLAGS) ##DOS## cd .. -##DOS##ccapi\file.lst:: +##DOS##ccapi\$(OUTPRE)file.lst:: ##DOS## cd ccapi ##DOS## @echo Making in krb5\ccache\ccapi ##DOS## -$(MAKE) -$(MFLAGS) ##DOS## cd .. -##DOS##$(OBJFILE): $(OBJS) file\file.lst memory\file.lst ccapi\file.lst +##DOS##$(OBJFILE): $(OBJS) file\$(OUTPRE)file.lst memory\$(OUTPRE)file.lst ccapi\$(OUTPRE)file.lst ##DOS## $(RM) $(OBJFILE) ##WIN16## $(CP) nul: $(OBJFILE) -##WIN32## $(LIBECHO) -p $(PREFIXDIR)\ *.obj file\*.obj memory\*.obj \ -##WIN32## ccapi\*.obj > $(OBJFILE) +##WIN32## $(LIBECHO) -p $(PREFIXDIR)\ $(OUTPRE)*.obj file\$(OUTPRE)*.obj memory\$(OUTPRE)*.obj \ +##WIN32## ccapi\$(OUTPRE)*.obj > $(OBJFILE) clean-unix:: clean-libobjs diff --git a/src/lib/krb5/ccache/ccapi/ChangeLog b/src/lib/krb5/ccache/ccapi/ChangeLog index f06bee5c1..1e152d98b 100644 --- a/src/lib/krb5/ccache/ccapi/ChangeLog +++ b/src/lib/krb5/ccache/ccapi/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:24:36 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + Thu Apr 8 16:09:08 1999 Theodore Y. Ts'o * winccld.c: Only compile this file on Windows (to avoid screwing diff --git a/src/lib/krb5/ccache/ccapi/Makefile.in b/src/lib/krb5/ccache/ccapi/Makefile.in index 47919920a..7229f798e 100644 --- a/src/lib/krb5/ccache/ccapi/Makefile.in +++ b/src/lib/krb5/ccache/ccapi/Makefile.in @@ -8,7 +8,7 @@ CFLAGS = $(CCOPTS) $(DEFS) $(WIN_INCLUDES) ##DOS##BUILDTOP = ..\..\..\.. ##DOS##PREFIXDIR = ccache\file -##DOS##OBJFILE = file.lst +##DOS##OBJFILE = $(OUTPRE)file.lst ##WIN16##LIBNAME=..\..\krb5.lib STLIBOBJS = \ @@ -16,7 +16,7 @@ STLIBOBJS = \ stdcc_util.o \ winccld.o -OBJS = stdcc.$(OBJEXT) stdcc_util.$(OBJEXT) winccld.$(OBJEXT) +OBJS = $(OUTPRE)stdcc.$(OBJEXT) $(OUTPRE)stdcc_util.$(OBJEXT) $(OUTPRE)winccld.$(OBJEXT) SRCS = $(srcdir)/stdcc.c $(srcdir)/stdcc_util.c $(srcdir)/winccld.c diff --git a/src/lib/krb5/ccache/file/ChangeLog b/src/lib/krb5/ccache/file/ChangeLog index fc7c07b2c..07e370cbb 100644 --- a/src/lib/krb5/ccache/file/ChangeLog +++ b/src/lib/krb5/ccache/file/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:24:49 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + 1998-11-13 Theodore Ts'o * Makefile.in: Set the myfulldir and mydir variables (which are diff --git a/src/lib/krb5/ccache/file/Makefile.in b/src/lib/krb5/ccache/file/Makefile.in index 786a5805a..77cf38eed 100644 --- a/src/lib/krb5/ccache/file/Makefile.in +++ b/src/lib/krb5/ccache/file/Makefile.in @@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\..\.. ##DOS##PREFIXDIR = ccache\file -##DOS##OBJFILE = file.lst +##DOS##OBJFILE = $(OUTPRE)file.lst ##WIN16##LIBNAME=..\..\krb5.lib STLIBOBJS = \ @@ -18,13 +18,13 @@ STLIBOBJS = \ fcc_write.o fcc_sflags.o fcc_defops.o \ fcc_errs.o fcc_maybe.o -OBJS = fcc_close.$(OBJEXT) fcc_destry.$(OBJEXT) fcc_eseq.$(OBJEXT) \ - fcc_gennew.$(OBJEXT) fcc_getnam.$(OBJEXT) fcc_gprin.$(OBJEXT) \ - fcc_init.$(OBJEXT) fcc_nseq.$(OBJEXT) fcc_read.$(OBJEXT) \ - fcc_reslv.$(OBJEXT) fcc_retrv.$(OBJEXT) fcc_sseq.$(OBJEXT) \ - fcc_store.$(OBJEXT) fcc_skip.$(OBJEXT) fcc_ops.$(OBJEXT) \ - fcc_write.$(OBJEXT) fcc_sflags.$(OBJEXT) fcc_defops.$(OBJEXT) \ - fcc_errs.$(OBJEXT) fcc_maybe.$(OBJEXT) +OBJS = $(OUTPRE)fcc_close.$(OBJEXT) $(OUTPRE)fcc_destry.$(OBJEXT) $(OUTPRE)fcc_eseq.$(OBJEXT) \ + $(OUTPRE)fcc_gennew.$(OBJEXT) $(OUTPRE)fcc_getnam.$(OBJEXT) $(OUTPRE)fcc_gprin.$(OBJEXT) \ + $(OUTPRE)fcc_init.$(OBJEXT) $(OUTPRE)fcc_nseq.$(OBJEXT) $(OUTPRE)fcc_read.$(OBJEXT) \ + $(OUTPRE)fcc_reslv.$(OBJEXT) $(OUTPRE)fcc_retrv.$(OBJEXT) $(OUTPRE)fcc_sseq.$(OBJEXT) \ + $(OUTPRE)fcc_store.$(OBJEXT) $(OUTPRE)fcc_skip.$(OBJEXT) $(OUTPRE)fcc_ops.$(OBJEXT) \ + $(OUTPRE)fcc_write.$(OBJEXT) $(OUTPRE)fcc_sflags.$(OBJEXT) $(OUTPRE)fcc_defops.$(OBJEXT) \ + $(OUTPRE)fcc_errs.$(OBJEXT) $(OUTPRE)fcc_maybe.$(OBJEXT) SRCS = $(srcdir)/fcc_close.c $(srcdir)/fcc_destry.c $(srcdir)/fcc_eseq.c \ $(srcdir)/fcc_gennew.c $(srcdir)/fcc_getnam.c $(srcdir)/fcc_gprin.c \ diff --git a/src/lib/krb5/ccache/memory/ChangeLog b/src/lib/krb5/ccache/memory/ChangeLog index 8bb51fad8..4ff0ffafd 100644 --- a/src/lib/krb5/ccache/memory/ChangeLog +++ b/src/lib/krb5/ccache/memory/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:25:06 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + 1998-11-13 Theodore Ts'o * Makefile.in: Set the myfulldir and mydir variables (which are diff --git a/src/lib/krb5/ccache/memory/Makefile.in b/src/lib/krb5/ccache/memory/Makefile.in index 9cc429378..121ec9dc0 100644 --- a/src/lib/krb5/ccache/memory/Makefile.in +++ b/src/lib/krb5/ccache/memory/Makefile.in @@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\..\.. ##DOS##PREFIXDIR = ccache\memory -##DOS##OBJFILE = file.lst +##DOS##OBJFILE = $(OUTPRE)file.lst ##WIN16##LIBNAME=..\..\krb5.lib @@ -18,12 +18,12 @@ STLIBOBJS = \ mcc_store.o mcc_ops.o \ mcc_sflags.o -OBJS = mcc_close.$(OBJEXT) mcc_destry.$(OBJEXT) mcc_eseq.$(OBJEXT) \ - mcc_gennew.$(OBJEXT) mcc_getnam.$(OBJEXT) mcc_gprin.$(OBJEXT) \ - mcc_init.$(OBJEXT) mcc_nseq.$(OBJEXT) \ - mcc_reslv.$(OBJEXT) mcc_retrv.$(OBJEXT) mcc_sseq.$(OBJEXT) \ - mcc_store.$(OBJEXT) mcc_ops.$(OBJEXT) \ - mcc_sflags.$(OBJEXT) +OBJS = $(OUTPRE)mcc_close.$(OBJEXT) $(OUTPRE)mcc_destry.$(OBJEXT) $(OUTPRE)mcc_eseq.$(OBJEXT) \ + $(OUTPRE)mcc_gennew.$(OBJEXT) $(OUTPRE)mcc_getnam.$(OBJEXT) $(OUTPRE)mcc_gprin.$(OBJEXT) \ + $(OUTPRE)mcc_init.$(OBJEXT) $(OUTPRE)mcc_nseq.$(OBJEXT) \ + $(OUTPRE)mcc_reslv.$(OBJEXT) $(OUTPRE)mcc_retrv.$(OBJEXT) $(OUTPRE)mcc_sseq.$(OBJEXT) \ + $(OUTPRE)mcc_store.$(OBJEXT) $(OUTPRE)mcc_ops.$(OBJEXT) \ + $(OUTPRE)mcc_sflags.$(OBJEXT) SRCS = $(srcdir)/mcc_close.c $(srcdir)/mcc_destry.c $(srcdir)/mcc_eseq.c \ $(srcdir)/mcc_gennew.c $(srcdir)/mcc_getnam.c $(srcdir)/mcc_gprin.c \ diff --git a/src/lib/krb5/error_tables/ChangeLog b/src/lib/krb5/error_tables/ChangeLog index 9072ef0b0..502ff9248 100644 --- a/src/lib/krb5/error_tables/ChangeLog +++ b/src/lib/krb5/error_tables/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:25:19 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + 1998-11-13 Theodore Ts'o * Makefile.in: Set the myfulldir and mydir variables (which are diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in index b0a78403e..ab3826261 100644 --- a/src/lib/krb5/error_tables/Makefile.in +++ b/src/lib/krb5/error_tables/Makefile.in @@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=error_tables -##DOS##OBJFILE=..\err_tbls.lst +##DOS##OBJFILE=..\$(OUTPRE)err_tbls.lst ##WIN16##LIBNAME=..\krb5.lib EHDRDIR=$(BUILDTOP)$(S)include$(S)krb5 @@ -27,8 +27,8 @@ STLIBOBJS= asn1_err.o kdb5_err.o krb5_err.o \ kv5m_err.o adm_err.o init_ets.o HDRS= asn1_err.h kdb5_err.h krb5_err.h kv5m_err.h adm_err.h -OBJS= asn1_err.$(OBJEXT) kdb5_err.$(OBJEXT) krb5_err.$(OBJEXT) \ - kv5m_err.$(OBJEXT) adm_err.$(OBJEXT) init_ets.$(OBJEXT) +OBJS= $(OUTPRE)asn1_err.$(OBJEXT) $(OUTPRE)kdb5_err.$(OBJEXT) $(OUTPRE)krb5_err.$(OBJEXT) \ + $(OUTPRE)kv5m_err.$(OBJEXT) $(OUTPRE)adm_err.$(OBJEXT) $(OUTPRE)init_ets.$(OBJEXT) ETSRCS= asn1_err.c kdb5_err.c krb5_err.c kv5m_err.c adm_err.c SRCS= asn1_err.c kdb5_err.c krb5_err.c kv5m_err.c adm_err.c \ $(srcdir)/init_ets.c @@ -60,12 +60,12 @@ awk-windows: # # dependencies for traditional makes # -asn1_err.$(OBJEXT): asn1_err.c -isode_err.$(OBJEXT): isode_err.c -kdb5_err.$(OBJEXT): kdb5_err.c -krb5_err.$(OBJEXT): krb5_err.c -adm_err.$(OBJEXT): adm_err.c -kv5m_err.$(OBJEXT): kv5m_err.c +$(OUTPRE)asn1_err.$(OBJEXT): asn1_err.c +$(OUTPRE)isode_err.$(OBJEXT): isode_err.c +$(OUTPRE)kdb5_err.$(OBJEXT): kdb5_err.c +$(OUTPRE)krb5_err.$(OBJEXT): krb5_err.c +$(OUTPRE)adm_err.$(OBJEXT): adm_err.c +$(OUTPRE)kv5m_err.$(OBJEXT): kv5m_err.c clean-unix:: clean-libobjs $(RM) $(HDRS) $(ETSRCS) diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog index 877f11cb2..eeeac9f94 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 + + * Makefile.in: Do win32 build in subdir. + 1998-11-13 Theodore Ts'o * 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 291541f9c..d4f98f9b7 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 f377ce47b..7ca80a640 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 + + * Makefile.in: Do win32 build in subdir. + 1998-11-13 Theodore Ts'o * 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 ffe3c6dbb..1c0fa64dd 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) diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index b3e1a5a3f..efcdbf066 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:26:00 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + 1999-04-09 Theodore Ts'o * kfree.c (krb5_free_sam_challenge, krb5_free_sam_challenge_contents, diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in index fc2031af8..4c6851490 100644 --- a/src/lib/krb5/krb/Makefile.in +++ b/src/lib/krb5/krb/Makefile.in @@ -9,7 +9,7 @@ PROG_RPATH=$(KRB5_LIBDIR) ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=krb -##DOS##OBJFILE=..\$(PREFIXDIR).lst +##DOS##OBJFILE=..\$(OUTPRE)$(PREFIXDIR).lst ##WIN16##LIBNAME=..\krb5.lib STLIBOBJS= \ @@ -96,88 +96,88 @@ STLIBOBJS= \ vic_opt.o \ walk_rtree.o -OBJS= addr_comp.$(OBJEXT) \ - addr_order.$(OBJEXT) \ - addr_srch.$(OBJEXT) \ - auth_con.$(OBJEXT) \ - bld_pr_ext.$(OBJEXT) \ - bld_princ.$(OBJEXT) \ - chk_trans.$(OBJEXT) \ - chpw.$(OBJEXT) \ - conv_princ.$(OBJEXT) \ - copy_addrs.$(OBJEXT) \ - copy_auth.$(OBJEXT) \ - copy_athctr.$(OBJEXT) \ - copy_cksum.$(OBJEXT) \ - copy_creds.$(OBJEXT) \ - copy_data.$(OBJEXT) \ - copy_key.$(OBJEXT) \ - copy_princ.$(OBJEXT) \ - copy_tick.$(OBJEXT) \ - cp_key_cnt.$(OBJEXT) \ - decode_kdc.$(OBJEXT) \ - decrypt_tk.$(OBJEXT) \ - enc_helper.$(OBJEXT) \ - encode_kdc.$(OBJEXT) \ - encrypt_tk.$(OBJEXT) \ - free_rtree.$(OBJEXT) \ - fwd_tgt.$(OBJEXT) \ - gc_frm_kdc.$(OBJEXT) \ - gc_via_tkt.$(OBJEXT) \ - gen_seqnum.$(OBJEXT) \ - gen_subkey.$(OBJEXT) \ - get_creds.$(OBJEXT) \ - get_in_tkt.$(OBJEXT) \ - gic_keytab.$(OBJEXT) \ - gic_opt.$(OBJEXT) \ - gic_pwd.$(OBJEXT) \ - in_tkt_ktb.$(OBJEXT) \ - in_tkt_pwd.$(OBJEXT) \ - in_tkt_sky.$(OBJEXT) \ - init_ctx.$(OBJEXT) \ - kdc_rep_dc.$(OBJEXT) \ - kfree.$(OBJEXT) \ - mk_cred.$(OBJEXT) \ - mk_error.$(OBJEXT) \ - mk_priv.$(OBJEXT) \ - mk_rep.$(OBJEXT) \ - mk_req.$(OBJEXT) \ - mk_req_ext.$(OBJEXT) \ - mk_safe.$(OBJEXT) \ - parse.$(OBJEXT) \ - pr_to_salt.$(OBJEXT) \ - preauth.$(OBJEXT) \ - preauth2.$(OBJEXT) \ - princ_comp.$(OBJEXT) \ - rd_cred.$(OBJEXT) \ - rd_error.$(OBJEXT) \ - rd_priv.$(OBJEXT) \ - rd_rep.$(OBJEXT) \ - rd_req.$(OBJEXT) \ - rd_req_dec.$(OBJEXT) \ - rd_safe.$(OBJEXT) \ - recvauth.$(OBJEXT) \ - sendauth.$(OBJEXT) \ - send_tgs.$(OBJEXT) \ - ser_actx.$(OBJEXT) \ - ser_adata.$(OBJEXT) \ - ser_addr.$(OBJEXT) \ - ser_auth.$(OBJEXT) \ - ser_cksum.$(OBJEXT) \ - ser_ctx.$(OBJEXT) \ - ser_eblk.$(OBJEXT) \ - ser_key.$(OBJEXT) \ - ser_princ.$(OBJEXT) \ - serialize.$(OBJEXT) \ - set_realm.$(OBJEXT) \ - srv_rcache.$(OBJEXT) \ - str_conv.$(OBJEXT) \ - tgtname.$(OBJEXT) \ - unparse.$(OBJEXT) \ - valid_times.$(OBJEXT) \ - vfy_increds.$(OBJEXT) \ - vic_opt.$(OBJEXT) \ - walk_rtree.$(OBJEXT) +OBJS= $(OUTPRE)addr_comp.$(OBJEXT) \ + $(OUTPRE)addr_order.$(OBJEXT) \ + $(OUTPRE)addr_srch.$(OBJEXT) \ + $(OUTPRE)auth_con.$(OBJEXT) \ + $(OUTPRE)bld_pr_ext.$(OBJEXT) \ + $(OUTPRE)bld_princ.$(OBJEXT) \ + $(OUTPRE)chk_trans.$(OBJEXT) \ + $(OUTPRE)chpw.$(OBJEXT) \ + $(OUTPRE)conv_princ.$(OBJEXT) \ + $(OUTPRE)copy_addrs.$(OBJEXT) \ + $(OUTPRE)copy_auth.$(OBJEXT) \ + $(OUTPRE)copy_athctr.$(OBJEXT) \ + $(OUTPRE)copy_cksum.$(OBJEXT) \ + $(OUTPRE)copy_creds.$(OBJEXT) \ + $(OUTPRE)copy_data.$(OBJEXT) \ + $(OUTPRE)copy_key.$(OBJEXT) \ + $(OUTPRE)copy_princ.$(OBJEXT) \ + $(OUTPRE)copy_tick.$(OBJEXT) \ + $(OUTPRE)cp_key_cnt.$(OBJEXT) \ + $(OUTPRE)decode_kdc.$(OBJEXT) \ + $(OUTPRE)decrypt_tk.$(OBJEXT) \ + $(OUTPRE)enc_helper.$(OBJEXT) \ + $(OUTPRE)encode_kdc.$(OBJEXT) \ + $(OUTPRE)encrypt_tk.$(OBJEXT) \ + $(OUTPRE)free_rtree.$(OBJEXT) \ + $(OUTPRE)fwd_tgt.$(OBJEXT) \ + $(OUTPRE)gc_frm_kdc.$(OBJEXT) \ + $(OUTPRE)gc_via_tkt.$(OBJEXT) \ + $(OUTPRE)gen_seqnum.$(OBJEXT) \ + $(OUTPRE)gen_subkey.$(OBJEXT) \ + $(OUTPRE)get_creds.$(OBJEXT) \ + $(OUTPRE)get_in_tkt.$(OBJEXT) \ + $(OUTPRE)gic_keytab.$(OBJEXT) \ + $(OUTPRE)gic_opt.$(OBJEXT) \ + $(OUTPRE)gic_pwd.$(OBJEXT) \ + $(OUTPRE)in_tkt_ktb.$(OBJEXT) \ + $(OUTPRE)in_tkt_pwd.$(OBJEXT) \ + $(OUTPRE)in_tkt_sky.$(OBJEXT) \ + $(OUTPRE)init_ctx.$(OBJEXT) \ + $(OUTPRE)kdc_rep_dc.$(OBJEXT) \ + $(OUTPRE)kfree.$(OBJEXT) \ + $(OUTPRE)mk_cred.$(OBJEXT) \ + $(OUTPRE)mk_error.$(OBJEXT) \ + $(OUTPRE)mk_priv.$(OBJEXT) \ + $(OUTPRE)mk_rep.$(OBJEXT) \ + $(OUTPRE)mk_req.$(OBJEXT) \ + $(OUTPRE)mk_req_ext.$(OBJEXT) \ + $(OUTPRE)mk_safe.$(OBJEXT) \ + $(OUTPRE)parse.$(OBJEXT) \ + $(OUTPRE)pr_to_salt.$(OBJEXT) \ + $(OUTPRE)preauth.$(OBJEXT) \ + $(OUTPRE)preauth2.$(OBJEXT) \ + $(OUTPRE)princ_comp.$(OBJEXT) \ + $(OUTPRE)rd_cred.$(OBJEXT) \ + $(OUTPRE)rd_error.$(OBJEXT) \ + $(OUTPRE)rd_priv.$(OBJEXT) \ + $(OUTPRE)rd_rep.$(OBJEXT) \ + $(OUTPRE)rd_req.$(OBJEXT) \ + $(OUTPRE)rd_req_dec.$(OBJEXT) \ + $(OUTPRE)rd_safe.$(OBJEXT) \ + $(OUTPRE)recvauth.$(OBJEXT) \ + $(OUTPRE)sendauth.$(OBJEXT) \ + $(OUTPRE)send_tgs.$(OBJEXT) \ + $(OUTPRE)ser_actx.$(OBJEXT) \ + $(OUTPRE)ser_adata.$(OBJEXT) \ + $(OUTPRE)ser_addr.$(OBJEXT) \ + $(OUTPRE)ser_auth.$(OBJEXT) \ + $(OUTPRE)ser_cksum.$(OBJEXT) \ + $(OUTPRE)ser_ctx.$(OBJEXT) \ + $(OUTPRE)ser_eblk.$(OBJEXT) \ + $(OUTPRE)ser_key.$(OBJEXT) \ + $(OUTPRE)ser_princ.$(OBJEXT) \ + $(OUTPRE)serialize.$(OBJEXT) \ + $(OUTPRE)set_realm.$(OBJEXT) \ + $(OUTPRE)srv_rcache.$(OBJEXT) \ + $(OUTPRE)str_conv.$(OBJEXT) \ + $(OUTPRE)tgtname.$(OBJEXT) \ + $(OUTPRE)unparse.$(OBJEXT) \ + $(OUTPRE)valid_times.$(OBJEXT) \ + $(OUTPRE)vfy_increds.$(OBJEXT) \ + $(OUTPRE)vic_opt.$(OBJEXT) \ + $(OUTPRE)walk_rtree.$(OBJEXT) SRCS= $(srcdir)/addr_comp.c \ $(srcdir)/addr_order.c \ @@ -319,6 +319,6 @@ check-unix:: $(TEST_PROGS) $(RUN_SETUP) ./t_ser clean:: - $(RM) t_walk_rtree$(EXEEXT) t_walk_rtree.$(OBJEXT) - $(RM) t_kerb$(EXEEXT) t_kerb.$(OBJEXT) - $(RM) t_ser$(EXEEXT) t_ser.$(OBJEXT) + $(RM) $(OUTPRE)t_walk_rtree$(EXEEXT) $(OUTPRE)t_walk_rtree.$(OBJEXT) + $(RM) $(OUTPRE)t_kerb$(EXEEXT) $(OUTPRE)t_kerb.$(OBJEXT) + $(RM) $(OUTPRE)t_ser$(EXEEXT) $(OUTPRE)t_ser.$(OBJEXT) diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index d3395afe0..0b12d76a3 100644 --- a/src/lib/krb5/os/ChangeLog +++ b/src/lib/krb5/os/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:26:20 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + Fri May 7 18:04:48 1999 Danilo D Almeida * locate_kdc.c (krb5_locate_kdc): Fixed typo. diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in index c1b48d7b2..47d2baed2 100644 --- a/src/lib/krb5/os/Makefile.in +++ b/src/lib/krb5/os/Makefile.in @@ -9,7 +9,7 @@ PROG_RPATH=$(KRB5_LIBDIR) ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=os -##DOS##OBJFILE=..\$(PREFIXDIR).lst +##DOS##OBJFILE=..\$(OUTPRE)$(PREFIXDIR).lst ##WIN16##LIBNAME=..\krb5.lib STLIBOBJS= \ @@ -57,48 +57,48 @@ STLIBOBJS= \ write_msg.o OBJS= \ - an_to_ln.$(OBJEXT) \ - c_ustime.$(OBJEXT) \ - def_realm.$(OBJEXT) \ - DNR.$(OBJEXT) \ - ccdefname.$(OBJEXT) \ - changepw.$(OBJEXT) \ - free_krbhs.$(OBJEXT) \ - free_hstrl.$(OBJEXT) \ - full_ipadr.$(OBJEXT) \ - get_krbhst.$(OBJEXT) \ - gen_port.$(OBJEXT) \ - genaddrs.$(OBJEXT) \ - gen_rname.$(OBJEXT) \ - gmt_mktime.$(OBJEXT) \ - hostaddr.$(OBJEXT) \ - hst_realm.$(OBJEXT) \ - init_os_ctx.$(OBJEXT) \ - krbfileio.$(OBJEXT) \ - ktdefname.$(OBJEXT) \ - kuserok.$(OBJEXT) \ - mk_faddr.$(OBJEXT) \ - localaddr.$(OBJEXT) \ - locate_kdc.$(OBJEXT) \ - lock_file.$(OBJEXT) \ - macsock.$(OBJEXT) \ - net_read.$(OBJEXT) \ - net_write.$(OBJEXT) \ - osconfig.$(OBJEXT) \ - port2ip.$(OBJEXT) \ - prompter.$(OBJEXT) \ - promptusr.$(OBJEXT) \ - read_msg.$(OBJEXT) \ - read_pwd.$(OBJEXT) \ - realm_dom.$(OBJEXT) \ - realm_iter.$(OBJEXT) \ - sendto_kdc.$(OBJEXT) \ - sn2princ.$(OBJEXT) \ - timeofday.$(OBJEXT) \ - toffset.$(OBJEXT) \ - unlck_file.$(OBJEXT) \ - ustime.$(OBJEXT) \ - write_msg.$(OBJEXT) + $(OUTPRE)an_to_ln.$(OBJEXT) \ + $(OUTPRE)c_ustime.$(OBJEXT) \ + $(OUTPRE)def_realm.$(OBJEXT) \ + $(OUTPRE)DNR.$(OBJEXT) \ + $(OUTPRE)ccdefname.$(OBJEXT) \ + $(OUTPRE)changepw.$(OBJEXT) \ + $(OUTPRE)free_krbhs.$(OBJEXT) \ + $(OUTPRE)free_hstrl.$(OBJEXT) \ + $(OUTPRE)full_ipadr.$(OBJEXT) \ + $(OUTPRE)get_krbhst.$(OBJEXT) \ + $(OUTPRE)gen_port.$(OBJEXT) \ + $(OUTPRE)genaddrs.$(OBJEXT) \ + $(OUTPRE)gen_rname.$(OBJEXT) \ + $(OUTPRE)gmt_mktime.$(OBJEXT) \ + $(OUTPRE)hostaddr.$(OBJEXT) \ + $(OUTPRE)hst_realm.$(OBJEXT) \ + $(OUTPRE)init_os_ctx.$(OBJEXT) \ + $(OUTPRE)krbfileio.$(OBJEXT) \ + $(OUTPRE)ktdefname.$(OBJEXT) \ + $(OUTPRE)kuserok.$(OBJEXT) \ + $(OUTPRE)mk_faddr.$(OBJEXT) \ + $(OUTPRE)localaddr.$(OBJEXT) \ + $(OUTPRE)locate_kdc.$(OBJEXT) \ + $(OUTPRE)lock_file.$(OBJEXT) \ + $(OUTPRE)macsock.$(OBJEXT) \ + $(OUTPRE)net_read.$(OBJEXT) \ + $(OUTPRE)net_write.$(OBJEXT) \ + $(OUTPRE)osconfig.$(OBJEXT) \ + $(OUTPRE)port2ip.$(OBJEXT) \ + $(OUTPRE)prompter.$(OBJEXT) \ + $(OUTPRE)promptusr.$(OBJEXT) \ + $(OUTPRE)read_msg.$(OBJEXT) \ + $(OUTPRE)read_pwd.$(OBJEXT) \ + $(OUTPRE)realm_dom.$(OBJEXT) \ + $(OUTPRE)realm_iter.$(OBJEXT) \ + $(OUTPRE)sendto_kdc.$(OBJEXT) \ + $(OUTPRE)sn2princ.$(OBJEXT) \ + $(OUTPRE)timeofday.$(OBJEXT) \ + $(OUTPRE)toffset.$(OBJEXT) \ + $(OUTPRE)unlck_file.$(OBJEXT) \ + $(OUTPRE)ustime.$(OBJEXT) \ + $(OUTPRE)write_msg.$(OBJEXT) SRCS= \ $(srcdir)/an_to_ln.c \ diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog index 09b44c14f..803dbc308 100644 --- a/src/lib/krb5/posix/ChangeLog +++ b/src/lib/krb5/posix/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:26:38 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + 1998-11-13 Theodore Ts'o * Makefile.in: Set the myfulldir and mydir variables (which are diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in index 97737daeb..e608d3bd8 100644 --- a/src/lib/krb5/posix/Makefile.in +++ b/src/lib/krb5/posix/Makefile.in @@ -6,16 +6,16 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=posix -##DOS##OBJFILE=..\$(PREFIXDIR).lst +##DOS##OBJFILE=..\$(OUTPRE)$(PREFIXDIR).lst ##WIN16##LIBNAME=..\krb5.lib STLIBOBJS=setenv.o @LIBOBJS@ MACSRCS = getuid.c strcasecmp.c strdup.c -OBJS = setenv.$(OBJEXT) @LIBOBJS@ +OBJS = $(OUTPRE)setenv.$(OBJEXT) @LIBOBJS@ all-unix:: all-libobjs clean-unix:: clean-libobjs ##WIN16##LIBOBJS = syslog.obj sscanf.obj -##WIN32##LIBOBJS = syslog.obj +##WIN32##LIBOBJS = $(OUTPRE)syslog.obj diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog index 1f5ac87c2..3917175a4 100644 --- a/src/lib/krb5/rcache/ChangeLog +++ b/src/lib/krb5/rcache/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:26:53 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + Tue Apr 6 16:10:44 1999 Theodore Y. Ts'o * rc_io.c (krb5_rc_io_move): Workaround the fact that Windows has diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in index 30c75dd83..248d7760b 100644 --- a/src/lib/krb5/rcache/Makefile.in +++ b/src/lib/krb5/rcache/Makefile.in @@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. ##DOS##PREFIXDIR=rcache -##DOS##OBJFILE=..\$(PREFIXDIR).lst +##DOS##OBJFILE=..\$(OUTPRE)$(PREFIXDIR).lst ##WIN16##LIBNAME=..\krb5.lib STLIBOBJS = \ @@ -18,12 +18,12 @@ STLIBOBJS = \ ser_rc.o OBJS= \ - rc_base.$(OBJEXT) \ - rc_dfl.$(OBJEXT) \ - rc_io.$(OBJEXT) \ - rcdef.$(OBJEXT) \ - rc_conv.$(OBJEXT) \ - ser_rc.$(OBJEXT) + $(OUTPRE)rc_base.$(OBJEXT) \ + $(OUTPRE)rc_dfl.$(OBJEXT) \ + $(OUTPRE)rc_io.$(OBJEXT) \ + $(OUTPRE)rcdef.$(OBJEXT) \ + $(OUTPRE)rc_conv.$(OBJEXT) \ + $(OUTPRE)ser_rc.$(OBJEXT) SRCS= \ $(srcdir)/rc_base.c \ diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog index 0cb611f32..80fcb44cd 100644 --- a/src/util/et/ChangeLog +++ b/src/util/et/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:27:07 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + Mon Mar 15 16:01:56 1999 Tom Yu * com_err.h: Fix GSS_DLLIMP. diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in index 805c694e9..ff81a70e2 100644 --- a/src/util/et/Makefile.in +++ b/src/util/et/Makefile.in @@ -7,9 +7,9 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) SED = sed ##DOS##BUILDTOP = ..\.. -##DOS##LIBNAME=comerr.lib +##DOS##LIBNAME=$(OUTPRE)comerr.lib ##DOS##XTRA= -##DOS##OBJFILE=comerr.lst +##DOS##OBJFILE=$(OUTPRE)comerr.lst STLIBOBJS=error_message.o et_name.o init_et.o com_err.o STOBJLISTS=OBJS.ST @@ -23,10 +23,10 @@ install-unix:: install-libs LINTFLAGS=-uhvb LINTFILES= error_message.c et_name.c init_et.c com_err.c -LIBOBJS=com_err.$(OBJEXT) \ - error_message.$(OBJEXT) \ - et_name.$(OBJEXT) \ - init_et.$(OBJEXT) +LIBOBJS=$(OUTPRE)com_err.$(OBJEXT) \ + $(OUTPRE)error_message.$(OBJEXT) \ + $(OUTPRE)et_name.$(OBJEXT) \ + $(OUTPRE)init_et.$(OBJEXT) # for et_lex.lex.c include in error_table.y LOCALINCLUDE=-I. -I$(srcdir) @@ -145,7 +145,7 @@ clean-files:: eddep makedep *.ln clean-windows:: - $(RM) comerr.lib comerr.bak + $(RM) $(OUTPRE)comerr.lib comerr.bak com_err.ps : com_err.dvi com_err.dvi: com_err.texinfo diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog index 4c3056aab..31bebbb9a 100644 --- a/src/util/profile/ChangeLog +++ b/src/util/profile/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:27:19 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + 1999-04-14 * prof_init.c (profile_abandon): New function which frees the diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in index 34b9b2e3e..1dc5ee026 100644 --- a/src/util/profile/Makefile.in +++ b/src/util/profile/Makefile.in @@ -5,8 +5,8 @@ BUILDTOP=$(REL)$(U)$(S)$(U) PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) ##DOS##BUILDTOP = ..\.. -##DOS##OBJFILE=profile.lst -##DOS##LIBNAME=profile.lib +##DOS##OBJFILE=$(OUTPRE)profile.lst +##DOS##LIBNAME=$(OUTPRE)profile.lib ##DOS##DOSDEFS=-DHAVE_STDLIB_H CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(DOSDEFS) @@ -22,13 +22,13 @@ STLIBOBJS = \ prof_err.o \ prof_init.o -OBJS = prof_tree.$(OBJEXT) \ - prof_file.$(OBJEXT) \ - prof_parse.$(OBJEXT) \ - prof_get.$(OBJEXT) \ - prof_set.$(OBJEXT) \ - prof_err.$(OBJEXT) \ - prof_init.$(OBJEXT) +OBJS = $(OUTPRE)prof_tree.$(OBJEXT) \ + $(OUTPRE)prof_file.$(OBJEXT) \ + $(OUTPRE)prof_parse.$(OBJEXT) \ + $(OUTPRE)prof_get.$(OBJEXT) \ + $(OUTPRE)prof_set.$(OBJEXT) \ + $(OUTPRE)prof_err.$(OBJEXT) \ + $(OUTPRE)prof_init.$(OBJEXT) SRCS = $(srcdir)/prof_tree.c \ $(srcdir)/prof_file.c \ @@ -82,11 +82,13 @@ test_profile: test_profile.$(OBJEXT) argv_parse.$(OBJEXT) $(OBJS) $(DEPLIBS) $(CC_LINK) -o test_profile test_profile.$(OBJEXT) \ argv_parse.$(OBJEXT) $(OBJS) $(MLIBS) -test_parse.exe: +# NEED TO FIX!! +$(OUTPRE)test_parse.exe: $(CC) $(CFLAGS2) -o test_parse.exe test_parse.c \ prof_parse.c prof_tree.c /link /stack:16384 -test_profile.exe: +# NEED TO FIX!! +$(OUTPRE)test_profile.exe: $(CC) $(CFLAGS2) -o test_profile.exe test_profile.c prof_init.c \ prof_file.c prof_parse.c prof_tree.c /link /stack:16384 @@ -104,11 +106,11 @@ clean-unix:: clean-libs clean-libobjs prof_err.c test_profile profile.h clean-windows:: - $(RM) profile.lib profile.bak test_parse.exe test_profile.exe + $(RM) $(OUTPRE)profile.lib profile.bak $(OUTPRE)test_parse.exe $(OUTPRE)test_profile.exe -check-windows:: test_profile.exe test_parse.exe - $(RM) *.obj - test_parse test.ini +check-windows:: $(OUTPRE)test_profile.exe $(OUTPRE)test_parse.exe + $(RM) $(OUTPRE)*.obj + $(OUTPRE)test_parse test.ini # +++ Dependency line eater +++ # diff --git a/src/util/windows/ChangeLog b/src/util/windows/ChangeLog index 0484dd08a..0b1a112df 100644 --- a/src/util/windows/ChangeLog +++ b/src/util/windows/ChangeLog @@ -1,3 +1,7 @@ +Mon May 10 15:27:34 1999 Danilo Almeida + + * Makefile.in: Do win32 build in subdir. + 1998-05-06 Theodore Ts'o * getopt.c (getopt): POSIX states that getopt returns -1 diff --git a/src/util/windows/Makefile.in b/src/util/windows/Makefile.in index d445f9364..a260600d4 100644 --- a/src/util/windows/Makefile.in +++ b/src/util/windows/Makefile.in @@ -5,12 +5,12 @@ CFLAGS = $(COPTS) $(INCLUDES) ##WIN16##LFLAGS = /nologo /nod /nopackcode ##WIN32##LFLAGS = /nologo /nod -##WIN32##all-windows:: libecho.exe getopt.obj +##WIN32##all-windows:: $(OUTPRE)libecho.exe $(OUTPRE)getopt.obj -libecho.exe: libecho.c +$(OUTPRE)libecho.exe: $(OUTPRE)libecho.obj + link -out:$@ $** install-windows:: clean-windows:: - $(RM) *.res *.map *.obj *.exe - + $(RM) $(OUTPRE)*.res $(OUTPRE)*.map $(OUTPRE)*.obj $(OUTPRE)*.exe 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 + + * Makefile.in: Do win32 build in subdir. + Tue Jan 5 01:38:18 1999 Theodore Y. Ts'o * 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 + + * 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 + + * Makefile.in: Do win32 build in subdir. + Tue Aug 5 18:45:35 1997 Theodore Y. Ts'o * 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 + + * Makefile.in: Do win32 build in subdir. + 1999-04-01 Theodore Ts'o * 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 + + * Makefile.in: Do win32 build in subdir. + Fri Feb 5 01:42:07 1999 Theodore Y. Ts'o * 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 -- 2.26.2