diff options
| author | Theodore Tso <tytso@mit.edu> | 1999-03-12 00:04:10 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1999-03-12 00:04:10 +0000 |
| commit | 88df3f321b21c20134a013d786ef90ef3cdb438c (patch) | |
| tree | 8bc512811298dffb07d10736d139aaacbf8162be /src | |
| parent | 054fb854091970400ade1460e5e0be317821df58 (diff) | |
| download | krb5-88df3f321b21c20134a013d786ef90ef3cdb438c.tar.gz krb5-88df3f321b21c20134a013d786ef90ef3cdb438c.tar.xz krb5-88df3f321b21c20134a013d786ef90ef3cdb438c.zip | |
windows.in (DLL_FILE_DEF): Add makefile controls to set either
KRB5_DLL_FILE or GSS_DLL_FILE, with the default being
KRB5_DLL_FILE.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11264 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/ChangeLog | 6 | ||||
| -rw-r--r-- | src/config/windows.in | 15 |
2 files changed, 19 insertions, 2 deletions
diff --git a/src/config/ChangeLog b/src/config/ChangeLog index 705501cffb..16d8d8caf5 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,3 +1,9 @@ +1999-02-19 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * windows.in (DLL_FILE_DEF): Add makefile controls to set either + KRB5_DLL_FILE or GSS_DLL_FILE, with the default being + KRB5_DLL_FILE. + Mon Feb 8 22:13:23 1999 Theodore Y. Ts'o <tytso@mit.edu> * winexclude.sed: Add .dll and .lib files to the list of functions diff --git a/src/config/windows.in b/src/config/windows.in index 34736dccf3..a768aff00b 100644 --- a/src/config/windows.in +++ b/src/config/windows.in @@ -33,10 +33,19 @@ SRCTOP = $(srcdir)\$(BUILDTOP) CC=cl /nologo CL= # +# Set the #define to indicate that we are compiling a DLL. We default to +# compiling the Kerberos library +# +!if defined(DLL_EXP_TYPE) +DLL_FILE_DEF=/DKRB5_DLL_FILE +!else +DLL_FILE_DEF=/D$(DLL_EXP_TYPE)_DLL_FILE +!endif +# # CCOPTS for DLL functions # -##WIN16##CCOPTS=/ALw /Zp /GD2s /Os /Zi /Od /W3 /Ld $(XTRA) /DKRB5_DLL_FILE -##WIN32##CCOPTS=/Os /Zi /Od /W3 /MD $(XTRA) -DKRB5_DLL_FILE +##WIN16##CCOPTS=/ALw /Zp /GD2s /Os /Zi /Od /W3 /Ld $(XTRA) $(DLL_FILE_DEF) +##WIN32##CCOPTS=/Os /Zi /Od /W3 /MD $(XTRA) $(DLL_FILE_DEF) # # CCOPTS for non-DLL compiles # @@ -77,6 +86,8 @@ CVTRES = cvtres ##WIN16##CLIB=$(BUILDTOP)\lib\comerr16.lib ##WIN32##CLIB=$(BUILDTOP)\lib\comerr32.lib +##WIN16##PLIB=$(BUILDTOP)\lib\xpprof16.lib +##WIN32##PLIB=$(BUILDTOP)\lib\xpprof32.lib ##WIN16##KLIB=$(BUILDTOP)\lib\krb5_16.lib ##WIN32##KLIB=$(BUILDTOP)\lib\krb5_32.lib ##WIN16##GLIB=$(BUILDTOP)\lib\gssapi.lib |