This is an automated email from the ASF dual-hosted git repository.

billblough pushed a commit to tag 1.5.0-rc2
in repository https://gitbox.apache.org/repos/asf/axis-axis2-c-core.git

commit 488eb79dbe73d06771300db48cf8d94b25e721f3
Author: Supun Kamburugamuva <[email protected]>
AuthorDate: Mon Jul 7 04:16:13 2008 +0000

    make files for AMQP
---
 neethi/configure.ac                                |   2 +-
 src/core/transport/Makefile.am                     |   7 +-
 src/core/transport/amqp/receiver/Makefile.am       |  94 +++++++--------
 .../amqp/receiver/qpid_receiver/Makefile.am        | 102 +++++++++--------
 .../qpid_receiver/request_processor/Makefile.am    |  74 ++++++------
 src/core/transport/amqp/sender/Makefile.am         |  94 +++++++--------
 .../transport/amqp/sender/qpid_sender/Makefile.am  |  86 +++++++-------
 .../amqp/server/axis2_amqp_server/Makefile.am      | 126 +++++++++++----------
 src/core/transport/amqp/util/Makefile.am           |   9 +-
 9 files changed, 308 insertions(+), 286 deletions(-)

diff --git a/neethi/configure.ac b/neethi/configure.ac
index 15e9b81..c2174e3 100644
--- a/neethi/configure.ac
+++ b/neethi/configure.ac
@@ -57,7 +57,7 @@ dnl AC_FUNC_MALLOC
 dnl AC_FUNC_REALLOC
 #AC_CHECK_FUNCS([memmove])
 
-VERSION_NO="4:0:4"
+VERSION_NO="5:0:5"
 
 AC_SUBST(VERSION_NO)
 
diff --git a/src/core/transport/Makefile.am b/src/core/transport/Makefile.am
index 4f5b279..eff5f72 100644
--- a/src/core/transport/Makefile.am
+++ b/src/core/transport/Makefile.am
@@ -1,3 +1,8 @@
 SUBDIRS=http $(TCP_DIR) $(AMQP_DIR)
 DIST_SUBDIRS=http tcp amqp
-EXTRA_DIST=Makefile.am 
+EXTRA_DIST=Makefile.am amqp/server/axis2_amqp_server/axis2_amqp_server.h \
+amqp/receiver/axis2_amqp_receiver.h 
amqp/receiver/qpid_receiver/axis2_qpid_receiver.h \
+amqp/receiver/qpid_receiver/axis2_qpid_receiver_interface.h 
amqp/receiver/qpid_receiver/request_processor/axis2_amqp_request_processor.h \
+amqp/util/axis2_amqp_defines.h amqp/util/axis2_amqp_util.h 
amqp/sender/qpid_sender/axis2_qpid_sender_interface.h \
+amqp/sender/qpid_sender/axis2_qpid_sender.h amqp/sender/axis2_amqp_sender.h
+
diff --git a/src/core/transport/amqp/receiver/Makefile.am 
b/src/core/transport/amqp/receiver/Makefile.am
index cd36824..4c4e0a7 100644
--- a/src/core/transport/amqp/receiver/Makefile.am
+++ b/src/core/transport/amqp/receiver/Makefile.am
@@ -1,46 +1,48 @@
-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
-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
+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
+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
+
+
diff --git a/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am 
b/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am
index cfd8edc..1d8561c 100644
--- a/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am
+++ b/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am
@@ -1,50 +1,52 @@
-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
-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
+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
+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
+
+
diff --git 
a/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am 
b/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am
index 4be3cef..217827c 100644
--- 
a/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am
+++ 
b/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am
@@ -1,36 +1,38 @@
-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
-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
+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
+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
+
+
diff --git a/src/core/transport/amqp/sender/Makefile.am 
b/src/core/transport/amqp/sender/Makefile.am
index 3aaecb4..7ffcb93 100644
--- a/src/core/transport/amqp/sender/Makefile.am
+++ b/src/core/transport/amqp/sender/Makefile.am
@@ -1,46 +1,48 @@
-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
-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
+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
+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
+
+
diff --git a/src/core/transport/amqp/sender/qpid_sender/Makefile.am 
b/src/core/transport/amqp/sender/qpid_sender/Makefile.am
index dbe68ec..2f31b36 100644
--- a/src/core/transport/amqp/sender/qpid_sender/Makefile.am
+++ b/src/core/transport/amqp/sender/qpid_sender/Makefile.am
@@ -1,42 +1,44 @@
-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
-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
+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
+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
+
+
diff --git a/src/core/transport/amqp/server/axis2_amqp_server/Makefile.am 
b/src/core/transport/amqp/server/axis2_amqp_server/Makefile.am
index 7b9b878..574db01 100644
--- a/src/core/transport/amqp/server/axis2_amqp_server/Makefile.am
+++ b/src/core/transport/amqp/server/axis2_amqp_server/Makefile.am
@@ -1,62 +1,64 @@
-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
-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
+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
+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
+
+
diff --git a/src/core/transport/amqp/util/Makefile.am 
b/src/core/transport/amqp/util/Makefile.am
index 5706a2f..af834c3 100644
--- a/src/core/transport/amqp/util/Makefile.am
+++ b/src/core/transport/amqp/util/Makefile.am
@@ -1,4 +1,5 @@
-lib_LTLIBRARIES = libaxis2_amqp_util.la
+lib_LTLIBRARIES = libaxis2_amqp_util.la
+
 
 libaxis2_amqp_util_la_SOURCES = axis2_amqp_util.c
 
@@ -29,4 +30,8 @@ INCLUDES = -I$(top_builddir)/include \
            -I$(top_builddir)/src/core/engine \
            -I$(top_builddir)/src/core/deployment \
            -I$(top_builddir)/util/include \
-           -I$(top_builddir)/axiom/include
+           -I$(top_builddir)/axiom/include
+
+EXTRA_DIST=axis2_amqp_defines.h axis2_amqp_util.h
+
+

Reply via email to