Updated Makefiles to include "common/utils" files.

moved ITTI initialization just after command line arguments parsing.

pre-ci ok.

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

targets/RTAI/USER/Makefile

@@ -52,6 +52,8 @@ endif
 OBJ += $(OPENAIR_TARGETS)/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.o
 CFLAGS += -DDRIVER2013 -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/USERSPACE/LIB/ -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/DEFS -DENABLE_VCD_FIFO
 
+COMMON_UTILS_DIR    = $(OPENAIR_HOME)/common/utils
+include $(COMMON_UTILS_DIR)/Makefile.inc
 
 TOP_DIR = $(OPENAIR1_DIR)
 include $(OPENAIR1_DIR)/PHY/Makefile.inc
@@ -106,7 +108,7 @@ OBJ += $(PDCP_DIR)/pdcp_thread.o
 CFLAGS += -DOPENAIR2 -DNO_RRM -DPUCCH -DMAC_CONTEXT=1
 endif
 
-CFLAGS += $(L2_incl) $(UTIL_incl)
+CFLAGS += $(L2_incl) $(UTIL_incl) $(UTILS_incl)
 
 CFLAGS += -I$(OPENAIR1_DIR) -I$(OPENAIR2_DIR)/RRC/LITE/MESSAGES	#-I$(OPENAIR3_DIR)/MESH -I$(OPENAIR3_DIR)/MESH/RRM
 

targets/SIMU/USER/Makefile

@@ -480,7 +480,7 @@ showcflags:
 	@$(MAKE) -C $(S1AP_DIR) -f Makefile.eNB showcflags
 
 force_look:
-	true
+	@true
 
 otg_all: otg_latency otg_gp
 

targets/SIMU/USER/oaisim.c

@@ -913,6 +913,10 @@ int main(int argc, char **argv) {
   // get command-line options
   get_simulation_options (argc, argv); //Command-line options
 
+#if defined(ENABLE_ITTI)
+  itti_init(TASK_MAX, THREAD_MAX, MESSAGES_ID_MAX, tasks_info, messages_info, messages_definition_xml, oai_emulation.info.itti_dump_file);
+#endif
+
   // Initialize VCD LOG module
   vcd_signal_dumper_init ("openair_dump.vcd");
 
@@ -938,10 +942,6 @@ int main(int argc, char **argv) {
     sinr_dB = -20;
   }
 
-#if defined(ENABLE_ITTI)
-  itti_init(TASK_MAX, THREAD_MAX, MESSAGES_ID_MAX, tasks_info, messages_info, messages_definition_xml, oai_emulation.info.itti_dump_file);
-#endif
-
 #ifdef OPENAIR2
   init_omv ();
 #endif