axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r696915 - in /webservices/axis2/trunk/c: ./ src/core/transport/amqp/ src/core/transport/amqp/receiver/ src/core/transport/amqp/receiver/qpid_receiver/ src/core/transport/amqp/receiver/qpid_receiver/request_processor/ src/core/transport/amqp...
Date Fri, 19 Sep 2008 04:12:05 GMT
Author: damitha
Date: Thu Sep 18 21:12:05 2008
New Revision: 696915

URL: http://svn.apache.org/viewvc?rev=696915&view=rev
Log:
Makefile.am's in amqp transport has repeated entries. automake complains about this. Corrected
this.

Modified:
    webservices/axis2/trunk/c/configure.ac
    webservices/axis2/trunk/c/src/core/transport/amqp/Makefile.am
    webservices/axis2/trunk/c/src/core/transport/amqp/receiver/Makefile.am
    webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am
    webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am
    webservices/axis2/trunk/c/src/core/transport/amqp/sender/Makefile.am
    webservices/axis2/trunk/c/src/core/transport/amqp/sender/qpid_sender/Makefile.am
    webservices/axis2/trunk/c/src/core/transport/amqp/server/Makefile.am
    webservices/axis2/trunk/c/src/core/transport/amqp/server/axis2_amqp_server/Makefile.am
    webservices/axis2/trunk/c/src/core/transport/amqp/util/Makefile.am

Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/configure.ac?rev=696915&r1=696914&r2=696915&view=diff
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Thu Sep 18 21:12:05 2008
@@ -446,7 +446,6 @@
     src/core/transport/http/sender/libcurl/Makefile \
     src/core/transport/http/receiver/Makefile \
     src/core/transport/http/server/simple_axis2_server/Makefile \
-	src/core/transport/http/server/CGI/Makefile \
     src/core/transport/http/server/Makefile \
     src/core/transport/http/server/apache2/Makefile \
     src/core/transport/tcp/Makefile \

Modified: webservices/axis2/trunk/c/src/core/transport/amqp/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/amqp/Makefile.am?rev=696915&r1=696914&r2=696915&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/amqp/Makefile.am (original)
+++ webservices/axis2/trunk/c/src/core/transport/amqp/Makefile.am Thu Sep 18 21:12:05 2008
@@ -2,7 +2,3 @@
 		  receiver \
 		  server \
 		  sender
-SUBDIRS = util \
-		  receiver \
-		  server \
-		  sender

Modified: webservices/axis2/trunk/c/src/core/transport/amqp/receiver/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/amqp/receiver/Makefile.am?rev=696915&r1=696914&r2=696915&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/amqp/receiver/Makefile.am (original)
+++ webservices/axis2/trunk/c/src/core/transport/amqp/receiver/Makefile.am Thu Sep 18 21:12:05
2008
@@ -21,26 +21,4 @@
            -I$(top_builddir)/src/core/deployment \
            -I$(top_builddir)/util/include \
            -I$(top_builddir)/axiom/include
-SUBDIRS = qpid_receiver
 
-lib_LTLIBRARIES = libaxis2_amqp_receiver.la
-
-libaxis2_amqp_receiver_la_SOURCES = axis2_amqp_receiver.c
-
-libaxis2_amqp_receiver_la_LIBADD = $(top_builddir)/util/src/libaxutil.la \
-								   $(top_builddir)/src/core/transport/amqp/util/libaxis2_amqp_util.la \
-								   $(top_builddir)/src/core/transport/amqp/receiver/qpid_receiver/libaxis2_qpid_receiver.la
-
-libaxis2_amqp_receiver_la_LDFLAGS = -version-info $(VERSION_NO)
-
-INCLUDES = -I$(top_builddir)/include \
-	       -I$(top_builddir)/src/core/transport/amqp/util \
-	       -I$(top_builddir)/src/core/transport/amqp/receiver \
-	       -I$(top_builddir)/src/core/transport/amqp/receiver/qpid_receiver \
-           -I$(top_builddir)/src/core/description \
-           -I$(top_builddir)/src/core/context \
-           -I$(top_builddir)/src/core/phaseresolver \
-           -I$(top_builddir)/src/core/engine \
-           -I$(top_builddir)/src/core/deployment \
-           -I$(top_builddir)/util/include \
-           -I$(top_builddir)/axiom/include

Modified: webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am?rev=696915&r1=696914&r2=696915&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am (original)
+++ webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am Thu
Sep 18 21:12:05 2008
@@ -23,28 +23,4 @@
            -I$(top_builddir)/util/include \
            -I$(top_builddir)/axiom/include \
 		   -I$(QPID_HOME)/include
-SUBDIRS = request_processor
 
