diff options
author | Theodore Tso <tytso@mit.edu> | 1999-03-23 22:24:29 +0000 |
---|---|---|
committer | Theodore Tso <tytso@mit.edu> | 1999-03-23 22:24:29 +0000 |
commit | 4ce5d8382ce9b9e8e248f50e9fb2dcbe85a75bd0 (patch) | |
tree | 29cc359b549c770a486644bb2f26a6d529279d5c /src/config | |
parent | 27861765b36380e2e52a94c7e417af5e8b78c2fa (diff) | |
download | krb5-4ce5d8382ce9b9e8e248f50e9fb2dcbe85a75bd0.tar.gz krb5-4ce5d8382ce9b9e8e248f50e9fb2dcbe85a75bd0.tar.xz krb5-4ce5d8382ce9b9e8e248f50e9fb2dcbe85a75bd0.zip |
Move the definition of DLL_DEF_FILE from windows.in to win-post.in, so that
the base Makefile has a chance to set DLL_EXP_TYPE.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11304 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/config')
-rw-r--r-- | src/config/win-post.in | 10 | ||||
-rw-r--r-- | src/config/windows.in | 9 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/config/win-post.in b/src/config/win-post.in index a410d3631..dbbc08301 100644 --- a/src/config/win-post.in +++ b/src/config/win-post.in @@ -3,6 +3,16 @@ # all:: +# +# 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=/D$(DLL_EXP_TYPE)_DLL_FILE +!else +DLL_FILE_DEF=/DKRB5_DLL_FILE +!endif + # Build the Makefile unless we are in the top-level #(where there is already an explicit rule). !if !defined(ZIP) && !defined(WINFILES) diff --git a/src/config/windows.in b/src/config/windows.in index e80c9fd6f..c2369ae52 100644 --- a/src/config/windows.in +++ b/src/config/windows.in @@ -33,15 +33,6 @@ 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=/D$(DLL_EXP_TYPE)_DLL_FILE -!else -DLL_FILE_DEF=/DKRB5_DLL_FILE -!endif -# # CCOPTS for DLL functions # ##WIN16##CCOPTS=/ALw /Zp /GD2s /Os /Zi /Od /W3 /Ld $(XTRA) $(DLL_FILE_DEF) |