sync

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

openair2/Makefile

@@ -120,7 +120,7 @@ install_emul:
 	(insmod SIMULATION/PHY_EMULATION/DEVICE_DRIVER/openair_emul.ko)
 	(insmod LAYER2/openair_layer2.ko)
 	(insmod RRC/MESH/openair_rrc.ko)
-	(insmod NAS/DRIVER/MESH/nasmesh.ko)
+	(insmod NETWORK_DRIVER/MESH/nasmesh.ko)
 
 remove_emul:
 	rmmod  nasmesh
@@ -133,17 +133,17 @@ remove_emul:
 
 
 clean_nasmesh:
-	(cd NAS/DRIVER/MESH && $(MAKE) V=1 -C $(KERNEL_DIR)/build M=`pwd` clean)
+	(cd NETWORK_DRIVER/MESH && $(MAKE) V=1 -C $(KERNEL_DIR)/build M=`pwd` clean)
 
 nasmesh_address_fix.ko:
-	(cd NAS/DRIVER/MESH && $(MAKE) -j$(NUM_CORES) $(SET_UM) V=1 ADDRESS_FIX=1 -C $(KERNEL_DIR)/build M=`pwd`)
+	(cd NETWORK_DRIVER/MESH && $(MAKE) -j$(NUM_CORES) $(SET_UM) V=1 ADDRESS_FIX=1 -C $(KERNEL_DIR)/build M=`pwd`)
 
 nasmesh.ko:
-	(cd NAS/DRIVER/MESH && $(MAKE) -j$(NUM_CORES) $(SET_UM) V=1 -C $(KERNEL_DIR)/build M=`pwd`)
+	(cd NETWORK_DRIVER/MESH && $(MAKE) -j$(NUM_CORES) $(SET_UM) V=1 -C $(KERNEL_DIR)/build M=`pwd`)
 
 # automatically detect the linux header files for driver compilation
 nasmesh_netlink.ko:
-	(cd NAS/DRIVER/MESH && $(MAKE) -j$(NUM_CORES) $(SET_UM) PDCP_USE_NETLINK=1 V=1 -C $(KERNEL_DIR)/build M=`pwd` modules)
+	(cd NETWORK_DRIVER/MESH && $(MAKE) -j$(NUM_CORES) $(SET_UM) PDCP_USE_NETLINK=1 V=1 -C $(KERNEL_DIR)/build M=`pwd` modules)
 
 naslite_netlink_ether.ko:
 	(cd NAS/DRIVER/LITE && $(MAKE) -j$(NUM_CORES) $(SET_UM) OAI_NW_DRIVER_TYPE_ETHERNET=1 PDCP_USE_NETLINK=1 OAI_NW_DRIVER_USE_NETLINK=1 V=1 -C $(KERNEL_DIR)/build M=`pwd` modules)
@@ -155,11 +155,11 @@ oai_nw_drv.ko:
 	(cd NAS/DRIVER/LITE && $(MAKE) -j$(NUM_CORES) $(SET_UM) OAI_NW_DRIVER_TYPE_ETHERNET=1 PDCP_USE_NETLINK=1 OAI_NW_DRIVER_USE_NETLINK=1 V=1 -C $(KERNEL_DIR)/build M=`pwd` modules)
 
 nasmesh_netlink_address_fix.ko:
-	(cd NAS/DRIVER/MESH && $(MAKE) -j$(NUM_CORES) $(SET_UM) PDCP_USE_NETLINK=1 ADDRESS_FIX=1  V=1 -C $(KERNEL_DIR)/build M=`pwd` modules)
+	(cd NETWORK_DRIVER/MESH && $(MAKE) -j$(NUM_CORES) $(SET_UM) PDCP_USE_NETLINK=1 ADDRESS_FIX=1  V=1 -C $(KERNEL_DIR)/build M=`pwd` modules)
 
 
 nasmesh_netlink_loopback.ko:
-	(cd NAS/DRIVER/MESH && $(MAKE) $(SET_UM) PDCP_USE_NETLINK=1 LOOPBACK=1 V=1 -C $(KERNEL_DIR)/build M=`pwd` modules)
+	(cd NETWORK_DRIVER/MESH && $(MAKE) $(SET_UM) PDCP_USE_NETLINK=1 LOOPBACK=1 V=1 -C $(KERNEL_DIR)/build M=`pwd` modules)
 
 # drivers cellular version
 nascellmt_netlink.ko:
@@ -186,7 +186,7 @@ bypass_phy:
 	(cd SIMULATION/PHY_EMULATION/TRANSPORT/KERNEL_INTERFACE && $(MAKE))
 
 rb_tool:
-	(cd NAS/DRIVER/MESH/RB_TOOL && $(MAKE))
+	(cd NETWORK_DRIVER/MESH/RB_TOOL && $(MAKE))
 
 
 fifos:
@@ -229,9 +229,9 @@ emul_rt:
 	(cd SIMULATION/USER_TOOLS/RT_EMUL_LAUNCHER && $(MAKE))
 
 clean:
-	(cd NAS/DRIVER/MESH && $(MAKE) clean)
+	(cd NETWORK_DRIVER/MESH && $(MAKE) clean)
 	(cd NAS/DRIVER/LITE && $(MAKE) clean)
-	rm -rf NAS/DRIVER/MESH/RB_TOOL/rb_tool
+	rm -rf NETWORK_DRIVER/MESH/RB_TOOL/rb_tool
 	rm -rf NAS/DRIVER/LITE/RB_TOOL/rb_tool
 
 cleanall:
@@ -239,7 +239,7 @@ cleanall:
 	find -name *.ko -delete -print
 	find -name *~ -delete -print
 	find -name *.bak -delete -print
-	rm -rf NAS/DRIVER/MESH/RB_TOOL/rb_tool
+	rm -rf NETWORK_DRIVER/MESH/RB_TOOL/rb_tool
 	rm -rf NAS/DRIVER/LITE/RB_TOOL/rb_tool