summaryrefslogtreecommitdiffstats
path: root/src/core/engine
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2013-02-16 18:11:19 +0100
committerGravatar Martin Szulecki2013-02-16 18:11:19 +0100
commit8ffb051a30cdd12f682dbfce5a293160c260a65c (patch)
treec48b1f8b025379abcb92ec097bda5fd6f359ac5b /src/core/engine
parentb0eb675fda9e2ebe316a41ed1e7bd4822513aa7d (diff)
downloadaxis2c-8ffb051a30cdd12f682dbfce5a293160c260a65c.tar.gz
axis2c-8ffb051a30cdd12f682dbfce5a293160c260a65c.tar.bz2
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.
Diffstat (limited to 'src/core/engine')
-rw-r--r--src/core/engine/Makefile.am9
1 files changed, 4 insertions, 5 deletions
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 \