From 228aa778e0b0e381d2c0f7bf35a6343ca4088690 Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Wed, 23 Oct 2013 08:59:28 +0000
Subject: [PATCH] - Updated Makefile for gcc version 4.6.3 and superiors -
Replaced log_init to nas_log_init
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4266 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair-cn/NAS/EURECOM-NAS/tst/as_simulator/Makefile | 2 +-
openair-cn/NAS/EURECOM-NAS/tst/as_simulator/as_simulator.c | 2 +-
openair-cn/NAS/EURECOM-NAS/tst/network/Makefile | 4 ++--
openair-cn/NAS/EURECOM-NAS/tst/network/network_simulator.c | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/Makefile b/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/Makefile
index fb993089999..8587ffcaeca 100644
--- a/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/Makefile
+++ b/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/Makefile
@@ -7,7 +7,7 @@ PROJDIR = $(PWD)/../..
export LD_RUN_PATH = $(LIBDIR):$(LIBPROCESS)
-LIBS = -lutil -lapi -lEMMmsg -lESMmsg -lies
+LIBS = -lutil -lapi -lEMMmsg -lESMmsg -lies -lrt
INCLUDES = -I. -I$(INCDIR) -I$(UTILDIR) -I$(NETAPIDIR) \
-I$(EMMMSGDIR) -I$(ESMMSGDIR) -I$(IESDIR)
diff --git a/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/as_simulator.c b/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/as_simulator.c
index c11f816ab1c..d7c978b7f23 100644
--- a/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/as_simulator.c
+++ b/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/as_simulator.c
@@ -139,7 +139,7 @@ int main (int argc, const char* argv[])
const char* mhost = as_simulator_parser_get_mhost();
const char* mport = as_simulator_parser_get_mport();
- log_init(0x2f);
+ nas_log_init(0x2f);
/*
* Initialize the communication channel to the UE NAS process
diff --git a/openair-cn/NAS/EURECOM-NAS/tst/network/Makefile b/openair-cn/NAS/EURECOM-NAS/tst/network/Makefile
index 78a64c659a6..2ec879459fa 100644
--- a/openair-cn/NAS/EURECOM-NAS/tst/network/Makefile
+++ b/openair-cn/NAS/EURECOM-NAS/tst/network/Makefile
@@ -7,7 +7,7 @@ PROJDIR = $(PWD)/../..
export LD_RUN_PATH = $(LIBDIR):$(LIBPROCESS)
-LIBS = -lutil -lapi -lEMMmsg -lESMmsg -lies
+LIBS = -lutil -lapi -lEMMmsg -lESMmsg -lies -lrt
INCLUDES = -I. -I$(SRCDIR) -I$(INCDIR) -I$(UTILDIR) \
-I$(EMMMSGDIR) -I$(ESMMSGDIR) -I$(IESDIR)
@@ -19,7 +19,7 @@ all: $(TARGET)
$(CC) $(CFLAGS) -c $< -o $@
$(TARGET): $(OBJS)
- $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
clean:
$(RM) $(OBJS) *.bak *~
diff --git a/openair-cn/NAS/EURECOM-NAS/tst/network/network_simulator.c b/openair-cn/NAS/EURECOM-NAS/tst/network/network_simulator.c
index a74a17ebb4c..fd77ad647fa 100644
--- a/openair-cn/NAS/EURECOM-NAS/tst/network/network_simulator.c
+++ b/openair-cn/NAS/EURECOM-NAS/tst/network/network_simulator.c
@@ -23,13 +23,13 @@ Description Implements the network simulator running at the network
#include "include/commonDef.h"
#include "util/socket.h"
-#include "util/timer.h"
+#include "util/nas_timer.h"
#include "api/network/as_message.h"
#include "api/network/nas_message.h"
#include "emm/msg/emm_cause.h"
#include "esm/msg/esm_cause.h"
-#include "util/log.h"
+#include "util/nas_log.h"
#include <stdio.h> // printf, perror
#include <errno.h> // errno
@@ -226,7 +226,7 @@ int main (int argc, const char* argv[])
const char* host = network_parser_get_host();
const char* port = network_parser_get_port();
- log_init(0x2f);
+ nas_log_init(0x2f);
/*
* Initialize the communication channel to the NAS sublayer
--
GitLab