diff options
| author |  nandika | 2011-06-10 05:48:57 +0000 |
|---|---|---|
| committer | nandika | 2011-06-10 05:48:57 +0000 |
| commit | 076d21f34a45c42de463811820312fbbf7c9b2e8 (patch) | |
| tree | cdb1608592f396999e33d32c381a06cf3932bb74 | |
| parent | 835a66d01d6fab9fc52ce002fff63cff1f289d8b (diff) | |
| download | axis2c-076d21f34a45c42de463811820312fbbf7c9b2e8.tar.gz axis2c-076d21f34a45c42de463811820312fbbf7c9b2e8.tar.bz2 | |
makefile updated
git-svn-id: http://svn.apache.org/repos/asf/axis/axis2/c/core/trunk@1134195 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | build/win32/makefile | 55 |
1 files changed, 34 insertions, 21 deletions
diff --git a/build/win32/makefile b/build/win32/makefile index ebfcc3e..714b990 100644 --- a/build/win32/makefile +++ b/build/win32/makefile @@ -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 \
|