From f91b16712cc3ea3c65b18cef2b9c93b703b00658 Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Wed, 11 Dec 2013 21:00:17 +0000
Subject: [PATCH] - Fixed missing compiler directives
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4679 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
targets/Makefile.common | 9 +++++++--
targets/Makerules | 8 --------
targets/SIMU/USER/Makefile | 3 ++-
3 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/targets/Makefile.common b/targets/Makefile.common
index f3b5956844..7e9833252f 100644
--- a/targets/Makefile.common
+++ b/targets/Makefile.common
@@ -13,7 +13,12 @@ export UE_NAS_DIR
export S1AP_DIR
export SCTP_DIR
-COMMON_CFLAGS = -D'FIRMWARE_VERSION="$(SVN_REV) - $(DATE_REV)"'
+#Export common cflags (between softmodem and oaisim)
+COMMON_CFLAGS = \
+ -D'FIRMWARE_VERSION="$(SVN_REV) - $(DATE_REV)"' \
+ -Wall \
+ -fno-strict-aliasing \
+ -O2
ITTI_MESSAGES_H = messages_xml.h
ITTI_MESSAGES_XML = messages.xml
@@ -78,7 +83,7 @@ endif
ifdef ENABLE_ITTI
SHARED_DEPENDENCIES += $(ITTI_MESSAGES_H)
-CFLAGS = $(COMMON_CFLAGS) $(COMMON_MME_CFLAGS) $(TARGETS_COMMON_incl)
+CFLAGS += $(COMMON_CFLAGS) $(COMMON_MME_CFLAGS) $(TARGETS_COMMON_incl)
OBJ += $(TARGETS_COMMON_OBJS)
endif
diff --git a/targets/Makerules b/targets/Makerules
index 32a0cff832..ccbe13ba75 100644
--- a/targets/Makerules
+++ b/targets/Makerules
@@ -55,11 +55,3 @@ LIBS = \
$(LIBBLAS_LIBS) \
$(LIBXML2_LIBS) \
$(XPM_LIBS)
-
-#Export common cflags (between softmodem and oaisim)
-COMMON_CFLAGS = \
- -Wall \
- -fno-strict-aliasing \
- -g \
- -ggdb \
- -O2
diff --git a/targets/SIMU/USER/Makefile b/targets/SIMU/USER/Makefile
index c370518b8a..e88ceda9b2 100644
--- a/targets/SIMU/USER/Makefile
+++ b/targets/SIMU/USER/Makefile
@@ -17,7 +17,8 @@ CPUFLAGS += $(shell if grep --silent ssse3 /proc/cpuinfo ; then echo "-mssse3" ;
CPUFLAGS += $(shell if grep --silent -w sse4 /proc/cpuinfo ; then echo "-msse4" ; else echo ""; fi)
linux = $(shell if [ `uname` = "Linux" ] ; then echo "1" ; else echo "0" ; fi)
-CFLAGS += $(COMMON_CFLAGS) -DUSER_MODE -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 $(CPUFLAGS) -I/usr/include/X11 #-Wno-packed-bitfield-compat
+CFLAGS += -g -ggdb
+CFLAGS += -DUSER_MODE -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 $(CPUFLAGS) -I/usr/include/X11 #-Wno-packed-bitfield-compat
# Check if GCC version is greater or equal to 4.4
GCCVERSIONGTEQ44 := $(shell expr `gcc -dumpversion | cut -f1,2 -d. --output-delimiter=""` \>= 44)
--
GitLab