Commit 228aa778 authored by Cedric Roux's avatar Cedric Roux

- 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
parent ef9d164d
......@@ -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)
......
......@@ -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
......
......@@ -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 *~
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment