Fix circular dependency between engine and http/common transport

The circular dependency prevents proper cross compilation.
A proper long-term solution requires refactoring of the affected code.

3 files changed, 8 insertions, 9 deletions

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 840797b..f9580c3 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -12,4 +12,4 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-SUBDIRS = addr context description phaseresolver receivers util clientapi deployment transport/http/util transport/http/common engine transport
+SUBDIRS = addr context description phaseresolver receivers util clientapi deployment transport/http/util engine transport/http/common transport
diff --git a/src/core/engine/Makefile.am b/src/core/engine/Makefile.am
index 17eb157..4244820 100644
--- a/src/core/engine/Makefile.am
+++ b/src/core/engine/Makefile.am
@@ -25,7 +25,9 @@ libaxis2_engine_la_SOURCES= ../transport/transport_receiver.c handler.c \
                         	soap_action_disp.c \
                         	soap_body_disp.c \
                         	ctx_handler.c \
-                        	engine.c
+                        	engine.c \
+                              $(top_builddir)/src/core/transport/http/common/http_header.c \
+                              $(top_builddir)/src/core/transport/http/common/http_accept_record.c
 
 libaxis2_engine_la_LDFLAGS = -version-info $(VERSION_NO)
 
@@ -39,10 +41,7 @@ libaxis2_engine_la_LIBADD=$(top_builddir)/src/core/description/libaxis2_descript
 					$(top_builddir)/src/core/util/libaxis2_core_utils.la \
 					$(top_builddir)/util/src/libaxutil.la \
 					$(top_builddir)/neethi/src/libneethi.la \
-					$(top_builddir)/axiom/src/om/libaxis2_axiom.la 
-libaxis2_engine_la_LIBADD+=$(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la \
-			   $(top_builddir)/src/core/transport/http/util/libaxis2_http_util.la
-
+					$(top_builddir)/axiom/src/om/libaxis2_axiom.la
 
 INCLUDES =  -I$(top_builddir)/include \
             -I$(top_builddir)/src/wsdl \
diff --git a/src/core/transport/http/common/Makefile.am b/src/core/transport/http/common/Makefile.am
index 73beac3..84b6548 100644
--- a/src/core/transport/http/common/Makefile.am
+++ b/src/core/transport/http/common/Makefile.am
@@ -14,9 +14,6 @@
 # limitations under the License.
 lib_LTLIBRARIES = libaxis2_http_common.la
 
-libaxis2_http_common_la_LIBADD=$(top_builddir)/util/src/libaxutil.la\
-                                 $(top_builddir)/src/core/transport/http/util/libaxis2_http_util.la
-
 libaxis2_http_common_la_SOURCES = http_header.c\
                                   http_out_transport_info.c\
                                   http_request_line.c\
@@ -28,6 +25,9 @@ libaxis2_http_common_la_SOURCES = http_header.c\
                                   simple_http_svr_conn.c\
                                   http_worker.c
 
+libaxis2_http_common_la_LIBADD= $(top_builddir)/util/src/libaxutil.la\
+                                $(top_builddir)/src/core/transport/http/util/libaxis2_http_util.la\
+                                $(top_builddir)/src/core/engine/libaxis2_engine.la
 
 libaxis2_http_common_la_LDFLAGS = -version-info $(VERSION_NO)