From b58c8c4b6e08e4bcfcd2746503216858c0879346 Mon Sep 17 00:00:00 2001
From: winckel <winckel@eurecom.fr>
Date: Mon, 21 Oct 2013 09:02:33 +0000
Subject: [PATCH] Modified makefile and main function for new ITTI definition.
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4235 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair-cn/OAISIM_MME/Makefile.am | 4 +---
openair-cn/OAISIM_MME/oaisim_mme.c | 3 +--
openair-cn/OAI_SGW/Makefile.am | 4 +---
openair-cn/TEST/Makefile.am | 3 ++-
openair-cn/TEST/oaisim_mme_itti_test.c | 2 +-
5 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/openair-cn/OAISIM_MME/Makefile.am b/openair-cn/OAISIM_MME/Makefile.am
index 15ad6c0324b..3596a68f46e 100644
--- a/openair-cn/OAISIM_MME/Makefile.am
+++ b/openair-cn/OAISIM_MME/Makefile.am
@@ -17,8 +17,7 @@ AM_CFLAGS = @ADD_CFLAGS@ \
-I$(top_srcdir)/SGW-LITE \
-I$(top_srcdir)/UDP \
-I$(top_srcdir)/UTILS \
- -I$(top_srcdir)/UTILS/HASHTABLE \
- -I$(top_srcdir)/UTILS/TIMER
+ -I$(top_srcdir)/UTILS/HASHTABLE
oaisim_mme_LDADD = \
$(top_builddir)/INTERTASK_INTERFACE/libitti.la \
@@ -27,7 +26,6 @@ oaisim_mme_LDADD = \
$(top_builddir)/S1AP/libs1ap.la \
$(top_builddir)/S6A/libs6a.la \
$(top_builddir)/SCTP/libsctpserver.la \
- $(top_builddir)/UTILS/TIMER/libtimer.la \
$(top_builddir)/UTILS/HASHTABLE/libhashtable.la \
$(top_builddir)/UDP/libudpserver.la \
$(top_builddir)/MME_APP/libmmeapp.la \
diff --git a/openair-cn/OAISIM_MME/oaisim_mme.c b/openair-cn/OAISIM_MME/oaisim_mme.c
index d3f5d4aa4e9..28d43613d8d 100644
--- a/openair-cn/OAISIM_MME/oaisim_mme.c
+++ b/openair-cn/OAISIM_MME/oaisim_mme.c
@@ -73,11 +73,10 @@ int main(int argc, char *argv[])
/* Calling each layer init function */
CHECK_INIT_RETURN(log_init(&mme_config, oai_mme_log_specific));
- CHECK_INIT_RETURN(intertask_interface_init(&mme_config, THREAD_MAX,
+ CHECK_INIT_RETURN(intertask_interface_init(THREAD_MAX,
MESSAGES_ID_MAX, threads_name,
messages_info,
messages_definition_xml));
- CHECK_INIT_RETURN(timer_init(&mme_config));
CHECK_INIT_RETURN(nas_init(&mme_config));
CHECK_INIT_RETURN(sctp_init(&mme_config));
diff --git a/openair-cn/OAI_SGW/Makefile.am b/openair-cn/OAI_SGW/Makefile.am
index d76e2ec9e79..892ad6f51c0 100644
--- a/openair-cn/OAI_SGW/Makefile.am
+++ b/openair-cn/OAI_SGW/Makefile.am
@@ -10,8 +10,7 @@ AM_CFLAGS = @ADD_CFLAGS@ \
-I$(top_srcdir)/SGW-LITE \
-I$(top_srcdir)/UDP \
-I$(top_srcdir)/UTILS \
- -I$(top_srcdir)/UTILS/HASHTABLE \
- -I$(top_srcdir)/UTILS/TIMER
+ -I$(top_srcdir)/UTILS/HASHTABLE
oai_sgw_LDADD = \
$(top_builddir)/GTPV1-U/libgtpv1u.la \
@@ -20,7 +19,6 @@ oai_sgw_LDADD = \
$(top_builddir)/GTPV2-C/nwgtpv2c-0.11/src/libNwGtpv2c.a \
$(top_builddir)/SGI/libsgi.la \
$(top_builddir)/SGW-LITE/libsgw_lite.la \
- $(top_builddir)/UTILS/TIMER/libtimer.la \
$(top_builddir)/UTILS/HASHTABLE/libhashtable.la \
$(top_builddir)/UDP/libudpserver.la \
$(top_builddir)/SECU/libsecu.la \
diff --git a/openair-cn/TEST/Makefile.am b/openair-cn/TEST/Makefile.am
index fc80f2a00be..4a8e4aa6235 100644
--- a/openair-cn/TEST/Makefile.am
+++ b/openair-cn/TEST/Makefile.am
@@ -35,10 +35,11 @@ endif
libtest_util_la_SOURCES = \
test_util.c test_util.h
-noinst_LTLIBRARIES = libtest_util.la
+noinst_LTLIBRARIES = libtest_util.la
common_ldadd = $(top_builddir)/SECU/libsecu.la \
libtest_util.la \
+ $(top_builddir)/UTILS/libutils.la \
@CHECK_LIBS@
check_PROGRAMS = \
diff --git a/openair-cn/TEST/oaisim_mme_itti_test.c b/openair-cn/TEST/oaisim_mme_itti_test.c
index 22072f8e011..af3c32ae76d 100644
--- a/openair-cn/TEST/oaisim_mme_itti_test.c
+++ b/openair-cn/TEST/oaisim_mme_itti_test.c
@@ -78,7 +78,7 @@ int main(int argc, char *argv[])
/* Calling each layer init function */
log_init(&mme_config);
- intertask_interface_init(THREAD_MAX, MESSAGES_ID_MAX, threads_name, messages_info);
+ intertask_interface_init(THREAD_MAX, MESSAGES_ID_MAX, threads_name, messages_info, messages_definition_xml);
sctp_init(&mme_config);
udp_init(&mme_config);
s1ap_mme_init(&mme_config);
--
GitLab