Author: nandika
Date: Mon Dec 10 04:10:17 2007
New Revision: 602880
URL: http://svn.apache.org/viewvc?rev=602880&view=rev
Log:
makefile and configure.in file updated
Modified:
webservices/axis2/trunk/c/build/win32/configure.in
webservices/axis2/trunk/c/build/win32/makefile
Modified: webservices/axis2/trunk/c/build/win32/configure.in
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/c/build/win32/configure.in?rev=602880&r1=602879&r2=602880&view=diff
==============================================================================
--- webservices/axis2/trunk/c/build/win32/configure.in (original)
+++ webservices/axis2/trunk/c/build/win32/configure.in Mon Dec 10 04:10:17 2007
@@ -6,6 +6,8 @@
ENABLE_GUTHTHILA = 0
# build tcp server in addition to http server
WITH_TCP= 0
+# build with archive based deployment
+WITH_ARCHIVE = 1
# libxml2 binary location ( axis2c is built with libxml2 )
LIBXML2_BIN_DIR = E:\libxml2-2.6.27.win32
# iconv binary location
@@ -22,8 +24,8 @@
LIBCURL_BIN_DIR = E:\libcurl-7.15.1-msvc-win32-ssl-0.9.8a-zlib-1.2.3
#C runtime LIBRARY OPTION ( Use /MD or /MT )
CRUNTIME=/MD
-# Visual Studio version
-VC_VERSION_2005_OR_ABOVE=1
+# Embed Manifest Files
+EMBED_MANIFEST = 1
#debug symbols
DEBUG=1
# To use apache 2.2 family , use APACHE_VERSION_IS_2_0_X = 0
Modified: webservices/axis2/trunk/c/build/win32/makefile
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/c/build/win32/makefile?rev=602880&r1=602879&r2=602880&view=diff
==============================================================================
--- webservices/axis2/trunk/c/build/win32/makefile (original)
+++ webservices/axis2/trunk/c/build/win32/makefile Mon Dec 10 04:10:17 2007
@@ -107,9 +107,12 @@
/I$(AXIS2_SOURCE_DIR)\axiom\src\attachments \
/I$(AXIS2_SOURCE_DIR)\tools\tcpmon\include \
/I$(LIBXML2_BIN_DIR)\include \
- /I$(ICONV_BIN_DIR)\include \
- /I$(ZLIB_BIN_DIR)\include
+ /I$(ICONV_BIN_DIR)\include
+!if "$(WITH_ARCHIVE)" == "1"
+AXIS2_INCLUDE_PATH = $(AXIS2_INCLUDE_PATH) /I$(ZLIB_BIN_DIR)\include
+!endif
+
GUTHTHILA_INCLUDE_PATH = /I$(AXIS2_SOURCE_DIR)\guththila\include
!if "$(ENABLE_SSL)" == "1"
@@ -163,7 +166,7 @@
MT=mt.exe
MT="$(MT)"
-!if "$(VC_VERSION_2005_OR_ABOVE)" == "0"
+!if "$(EMBED_MANIFEST)" == "0"
_VC_MANIFEST_EMBED_EXE=
_VC_MANIFEST_EMBED_DLL=
!else
@@ -210,9 +213,13 @@
AXIS2_INTDIR_AXUTIL2 =$(AXIS2_INTDIR_AXUTIL)\minizip
AXUTIL_OBJS = $(AXIS2_INTDIR_AXUTIL)\*.obj \
- $(AXIS2_INTDIR_AXUTIL)\minizip\*.obj \
$(AXIS2_INTDIR_AXUTIL)\platform\*.obj
+
+!if "$(WITH_ARCHIVE)" == "1"
+AXUTIL_OBJS = $(AXUTIL_OBJS) $(AXIS2_INTDIR_AXUTIL)\minizip\*.obj
+!endif
+
$(AXIS2_INTDIR_AXUTIL) :
@if not exist $(AXIS2_INTDIR_AXUTIL) mkdir $(AXIS2_INTDIR_AXUTIL)
@@ -229,6 +236,8 @@
{$(AXUTIL_SRC)\platforms\windows}.c{$(AXIS2_INTDIR_AXUTIL1)}.obj ::
$(CC) $(CFLAGS) /Fo$(AXIS2_INTDIR_AXUTIL1)\ /c $<
+
+!if "$(WITH_ARCHIVE)" == "1"
{$(AXUTIL_SRC)\minizip}.c{$(AXIS2_INTDIR_AXUTIL2)}.obj ::
$(CC) $(CFLAGS) /Fo$(AXIS2_INTDIR_AXUTIL2)\ /c $<
@@ -238,6 +247,17 @@
$(LD) $(LDFLAGS) $(AXUTIL_OBJS) $(LIBS) $(ZLIB_BIN_DIR)\lib\zdll.lib \
/DLL /OUT:$(AXIS2_LIBS)\$(AXUTIL).dll
/IMPLIB:$(AXIS2_LIBS)\$(AXUTIL).lib
[EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL)
+
+!else
+
+$(AXUTIL_OBJS) : $(AXIS2_INTDIR_AXUTIL) $(AXIS2_INTDIR_AXUTIL1)
+
+$(AXIS2_LIBS)\$(AXUTIL).dll : $(AXUTIL_OBJS)
+ $(LD) $(LDFLAGS) $(AXUTIL_OBJS) $(LIBS) /DLL
/OUT:$(AXIS2_LIBS)\$(AXUTIL).dll \
+ /IMPLIB:$(AXIS2_LIBS)\$(AXUTIL).lib
+ [EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL)
+
+!endif
axis2_util : $(AXIS2_LIBS)\$(AXUTIL).dll
##### end axutil
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
