Author: nandika
Date: Wed Jan 23 22:14:38 2008
New Revision: 614801
URL: http://svn.apache.org/viewvc?rev=614801&view=rev
Log:
makefile updated
Modified:
webservices/sandesha/trunk/c/build/win32/configure.in
webservices/sandesha/trunk/c/build/win32/makefile
Modified: webservices/sandesha/trunk/c/build/win32/configure.in
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/build/win32/configure.in?rev=614801&r1=614800&r2=614801&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/build/win32/configure.in (original)
+++ webservices/sandesha/trunk/c/build/win32/configure.in Wed Jan 23 22:14:38
2008
@@ -6,5 +6,5 @@
#CRUNTIME Library (Use /MD or /MT )
CRUNTIME=/MD
# Visual Studio version
-VC_VERSION_2005_OR_ABOVE=1
+EMBED_MANIFEST=1
Modified: webservices/sandesha/trunk/c/build/win32/makefile
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/build/win32/makefile?rev=614801&r1=614800&r2=614801&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/build/win32/makefile (original)
+++ webservices/sandesha/trunk/c/build/win32/makefile Wed Jan 23 22:14:38 2008
@@ -36,7 +36,7 @@
!if "$(WITH_MYSQL)" == "1"
SANDESHA2_CODE = $(SANDESHA2_CODE) \
- $(SANDESHASRC)\src\storage\mysql\*.c
+ $(SANDESHASRC)\src\storage\mysql\*.c
CFLAGS = $(CFLAGS) /I$(MYSQL_BIN_DIR)\include
LDFLAGS = $(LDFLAGS) /LIBPATH:$(MYSQL_BIN_DIR)\lib\opt
LIBS =$(LIBS) libmysql.lib
@@ -55,7 +55,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
@@ -124,7 +124,7 @@
SANDESHA2_INTDIR1 = $(SANDESHA2_INTDIR)\src\core
SANDESHA2_INTDIR2 = $(SANDESHA2_INTDIR)\src\client
SANDESHA2_INTDIR3 = $(SANDESHA2_INTDIR)\src\storage\beans
-SANDESHA2_INTDIR4 = $(SANDESHA2_INTDIR)\src\storage\inmemory
+#SANDESHA2_INTDIR4 = $(SANDESHA2_INTDIR)\src\storage\inmemory
SANDESHA2_INTDIR5 = $(SANDESHA2_INTDIR)\src\storage\common
SANDESHA2_INTDIR6 = $(SANDESHA2_INTDIR)\src\transport
SANDESHA2_INTDIR7 = $(SANDESHA2_INTDIR)\src\polling
@@ -133,14 +133,13 @@
SANDESHA2_INTDIR10 = $(SANDESHA2_INTDIR)\src\util
SANDESHA2_INTDIR11 = $(SANDESHA2_INTDIR)\src\workers
SANDESHA2_INTDIR12 = $(SANDESHA2_INTDIR)\src\wsrm
-SANDESHA2_INTDIR13 = $(SANDESHA2_INTDIR)\src\storage\mysql
+#SANDESHA2_INTDIR13 = $(SANDESHA2_INTDIR)\src\storage\mysql
SANDESHA2_INTDIR14 = $(SANDESHA2_INTDIR)\src\storage\sqlite
SANDESHA2_OBJS = $(SANDESHA2_INTDIR1)\*.obj \
$(SANDESHA2_INTDIR2)\*.obj \
$(SANDESHA2_INTDIR3)\*.obj \
- $(SANDESHA2_INTDIR4)\*.obj \
$(SANDESHA2_INTDIR5)\*.obj \
$(SANDESHA2_INTDIR6)\*.obj \
$(SANDESHA2_INTDIR7)\*.obj \
@@ -162,8 +161,7 @@
$(SANDESHA2_INTDIR3) :
if not exist $(SANDESHA2_INTDIR3) mkdir $(SANDESHA2_INTDIR3)
-$(SANDESHA2_INTDIR4) :
- if not exist $(SANDESHA2_INTDIR4) mkdir $(SANDESHA2_INTDIR4)
+#$(SANDESHA2_INTDIR4) : if not exist $(SANDESHA2_INTDIR4) mkdir
$(SANDESHA2_INTDIR4)
$(SANDESHA2_INTDIR5) :
if not exist $(SANDESHA2_INTDIR5) mkdir $(SANDESHA2_INTDIR5)
@@ -189,8 +187,7 @@
$(SANDESHA2_INTDIR12) :
if not exist $(SANDESHA2_INTDIR12) mkdir $(SANDESHA2_INTDIR12)
-$(SANDESHA2_INTDIR13) :
- if not exist $(SANDESHA2_INTDIR13) mkdir $(SANDESHA2_INTDIR13)
+#$(SANDESHA2_INTDIR13) : if not exist $(SANDESHA2_INTDIR13) mkdir
$(SANDESHA2_INTDIR13)
$(SANDESHA2_INTDIR14) :
if not exist $(SANDESHA2_INTDIR14) mkdir $(SANDESHA2_INTDIR14)
@@ -205,8 +202,7 @@
{$(SANDESHA2_CODE)\storage\beans}.c{$(SANDESHA2_INTDIR3)}.obj ::
$(CC) $(CFLAGS) /Fo$(SANDESHA2_INTDIR3)\ /c $<
-{$(SANDESHA2_CODE)\storage\inmemory}.c{$(SANDESHA2_INTDIR4)}.obj ::
- $(CC) $(CFLAGS) /Fo$(SANDESHA2_INTDIR4)\ /c $<
+#{$(SANDESHA2_CODE)\storage\inmemory}.c{$(SANDESHA2_INTDIR4)}.obj :: $(CC)
$(CFLAGS) /Fo$(SANDESHA2_INTDIR4)\ /c $<
{$(SANDESHA2_CODE)\storage\common}.c{$(SANDESHA2_INTDIR5)}.obj ::
$(CC) $(CFLAGS) /Fo$(SANDESHA2_INTDIR5)\ /c $<
@@ -232,15 +228,14 @@
{$(SANDESHA2_CODE)\wsrm}.c{$(SANDESHA2_INTDIR12)}.obj ::
$(CC) $(CFLAGS) /Fo$(SANDESHA2_INTDIR12)\ /c $<
-{$(SANDESHA2_CODE)\storage\mysql}.c{$(SANDESHA2_INTDIR13)}.obj ::
- $(CC) $(CFLAGS) /Fo$(SANDESHA2_INTDIR13)\ /c $<
+#{$(SANDESHA2_CODE)\storage\mysql}.c{$(SANDESHA2_INTDIR13)}.obj :: $(CC)
$(CFLAGS) /Fo$(SANDESHA2_INTDIR13)\ /c $<
{$(SANDESHA2_CODE)\storage\sqlite}.c{$(SANDESHA2_INTDIR14)}.obj ::
$(CC) $(CFLAGS) /Fo$(SANDESHA2_INTDIR14)\ /c $<
!if "$(WITH_SQLITE)" == "1"
-$(SANDESHA2_OBJS) : $(SANDESHA2_INTDIR1) $(SANDESHA2_INTDIR2)
$(SANDESHA2_INTDIR3) $(SANDESHA2_INTDIR4) \
+$(SANDESHA2_OBJS) : $(SANDESHA2_INTDIR1) $(SANDESHA2_INTDIR2)
$(SANDESHA2_INTDIR3) \
$(SANDESHA2_INTDIR5) $(SANDESHA2_INTDIR6) $(SANDESHA2_INTDIR7)
$(SANDESHA2_INTDIR8) $(SANDESHA2_INTDIR9) \
$(SANDESHA2_INTDIR10) $(SANDESHA2_INTDIR11) $(SANDESHA2_INTDIR12)
$(SANDESHA2_INTDIR14)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