-lib_LTLIBRARIES = libaxis2_qpid_receiver.la
-
-libaxis2_qpid_receiver_la_SOURCES = axis2_qpid_receiver.cpp \
-									axis2_qpid_receiver_interface.cpp
-
-libaxis2_qpid_receiver_la_LIBADD = $(top_builddir)/util/src/libaxutil.la \
-								   $(QPID_HOME)/lib/libqpidclient.la \
-								   $(top_builddir)/src/core/transport/amqp/receiver/qpid_receiver/request_processor/libaxis2_amqp_request_processor.la
-
-libaxis2_qpid_receiver_la_LDFLAGS = g++ -version-info $(VERSION_NO)
-
-INCLUDES = -I$(top_builddir)/include \
-	       -I$(top_builddir)/src/core/transport/amqp/receiver/qpid_receiver \
-	       -I$(top_builddir)/src/core/transport/amqp/receiver/qpid_receiver/request_processor
\
-	       -I$(top_builddir)/src/core/transport/amqp/util \
-           -I$(top_builddir)/src/core/description \
-           -I$(top_builddir)/src/core/context \
-           -I$(top_builddir)/src/core/phaseresolver \
-           -I$(top_builddir)/src/core/engine \
-           -I$(top_builddir)/src/core/deployment \
-           -I$(top_builddir)/util/include \
-           -I$(top_builddir)/axiom/include \
-		   -I$(QPID_HOME)/include

Modified: webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am?rev=696915&r1=696914&r2=696915&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am
(original)
+++ webservices/axis2/trunk/c/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am
Thu Sep 18 21:12:05 2008
@@ -16,21 +16,4 @@
            -I$(top_builddir)/src/core/deployment \
            -I$(top_builddir)/util/include \
            -I$(top_builddir)/axiom/include
-lib_LTLIBRARIES = libaxis2_amqp_request_processor.la
 
-libaxis2_amqp_request_processor_la_SOURCES = axis2_amqp_request_processor.c
-
-libaxis2_amqp_request_processor_la_LIBADD = $(top_builddir)/util/src/libaxutil.la
-
-libaxis2_amqp_request_processor_la_LDFLAGS = -version-info $(VERSION_NO)
-
-INCLUDES = -I$(top_builddir)/include \
-	       -I$(top_builddir)/src/core/transport/amqp/receiver/qpid_receiver/request_processor
\
-	       -I$(top_builddir)/src/core/transport/amqp/util \
-           -I$(top_builddir)/src/core/description \
-           -I$(top_builddir)/src/core/context \
-           -I$(top_builddir)/src/core/phaseresolver \
-           -I$(top_builddir)/src/core/engine \
-           -I$(top_builddir)/src/core/deployment \
-           -I$(top_builddir)/util/include \
-           -I$(top_builddir)/axiom/include

Modified: webservices/axis2/trunk/c/src/core/transport/amqp/sender/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/amqp/sender/Makefile.am?rev=696915&r1=696914&r2=696915&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/amqp/sender/Makefile.am (original)
+++ webservices/axis2/trunk/c/src/core/transport/amqp/sender/Makefile.am Thu Sep 18 21:12:05
2008
@@ -21,26 +21,4 @@
            -I$(top_builddir)/src/core/deployment \
            -I$(top_builddir)/util/include \
            -I$(top_builddir)/axiom/include
-SUBDIRS = qpid_sender
 
-lib_LTLIBRARIES = libaxis2_amqp_sender.la
-
-libaxis2_amqp_sender_la_SOURCES = axis2_amqp_sender.c
-
-libaxis2_amqp_sender_la_LIBADD = $(top_builddir)/util/src/libaxutil.la \
-								 $(top_builddir)/src/core/transport/amqp/util/libaxis2_amqp_util.la \
-								 $(top_builddir)/src/core/transport/amqp/sender/qpid_sender/libaxis2_qpid_sender.la
-
-libaxis2_amqp_sender_la_LDFLAGS = -version-info $(VERSION_NO)
-
-INCLUDES = -I$(top_builddir)/include \
-	       -I$(top_builddir)/src/core/transport/amqp/util \
-	       -I$(top_builddir)/src/core/transport/amqp/sender \
-	       -I$(top_builddir)/src/core/transport/amqp/sender/qpid_sender \
-           -I$(top_builddir)/src/core/description \
-           -I$(top_builddir)/src/core/context \
-           -I$(top_builddir)/src/core/phaseresolver \
-           -I$(top_builddir)/src/core/engine \
-           -I$(top_builddir)/src/core/deployment \
-           -I$(top_builddir)/util/include \
-           -I$(top_builddir)/axiom/include

Modified: webservices/axis2/trunk/c/src/core/transport/amqp/sender/qpid_sender/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/amqp/sender/qpid_sender/Makefile.am?rev=696915&r1=696914&r2=696915&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/amqp/sender/qpid_sender/Makefile.am (original)
+++ webservices/axis2/trunk/c/src/core/transport/amqp/sender/qpid_sender/Makefile.am Thu Sep
18 21:12:05 2008
@@ -19,24 +19,4 @@
            -I$(top_builddir)/util/include \
            -I$(top_builddir)/axiom/include \
 		   -I$(QPID_HOME)/include
-lib_LTLIBRARIES = libaxis2_qpid_sender.la
 
