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

diff --git a/src/config/win-post.in b/src/config/win-post.in
index a410d36314e8f73326338b7ebfa57d26be53c2d1..dbbc08301fcbcdee7c96ba26bcdd98273f2456a9 100644 (file)
--- 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 e80c9fd6fa981c37b13b3ab6d20e04f290ff3619..c2369ae5242199a96d7c0e547b23150aa499628f 100644 (file)
--- 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)