Author: nandika
Date: Sun Oct 28 23:47:57 2007
New Revision: 589524
URL: http://svn.apache.org/viewvc?rev=589524&view=rev
Log:
savan makefile and configure.in file updated to embed the manifest file
Modified:
webservices/savan/trunk/c/build/win32/configure.in
webservices/savan/trunk/c/build/win32/makefile
Modified: webservices/savan/trunk/c/build/win32/configure.in
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/build/win32/configure.in?rev=589524&r1=589523&r2=589524&view=diff
==============================================================================
--- webservices/savan/trunk/c/build/win32/configure.in (original)
+++ webservices/savan/trunk/c/build/win32/configure.in Sun Oct 28 23:47:57 2007
@@ -2,3 +2,8 @@
AXIS2_BIN_DIR = E:\axis2c\build\axis2c-bin-1.1.0-win32
# CRUNTIME library ( Use /MD or /MT )
CRUNTIME=/MD
+# Visual Studio Version
+VC_VERSION_2005_OR_ABOVE=1
+#Debug Symbols
+DEBUG =0
+
Modified: webservices/savan/trunk/c/build/win32/makefile
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/build/win32/makefile?rev=589524&r1=589523&r2=589524&view=diff
==============================================================================
--- webservices/savan/trunk/c/build/win32/makefile (original)
+++ webservices/savan/trunk/c/build/win32/makefile Sun Oct 28 23:47:57 2007
@@ -44,6 +44,19 @@
LDFLAGS = $(LDFLAGS)
!endif
+##############
+MT=mt.exe
+MT="$(MT)"
+
+!if "$(VC_VERSION_2005_OR_ABOVE)" == "0"
+_VC_MANIFEST_EMBED_EXE=
+_VC_MANIFEST_EMBED_DLL=
+!else
+_VC_MANIFEST_EMBED_EXE= if exist [EMAIL PROTECTED] $(MT) -nologo -manifest
[EMAIL PROTECTED] -outputresource:$@;1
+_VC_MANIFEST_EMBED_DLL= if exist [EMAIL PROTECTED] $(MT) -nologo -manifest
[EMAIL PROTECTED] -outputresource:$@;2
+!endif
+###############
+
#create the directory structure
distdir:
@@ -89,47 +102,66 @@
copy_include:
@xcopy /E $(SAVANSRC)\include $(SAVANDISTDIR)\include
-savan:
+$(SAVANDISTDIR)\modules\savan\$(SAVANDLL).dll:
$(CC) $(CFLAGS) $(SAVAN_CODE) /Fo$(SAVANINTDIR)\ /c
$(LD) $(LDFLAGS) $(LIBS) $(SAVANINTDIR)\*.obj /DLL \
/OUT:$(SAVANDISTDIR)\modules\savan\$(SAVANDLL).dll
/IMPLIB:$(SAVANDISTDIR)\modules\savan\$(SAVANDLL).lib
+ [EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL)
@copy $(SAVANSRC)\src\data\module.xml
$(SAVANDISTDIR)\modules\savan\module.xml
+savan: $(SAVANDISTDIR)\modules\savan\$(SAVANDLL).dll
+
##### savan client
SAVAN_CLIENT_SRC = $(SAVANSRC)\src\client\*.c \
$(SAVANSRC)\src\util\*.c \
$(SAVANSRC)\src\subscribers\*.c
-savan_client:
+$(SAVANDISTDIR)\lib\$(SAVAN_CLIENT).dll :
if not exist $(SAVANINTDIR)\client mkdir $(SAVANINTDIR)\client
$(CC) $(CFLAGS) $(SAVAN_CLIENT_SRC) /Fo$(SAVANINTDIR)\client\ /c
$(LD) $(LDFLAGS) $(LIBS) $(SAVANINTDIR)\client\*.obj /DLL \
/OUT:$(SAVANDISTDIR)\lib\$(SAVAN_CLIENT).dll
/IMPLIB:$(SAVANDISTDIR)\lib\$(SAVAN_CLIENT).lib
+ [EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL)
+
+savan_client: $(SAVANDISTDIR)\lib\$(SAVAN_CLIENT).dll
+
###samples
-subscription:
+$(SAVANDISTDIR)\services\subscription\subscription.dll :
$(CC) $(CFLAGS) $(SAVANSRC)\src\subs_mgr\*.c
/Fo$(SAVANINTDIR)\samples\subscription\ /c
$(LD) $(LDFLAGS) $(LIBS) $(SAVANINTDIR)\samples\subscription\*.obj
$(SAVAN_CLIENT).lib /DLL \
/OUT:$(SAVANDISTDIR)\services\subscription\subscription.dll
+ [EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL)
@copy $(SAVANSRC)\src\subs_mgr\services.xml
$(SAVANDISTDIR)\services\subscription\
-publisher:
+subscription: $(SAVANDISTDIR)\services\subscription\subscription.dll
+
+$(SAVANDISTDIR)\services\publisher\publisher.dll :
$(CC) $(CFLAGS) $(SAVANSRC)\samples\server\publisher\*.c
/Fo$(SAVANINTDIR)\samples\publisher\ /c
$(LD) $(LDFLAGS) $(LIBS) $(SAVANINTDIR)\samples\publisher\*.obj
$(SAVAN_CLIENT).lib /DLL \
/OUT:$(SAVANDISTDIR)\services\publisher\publisher.dll
+ [EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL)
@copy $(SAVANSRC)\samples\server\publisher\services.xml
$(SAVANDISTDIR)\services\publisher\
-listener:
+publisher: $(SAVANDISTDIR)\services\publisher\publisher.dll
+
+$(SAVANDISTDIR)\services\listener\listener.dll :
$(CC) $(CFLAGS) $(SAVANSRC)\samples\server\listener\*.c
/Fo$(SAVANINTDIR)\samples\listener\ /c
$(LD) $(LDFLAGS) $(LIBS) $(SAVANINTDIR)\samples\listener\*.obj
$(SAVAN_CLIENT).lib /DLL \
/OUT:$(SAVANDISTDIR)\services\listener\listener.dll
+ [EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL)
@copy $(SAVANSRC)\samples\server\listener\services.xml
$(SAVANDISTDIR)\services\listener\
-subscriber:
+listener: $(SAVANDISTDIR)\services\listener\listener.dll
+
+$(SAVANDISTDIR)\bin\samples\savan\subscriber.exe :
$(CC) $(CFLAGS) $(SAVANSRC)\samples\client\subscriber\*.c
/Fo$(SAVANINTDIR)\samples\subscriber\ /c
$(LD) $(LDFLAGS) $(LIBS) $(SAVANINTDIR)\samples\subscriber\*.obj
$(SAVAN_CLIENT).lib \
/OUT:$(SAVANDISTDIR)\bin\samples\savan\subscriber.exe
+ [EMAIL PROTECTED](_VC_MANIFEST_EMBED_EXE)
+
+subscriber: $(SAVANDISTDIR)\bin\samples\savan\subscriber.exe
dist: clean distdir intdir savan savan_client publisher listener subscription
subscriber copy_include copy_samples copy_extra
