Author: nandika
Date: Fri Jun 10 05:48:57 2011
New Revision: 1134195
URL: http://svn.apache.org/viewvc?rev=1134195&view=rev
Log:
makefile updated
Modified:
axis/axis2/c/core/trunk/build/win32/makefile
Modified: axis/axis2/c/core/trunk/build/win32/makefile
URL:
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/build/win32/makefile?rev=1134195&r1=1134194&r2=1134195&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/build/win32/makefile (original)
+++ axis/axis2/c/core/trunk/build/win32/makefile Fri Jun 10 05:48:57 2011
@@ -699,41 +699,54 @@ $(HTTP_SENDER_INTDIR5) :
!if "$(ENABLE_SSL)" == "1"
!if "$(ENABLE_LIBCURL)" == "1"
HTTP_SENDER_OBJS = $(HTTP_SENDER_OBJS) \
- $(HTTP_SENDER_INTDIR1)\*.obj \
- $(HTTP_SENDER_INTDIR2)\*.obj
+ $(HTTP_SENDER_INTDIR1)\*.obj \
+ $(HTTP_SENDER_INTDIR2)\*.obj
$(HTTP_SENDER_OBJS) : $(HTTP_SENDER_INTDIR) $(HTTP_SENDER_INTDIR1)
$(HTTP_SENDER_INTDIR2)
-!else
+!elseif "$(ENABLE_NTLM_WITH_HEIMDAL)" == "1"
HTTP_SENDER_OBJS = $(HTTP_SENDER_OBJS) \
- $(HTTP_SENDER_INTDIR1)\*.obj
+ $(HTTP_SENDER_INTDIR1)\*.obj \
+ $(HTTP_SENDER_INTDIR3)\*.obj \
+ $(HTTP_SENDER_INTDIR4)\*.obj
+$(HTTP_SENDER_OBJS) :$(HTTP_SENDER_INTDIR) $(HTTP_SENDER_INTDIR1)
$(HTTP_SENDER_INTDIR3) $(HTTP_SENDER_INTDIR4)
+!elseif "$(ENABLE_NTLM_WITH_LIBNTLM)" == "1"
+HTTP_SENDER_OBJS = $(HTTP_SENDER_OBJS) \
+ $(HTTP_SENDER_INTDIR1)\*.obj \
+ $(HTTP_SENDER_INTDIR3)\*.obj \
+ $(HTTP_SENDER_INTDIR5)\*.obj
+$(HTTP_SENDER_OBJS) :$(HTTP_SENDER_INTDIR) $(HTTP_SENDER_INTDIR1)
$(HTTP_SENDER_INTDIR3) $(HTTP_SENDER_INTDIR5)
+!else
+HTTP_SENDER_OBJS = $(HTTP_SENDER_OBJS) \
+ $(HTTP_SENDER_INTDIR1)\*.obj
$(HTTP_SENDER_OBJS) : $(HTTP_SENDER_INTDIR) $(HTTP_SENDER_INTDIR1)
!endif
-!elseif "$(ENABLE_LIBCURL)" == "1"
+!else
+!if "$(ENABLE_LIBCURL)" == "1"
HTTP_SENDER_OBJS = $(HTTP_SENDER_OBJS) \
- $(HTTP_SENDER_INTDIR2)\*.obj
-
+ $(HTTP_SENDER_INTDIR2)\*.obj
+
$(HTTP_SENDER_OBJS) : $(HTTP_SENDER_INTDIR) $(HTTP_SENDER_INTDIR2)
-!else
-$(HTTP_SENDER_OBJS) : $(HTTP_SENDER_INTDIR)
-!endif
-
-!if "$(ENABLE_NTLM_WITH_HEIMDAL)" == "1"
+!elseif "$(ENABLE_NTLM_WITH_HEIMDAL)" == "1"
HTTP_SENDER_OBJS = $(HTTP_SENDER_OBJS) \
- $(HTTP_SENDER_INTDIR3)\*.obj \
- $(HTTP_SENDER_INTDIR4)\*.obj
-
-$(HTTP_SENDER_OBJS) : $(HTTP_SENDER_INTDIR3) $(HTTP_SENDER_INTDIR4)
-!endif
+ $(HTTP_SENDER_INTDIR3)\*.obj \
+ $(HTTP_SENDER_INTDIR4)\*.obj
+$(HTTP_SENDER_OBJS) :$(HTTP_SENDER_INTDIR) $(HTTP_SENDER_INTDIR3)
$(HTTP_SENDER_INTDIR4)
+!elseif "$(ENABLE_NTLM_WITH_LIBNTLM)" == "1"
+HTTP_SENDER_OBJS = $(HTTP_SENDER_OBJS) \
+ $(HTTP_SENDER_INTDIR3)\*.obj \
+ $(HTTP_SENDER_INTDIR5)\*.obj
-!if "$(ENABLE_NTLM_WITH_LIBNTLM)" == "1"
+$(HTTP_SENDER_OBJS) :$(HTTP_SENDER_INTDIR) $(HTTP_SENDER_INTDIR3)
$(HTTP_SENDER_INTDIR5)
+!else
HTTP_SENDER_OBJS = $(HTTP_SENDER_OBJS) \
- $(HTTP_SENDER_INTDIR3)\*.obj \
- $(HTTP_SENDER_INTDIR5)\*.obj
+ $(HTTP_SENDER_INTDIR)\*.obj
-$(HTTP_SENDER_OBJS) : $(HTTP_SENDER_INTDIR3) $(HTTP_SENDER_INTDIR5)
+$(HTTP_SENDER_OBJS) : $(HTTP_SENDER_INTDIR)
!endif
+!endif
+
$(AXIS2_LIBS)\$(AXIS2_HTTP_SENDER).dll : $(HTTP_SENDER_OBJS)
$(LD) $(LDFLAGS) $(HTTP_SENDER_OBJS) $(AXUTIL).lib \