-libaxis2_qpid_sender_la_SOURCES = axis2_qpid_sender.cpp \
-								  axis2_qpid_sender_interface.cpp
-
-libaxis2_qpid_sender_la_LIBADD = $(top_builddir)/util/src/libaxutil.la \
-								 $(QPID_HOME)/lib/libqpidclient.la
-
-libaxis2_qpid_sender_la_LDFLAGS = g++ -version-info $(VERSION_NO)
-
-INCLUDES = -I$(top_builddir)/include \
-	       -I$(top_builddir)/src/core/transport/amqp/sender/qpid_sender \
-	       -I$(top_builddir)/src/core/transport/amqp/util \
-           -I$(top_builddir)/src/core/description \
-           -I$(top_builddir)/src/core/context \
-           -I$(top_builddir)/src/core/phaseresolver \
-           -I$(top_builddir)/src/core/engine \
-           -I$(top_builddir)/src/core/deployment \
-           -I$(top_builddir)/util/include \
-           -I$(top_builddir)/axiom/include \
-		   -I$(QPID_HOME)/include

Modified: webservices/axis2/trunk/c/src/core/transport/amqp/server/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/amqp/server/Makefile.am?rev=696915&r1=696914&r2=696915&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/amqp/server/Makefile.am (original)
+++ webservices/axis2/trunk/c/src/core/transport/amqp/server/Makefile.am Thu Sep 18 21:12:05
2008
@@ -1,2 +1 @@
 SUBDIRS = axis2_amqp_server
-SUBDIRS = axis2_amqp_server

Modified: webservices/axis2/trunk/c/src/core/transport/amqp/server/axis2_amqp_server/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/amqp/server/axis2_amqp_server/Makefile.am?rev=696915&r1=696914&r2=696915&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/amqp/server/axis2_amqp_server/Makefile.am
(original)
+++ webservices/axis2/trunk/c/src/core/transport/amqp/server/axis2_amqp_server/Makefile.am
Thu Sep 18 21:12:05 2008
@@ -29,34 +29,3 @@
            -I$(top_builddir)/src/core/transport/amqp/receiver/qpid_receiver \
            -I$(top_builddir)/util/include \
            -I$(top_builddir)/axiom/include
-prgbindir = $(bindir)
-
-prgbin_PROGRAMS = axis2_amqp_server
-
-AM_CFLAGS = -g -pthread
-
-axis2_amqp_server_SOURCES = axis2_amqp_server.c
-
-axis2_amqp_server_LDADD = $(LDFLAGS) \
-			     		  $(top_builddir)/axiom/src/om/libaxis2_axiom.la \
-						  $(top_builddir)/util/src/libaxutil.la \
-						  $(top_builddir)/axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
-						  $(top_builddir)/src/core/description/libaxis2_description.la \
-						  $(top_builddir)/src/core/deployment/libaxis2_deployment.la \
-						  $(top_builddir)/src/core/context/libaxis2_context.la \
-						  $(top_builddir)/src/core/clientapi/libaxis2_clientapi.la \
-						  $(top_builddir)/src/core/engine/libaxis2_engine.la \
-						  $(top_builddir)/neethi/src/libneethi.la \
-						  $(top_builddir)/src/core/transport/amqp/receiver/libaxis2_amqp_receiver.la \
-						  -lpthread
-                    
-INCLUDES = -I$(top_builddir)/include \
-           -I$(top_builddir)/src/core/description \
-           -I$(top_builddir)/src/core/context \
-           -I$(top_builddir)/src/core/deploymenti \
-           -I$(top_builddir)/src/core/phaseresolver \
-           -I$(top_builddir)/src/core/engine \
-           -I$(top_builddir)/src/core/transport/amqp/receiver \
-           -I$(top_builddir)/src/core/transport/amqp/receiver/qpid_receiver \
-           -I$(top_builddir)/util/include \
-           -I$(top_builddir)/axiom/include

Modified: webservices/axis2/trunk/c/src/core/transport/amqp/util/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/amqp/util/Makefile.am?rev=696915&r1=696914&r2=696915&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/amqp/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/src/core/transport/amqp/util/Makefile.am Thu Sep 18 21:12:05
2008
@@ -15,23 +15,5 @@
            -I$(top_builddir)/src/core/deployment \
            -I$(top_builddir)/util/include \
            -I$(top_builddir)/axiom/include
-lib_LTLIBRARIES = libaxis2_amqp_util.la
 
-libaxis2_amqp_util_la_SOURCES = axis2_amqp_util.c
-
-libaxis2_amqp_util_la_LIBADD = $(top_builddir)/util/src/libaxutil.la
-
-libaxis2_amqp_util_la_LDFLAGS = -version-info $(VERSION_NO)
-
-INCLUDES = -I$(top_builddir)/include \
-	       -I$(top_builddir)/src/core/transport/amqp/util \
-           -I$(top_builddir)/src/core/description \
-           -I$(top_builddir)/src/core/context \
-           -I$(top_builddir)/src/core/engine \
-           -I$(top_builddir)/src/core/deployment \
-           -I$(top_builddir)/util/include \
-           -I$(top_builddir)/axiom/include
-
-EXTRA_DIST=axis2_amqp_defines.h axis2_amqp_util.h
-
 



Mime
View raw message