You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by da...@apache.org on 2007/04/26 18:35:55 UTC
svn commit: r532796 - in /webservices/sandesha/trunk/c: ./
samples/rm_echo_1_0/ samples/rm_echo_1_1/ samples/rm_echo_single_1_0/
samples/rm_echo_single_1_1/ samples/rm_mtom_1_0/ samples/rm_ping_1_0/
samples/rm_ping_1_1/ samples/rm_report/ src/core/
Author: damitha
Date: Thu Apr 26 09:35:54 2007
New Revision: 532796
URL: http://svn.apache.org/viewvc?view=rev&rev=532796
Log:
updated the build files
Modified:
webservices/sandesha/trunk/c/INSTALL
webservices/sandesha/trunk/c/Makefile.am
webservices/sandesha/trunk/c/autogen.sh
webservices/sandesha/trunk/c/build.sh
webservices/sandesha/trunk/c/configure.ac
webservices/sandesha/trunk/c/samples/rm_echo_1_0/Makefile.am
webservices/sandesha/trunk/c/samples/rm_echo_1_1/Makefile.am
webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/Makefile.am
webservices/sandesha/trunk/c/samples/rm_echo_single_1_1/Makefile.am
webservices/sandesha/trunk/c/samples/rm_mtom_1_0/Makefile.am
webservices/sandesha/trunk/c/samples/rm_ping_1_0/Makefile.am
webservices/sandesha/trunk/c/samples/rm_ping_1_1/Makefile.am
webservices/sandesha/trunk/c/samples/rm_report/Makefile.am
webservices/sandesha/trunk/c/src/core/Makefile.am
Modified: webservices/sandesha/trunk/c/INSTALL
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/INSTALL?view=diff&rev=532796&r1=532795&r2=532796
==============================================================================
--- webservices/sandesha/trunk/c/INSTALL (original)
+++ webservices/sandesha/trunk/c/INSTALL Thu Apr 26 09:35:54 2007
@@ -2,12 +2,12 @@
=================
1. Getting Sandesha2C working with the source release on Linux
- - This version of Sandesha2C depends on Axis2C 0.95
+ - This version of Sandesha2C depends on Axis2C 1.0
- Download Axis2C from http://ws.apache.org/axis2/c/download.cgi and
install.
- Go to Sandesha2C source directory
- Run configure with AXIS2 include path.
- ./configure --prefix=<install_dir> --enable-static=no --with-axis2=<axis2_install_path>
+ ./configure --prefix=<axis2c_install_path>/modules --enable-static=no --with-axis2=<axis2c_install_path>
- Run make and make install
Note: 1.
Modified: webservices/sandesha/trunk/c/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/Makefile.am?view=diff&rev=532796&r1=532795&r2=532796
==============================================================================
--- webservices/sandesha/trunk/c/Makefile.am (original)
+++ webservices/sandesha/trunk/c/Makefile.am Thu Apr 26 09:35:54 2007
@@ -1,5 +1,5 @@
-datadir=$(prefix)/sandesha2
-SUBDIRS = src
+datadir=$(prefix)/modules/sandesha2
+SUBDIRS = src samples
data_DATA = LICENSE config/module.xml \
include/sandesha2_client_constants.h \
include/sandesha2_constants.h \
Modified: webservices/sandesha/trunk/c/autogen.sh
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/autogen.sh?view=diff&rev=532796&r1=532795&r2=532796
==============================================================================
--- webservices/sandesha/trunk/c/autogen.sh (original)
+++ webservices/sandesha/trunk/c/autogen.sh Thu Apr 26 09:35:54 2007
@@ -40,3 +40,7 @@
fi
echo 'done'
+
+cd samples
+./autogen.sh
+cd ..
Modified: webservices/sandesha/trunk/c/build.sh
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/build.sh?view=diff&rev=532796&r1=532795&r2=532796
==============================================================================
--- webservices/sandesha/trunk/c/build.sh (original)
+++ webservices/sandesha/trunk/c/build.sh Thu Apr 26 09:35:54 2007
@@ -1,5 +1,5 @@
#!/bin/bash
./autogen.sh
-./configure --prefix=${AXIS2C_HOME}/modules --enable-static=no --with-axis2=${AXIS2C_HOME}/include/axis2-1.0
+./configure --prefix=${AXIS2C_HOME} --enable-static=no --with-axis2=${AXIS2C_HOME}/include/axis2-1.0
make
make install
Modified: webservices/sandesha/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/configure.ac?view=diff&rev=532796&r1=532795&r2=532796
==============================================================================
--- webservices/sandesha/trunk/c/configure.ac (original)
+++ webservices/sandesha/trunk/c/configure.ac Thu Apr 26 09:35:54 2007
@@ -81,14 +81,14 @@
else
AC_MSG_ERROR(could not find sqliteinc. stop)
fi
- MYSQL_LIBS="$srcdir/storage/sqlite"
WRAPPER_DIR="sqlite"
+ LDFLAGS="$LDFLAGS -lsqlite3"
;;
esac ],
AC_MSG_RESULT(yes)
- MYSQL_LIBS="$srcdir/storage/sqlite"
WRAPPER_DIR="sqlite"
sqliteinc="-I/usr/include"
+ LDFLAGS="$LDFLAGS -lsqlite3"
)
AC_MSG_CHECKING(path to use mysql storage .)
@@ -111,13 +111,15 @@
else
AC_MSG_ERROR(could not find mysqlinc. stop)
fi
- MYSQL_LIBS="$srcdir/storage/mysql"
WRAPPER_DIR="mysql"
+ LDFLAGS="$LDFLAGS -lmysqlclient -lnsl -lm -lz"
;;
esac ],
AC_MSG_RESULT(no)
)
+AC_CONFIG_SUBDIRS(samples)
+
AXIS2INC=$axis2inc
MYSQLINC=$mysqlinc
SQLITEINC=$sqliteinc
@@ -128,8 +130,6 @@
AC_SUBST(AXIOMINC)
AC_SUBST(UTILINC)
AC_SUBST(WRAPPER_DIR)
-AC_SUBST(MYSQL_LIBS)
-AC_SUBST(SQLITE_LIBS)
AC_CONFIG_FILES([Makefile \
src/Makefile \
Modified: webservices/sandesha/trunk/c/samples/rm_echo_1_0/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_1_0/Makefile.am?view=diff&rev=532796&r1=532795&r2=532796
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_1_0/Makefile.am (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_1_0/Makefile.am Thu Apr 26 09:35:54 2007
@@ -13,14 +13,12 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- -L$(AXIS2C_HOME)/modules/sandesha2 \
- -lsandesha2_client \
- -lsandesha2 \
- -lsqlite3 \
+ ../../src/client/libsandesha2_client.la \
+ ../../src/core/libsandesha2.la \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.0 \
- -I$(AXIS2C_HOME)/modules/sandesha2 \
+ -I../../include \
@UTILINC@ \
@AXIOMINC@
Modified: webservices/sandesha/trunk/c/samples/rm_echo_1_1/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_1_1/Makefile.am?view=diff&rev=532796&r1=532795&r2=532796
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_1_1/Makefile.am (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_1_1/Makefile.am Thu Apr 26 09:35:54 2007
@@ -13,14 +13,12 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- -L$(AXIS2C_HOME)/modules/sandesha2 \
- -lsandesha2_client \
- -lsandesha2 \
- -lsqlite3 \
+ ../../src/client/libsandesha2_client.la \
+ ../../src/core/libsandesha2.la \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.0 \
- -I$(AXIS2C_HOME)/modules/sandesha2 \
+ -I../../include \
@UTILINC@ \
@AXIOMINC@
Modified: webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/Makefile.am?view=diff&rev=532796&r1=532795&r2=532796
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/Makefile.am (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/Makefile.am Thu Apr 26 09:35:54 2007
@@ -13,15 +13,12 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- -L$(AXIS2C_HOME)/modules/sandesha2 \
- -lsandesha2_client \
- -lsandesha2 \
- -lsqlite3 \
- -lmysqlclient -lnsl -lm -lz \
+ ../../src/client/libsandesha2_client.la \
+ ../../src/core/libsandesha2.la \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.0 \
- -I$(AXIS2C_HOME)/modules/sandesha2 \
+ -I../../include \
@UTILINC@ \
@AXIOMINC@
Modified: webservices/sandesha/trunk/c/samples/rm_echo_single_1_1/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_single_1_1/Makefile.am?view=diff&rev=532796&r1=532795&r2=532796
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_single_1_1/Makefile.am (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_single_1_1/Makefile.am Thu Apr 26 09:35:54 2007
@@ -13,14 +13,12 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- -L$(AXIS2C_HOME)/modules/sandesha2 \
- -lsandesha2_client \
- -lsandesha2 \
- -lsqlite3 \
+ ../../src/client/libsandesha2_client.la \
+ ../../src/core/libsandesha2.la \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.0 \
- -I$(AXIS2C_HOME)/modules/sandesha2 \
+ -I../../include \
@UTILINC@ \
@AXIOMINC@
Modified: webservices/sandesha/trunk/c/samples/rm_mtom_1_0/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_mtom_1_0/Makefile.am?view=diff&rev=532796&r1=532795&r2=532796
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_mtom_1_0/Makefile.am (original)
+++ webservices/sandesha/trunk/c/samples/rm_mtom_1_0/Makefile.am Thu Apr 26 09:35:54 2007
@@ -13,14 +13,12 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- -L$(AXIS2C_HOME)/modules/sandesha2 \
- -lsandesha2_client \
- -lsandesha2 \
- -lsqlite3 \
+ ../../src/client/libsandesha2_client.la \
+ ../../src/core/libsandesha2.la \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.0 \
- -I$(AXIS2C_HOME)/modules/sandesha2 \
+ -I../../include \
@UTILINC@ \
@AXIOMINC@
Modified: webservices/sandesha/trunk/c/samples/rm_ping_1_0/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_ping_1_0/Makefile.am?view=diff&rev=532796&r1=532795&r2=532796
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_ping_1_0/Makefile.am (original)
+++ webservices/sandesha/trunk/c/samples/rm_ping_1_0/Makefile.am Thu Apr 26 09:35:54 2007
@@ -13,11 +13,10 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- -lsqlite3 \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.0 \
- -I$(AXIS2C_HOME)/modules/sandesha2 \
+ -I../../include \
@UTILINC@ \
@AXIOMINC@
Modified: webservices/sandesha/trunk/c/samples/rm_ping_1_1/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_ping_1_1/Makefile.am?view=diff&rev=532796&r1=532795&r2=532796
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_ping_1_1/Makefile.am (original)
+++ webservices/sandesha/trunk/c/samples/rm_ping_1_1/Makefile.am Thu Apr 26 09:35:54 2007
@@ -13,14 +13,12 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- -L$(AXIS2C_HOME)/modules/sandesha2 \
- -lsandesha2_client \
- -lsandesha2 \
- -lsqlite3 \
+ ../../src/client/libsandesha2_client.la \
+ ../../src/core/libsandesha2.la \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.0 \
- -I$(AXIS2C_HOME)/modules/sandesha2 \
+ -I../../include \
@UTILINC@ \
@AXIOMINC@
Modified: webservices/sandesha/trunk/c/samples/rm_report/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_report/Makefile.am?view=diff&rev=532796&r1=532795&r2=532796
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_report/Makefile.am (original)
+++ webservices/sandesha/trunk/c/samples/rm_report/Makefile.am Thu Apr 26 09:35:54 2007
@@ -13,14 +13,12 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- -L$(AXIS2C_HOME)/modules/sandesha2 \
- -lsandesha2_client \
- -lsandesha2 \
- -lsqlite3 \
+ ../../src/client/libsandesha2_client.la \
+ ../../src/core/libsandesha2.la \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.0 \
- -I$(AXIS2C_HOME)/modules/sandesha2 \
+ -I../../include \
@UTILINC@ \
@AXIOMINC@
Modified: webservices/sandesha/trunk/c/src/core/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/Makefile.am?view=diff&rev=532796&r1=532795&r2=532796
==============================================================================
--- webservices/sandesha/trunk/c/src/core/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/core/Makefile.am Thu Apr 26 09:35:54 2007
@@ -1,4 +1,4 @@
-prglibdir=$(prefix)/sandesha2
+prglibdir=$(prefix)/modules/sandesha2
prglib_LTLIBRARIES = libsandesha2.la
libsandesha2_la_SOURCES = sandesha2_msg_ctx.c\
@@ -18,8 +18,6 @@
../util/libsandesha_util.la\
../workers/libsandesha2_workers.la\
../wsrm/libsandesha2_wsrm.la \
- ../polling/libsandesha2_polling.la \
- -lsqlite3 \
- -lmysqlclient -lnsl -lm -lz
+ ../polling/libsandesha2_polling.la
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org