Fixing MAX_NUM_CCs in Makefiles

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6113 818b1a75-f10b-46b9-bf7c-635c3b92a50f

targets/Makefile.common

@@ -57,7 +57,14 @@ endif
 endif
 
 CFLAGS += -DJUMBO_FRAME
+
+ifdef MAX_NUM_CCs
+CFLAGS           += -DMAX_NUM_CCs=$(MAX_NUM_CCs)
+COMMON_CFLAGS    += -DMAX_NUM_CCs=$(MAX_NUM_CCs)
+else
+CFLAGS           += -DMAX_NUM_CCs=1
 COMMON_CFLAGS    += -DMAX_NUM_CCs=1
+endif
 
 ifeq ($(ENABLE_RAL), 1)
 CFLAGS += -DENABLE_RAL

targets/RT/USER/Makefile

@@ -25,8 +25,6 @@ endif
 CFLAGS += -O2 
 CFLAGS += -DDRIVER2013 -I$(OPENAIR_TARGETS)/ARCH/COMMON  -I.
 
-CFLAGS += -DMAX_NUM_CCs=1
-
 ifeq ($(EXMIMO),1)
   CFLAGS += -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/USERSPACE/LIB/ -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/DEFS -DENABLE_VCD_FIFO
 endif

targets/SIMU/USER/Makefile

@@ -123,7 +123,7 @@ $(info "Rel8=1")
 CFLAGS += -DRel8
 endif
 
-CFLAGS += -DMAX_NUM_CCs=1
+#CFLAGS += -DMAX_NUM_CCs=1
 
 ifeq ($(RLC_STOP_ON_LOST_PDU), 1)
 CFLAGS += -DRLC_STOP_ON_LOST_PDU
@@ -444,6 +444,7 @@ print:
 	@echo "OCG_FLAG are "		$(OCG_FLAG)
 	@echo "CFLAGS are "			$(CFLAGS)
 	@echo "EXTRA_CFLAGS are"	$(EXTRA_CFLAGS)
+	@echo "COMMON_CFLAGS are"	$(COMMON_CFLAGS)
 	@echo "L2 includes are"		$(L2_incl)
 	@echo "INCLUDES are"		$(INCLUDES)
 	@echo "S1AP Includes are"	$(S1AP_Incl)