From: lal.harshita <harshita.lal@radisys.com>
Date: Mon, 19 Oct 2020 11:00:48 +0000 (+0530)
Subject: Make files clean-up
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=2a82bc6d025466602cbf335e5a7e65ceac186989;p=o-du%2Fl2.git

Make files clean-up

Change-Id: I748910df533bcd381d61626c8b861afa1194c234
Signed-off-by: lal.harshita <harshita.lal@radisys.com>
---

diff --git a/build/common/asn_common.mak b/build/common/asn_common.mak
index 13d9421b4..f3eb458c5 100755
--- a/build/common/asn_common.mak
+++ b/build/common/asn_common.mak
@@ -23,9 +23,6 @@ COLOR=$(COLOR_RED)
 SRC_DIR=$(ROOT_DIR)/src/codec_utils/common
 C_SRCS=$(wildcard $(SRC_DIR)/*.c)
 C_OBJS=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(C_SRCS))
-LOG_FILES=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i,$(C_SRCS))
-BAK_FILES=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i.bak,$(C_SRCS))
-DB_FILES =$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i.db,$(C_SRCS))
 
 lib: $(LIB_DIR)/libasn_common.a
 include $(COM_BUILD_DIR)/compile.mak
@@ -33,9 +30,9 @@ include $(COM_BUILD_DIR)/compile.mak
 #-------------------------------------------------------------#
 #Linker macros
 #-------------------------------------------------------------#
-$(LIB_DIR)/libasn_common.a:$(C_OBJS) $(C_WO_PED_OBJS)
+$(LIB_DIR)/libasn_common.a:$(C_OBJS)
 		  @echo -e "Creating Archive $(COLOR) $@ $(REVERT_COLOR)"
-		  $(Q)ar -cr $(LIB_DIR)/libasn_common.a $(C_OBJS) $(C_WO_PED_OBJS)
+		  $(Q)ar -cr $(LIB_DIR)/libasn_common.a $(C_OBJS)
 
 
 #-------------------------------------------------------------#
@@ -44,5 +41,8 @@ $(LIB_DIR)/libasn_common.a:$(C_OBJS) $(C_WO_PED_OBJS)
 clean:
 		  @echo -e "$(COLOR_RED)Cleaning ASN$(REVERT_COLOR)"
 		  @echo $(SRC_DIR) $(CM_DIR)
-		  $(Q)\rm -f $(LIB_DIR)/libasn_common.a $(C_OBJS) $(C_WO_PED_OBJS) $(LOG_FILES) $(BAK_FILES)
+		  $(Q)\rm -f $(LIB_DIR)/libasn_common.a $(C_OBJS)
 
+#**********************************************************************
+#         End of file
+#**********************************************************************
diff --git a/build/common/asn_e2ap.mak b/build/common/asn_e2ap.mak
index 8096c2ac8..c7865a680 100644
--- a/build/common/asn_e2ap.mak
+++ b/build/common/asn_e2ap.mak
@@ -31,9 +31,9 @@ I_OPTS+=-I$(SRC_DIR)/../common
 #-------------------------------------------------------------#
 #Linker macros
 #-------------------------------------------------------------#
-$(LIB_DIR)/libasn_e2ap.a:$(C_OBJS) $(C_WO_PED_OBJS)
+$(LIB_DIR)/libasn_e2ap.a:$(C_OBJS)
 		  @echo -e "Creating Archive $(COLOR) $@ $(REVERT_COLOR)"
-		  $(Q)ar -cr $(LIB_DIR)/libasn_e2ap.a $(C_OBJS) $(C_WO_PED_OBJS)
+		  $(Q)ar -cr $(LIB_DIR)/libasn_e2ap.a $(C_OBJS) 
 
 
 #-------------------------------------------------------------#
@@ -42,7 +42,7 @@ $(LIB_DIR)/libasn_e2ap.a:$(C_OBJS) $(C_WO_PED_OBJS)
 clean:
 		  @echo -e "$(COLOR_RED)Cleaning ASN$(REVERT_COLOR)"
 		  @echo $(SRC_DIR) $(CM_DIR)
-		  $(Q)\rm -f $(LIB_DIR)/libasn_e2ap.a $(C_OBJS) $(C_WO_PED_OBJS) $(LOG_FILES) $(BAK_FILES)
+		  $(Q)\rm -f $(LIB_DIR)/libasn_e2ap.a $(C_OBJS) 
 
 #-------------------------------------------------------------#
 #End of File
diff --git a/build/common/asn_f1ap.mak b/build/common/asn_f1ap.mak
index a7d082f6b..262fa9373 100755
--- a/build/common/asn_f1ap.mak
+++ b/build/common/asn_f1ap.mak
@@ -23,9 +23,6 @@ COLOR=$(COLOR_RED)
 SRC_DIR=$(ROOT_DIR)/src/codec_utils/F1AP
 C_SRCS=$(wildcard $(SRC_DIR)/*.c)
 C_OBJS=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(C_SRCS))
-LOG_FILES=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i,$(C_SRCS))
-BAK_FILES=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i.bak,$(C_SRCS))
-DB_FILES =$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i.db,$(C_SRCS))
 
 lib: $(LIB_DIR)/libasn_f1ap.a
 include $(COM_BUILD_DIR)/compile.mak
@@ -34,9 +31,9 @@ I_OPTS+=-I$(SRC_DIR)/../common
 #-------------------------------------------------------------#
 #Linker macros
 #-------------------------------------------------------------#
-$(LIB_DIR)/libasn_f1ap.a:$(C_OBJS) $(C_WO_PED_OBJS)
+$(LIB_DIR)/libasn_f1ap.a:$(C_OBJS) 
 		  @echo -e "Creating Archive $(COLOR) $@ $(REVERT_COLOR)"
-		  $(Q)ar -cr $(LIB_DIR)/libasn_f1ap.a $(C_OBJS) $(C_WO_PED_OBJS)
+		  $(Q)ar -cr $(LIB_DIR)/libasn_f1ap.a $(C_OBJS)
 
 
 #-------------------------------------------------------------#
@@ -45,5 +42,8 @@ $(LIB_DIR)/libasn_f1ap.a:$(C_OBJS) $(C_WO_PED_OBJS)
 clean:
 		  @echo -e "$(COLOR_RED)Cleaning ASN$(REVERT_COLOR)"
 		  @echo $(SRC_DIR) $(CM_DIR)
-		  $(Q)\rm -f $(LIB_DIR)/libasn_f1ap.a $(C_OBJS) $(C_WO_PED_OBJS) $(LOG_FILES) $(BAK_FILES)
+		  $(Q)\rm -f $(LIB_DIR)/libasn_f1ap.a $(C_OBJS) 
 
+#**********************************************************************
+#         End of file
+#**********************************************************************
diff --git a/build/common/asn_rrc.mak b/build/common/asn_rrc.mak
index 7708b33ec..482c91edb 100755
--- a/build/common/asn_rrc.mak
+++ b/build/common/asn_rrc.mak
@@ -23,9 +23,6 @@ COLOR=$(COLOR_RED)
 SRC_DIR=$(ROOT_DIR)/src/codec_utils/RRC
 C_SRCS=$(wildcard $(SRC_DIR)/*.c)
 C_OBJS=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(C_SRCS))
-LOG_FILES=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i,$(C_SRCS))
-BAK_FILES=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i.bak,$(C_SRCS))
-DB_FILES =$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i.db,$(C_SRCS))
 
 lib: $(LIB_DIR)/libasn_rrc.a
 include $(COM_BUILD_DIR)/compile.mak
@@ -34,9 +31,9 @@ I_OPTS+=-I$(SRC_DIR)/../common
 #-------------------------------------------------------------#
 #Linker macros
 #-------------------------------------------------------------#
-$(LIB_DIR)/libasn_rrc.a:$(C_OBJS) $(C_WO_PED_OBJS)
+$(LIB_DIR)/libasn_rrc.a:$(C_OBJS)
 		  @echo -e "Creating Archive $(COLOR) $@ $(REVERT_COLOR)"
-		  $(Q)ar -cr $(LIB_DIR)/libasn_rrc.a $(C_OBJS) $(C_WO_PED_OBJS)
+		  $(Q)ar -cr $(LIB_DIR)/libasn_rrc.a $(C_OBJS) 
 
 
 #-------------------------------------------------------------#
@@ -45,5 +42,8 @@ $(LIB_DIR)/libasn_rrc.a:$(C_OBJS) $(C_WO_PED_OBJS)
 clean:
 		  @echo -e "$(COLOR_RED)Cleaning ASN$(REVERT_COLOR)"
 		  @echo $(SRC_DIR) $(CM_DIR)
-		  $(Q)\rm -f $(LIB_DIR)/libasn_rrc.a $(C_OBJS) $(C_WO_PED_OBJS) $(LOG_FILES) $(BAK_FILES)
+		  $(Q)\rm -f $(LIB_DIR)/libasn_rrc.a $(C_OBJS) 
 
+#**********************************************************************
+#         End of file
+#**********************************************************************
diff --git a/build/common/cm.mak b/build/common/cm.mak
index f3370716b..128fd654c 100755
--- a/build/common/cm.mak
+++ b/build/common/cm.mak
@@ -32,20 +32,10 @@ I_OPTS+=-I$(EG_DIR) -I$(SZ_DIR) -I$(CZ_DIR)
 I_OPTS+=-I$(ROOT_DIR)/src/du_app
 I_OPTS+=-I$(ROOT_DIR)/src/codec_utils/common
 
-#-------------------------------------------------------------#
-#User macros (to be modified)
-#-------------------------------------------------------------#
-#CCrmFLAGS=-DLRM_LWLC -DRMU_LWLC -URMU_NPLC -DRGM_LWLC -DLWLCSMRMMILRM -DLCSMRMMILRM -DSM -DRM_INTF
-#CCnlFlags=-DLWLCSMSONILNL -DNLU_LWLC -DLCSMSONILNL -DNLU_TC -DTCSMSONILNL -DNL
-#CCcmFLAGS=-DSS_MT_TMR -DSS_FLOAT  -DRGR_V1 -DLSZV1 -DVE_SB_SCTP $(CCrmFLAGS)
-#CCsmFLAGS=-DHI -DSB -DEG -DWR -DKW -DKW_PDCP -DPJ -DSZ -DYS -DRG -DNH -UVE_SM_LOG_TO_FILE -DRGR_SI_SCH -DTA_NEW -DSI_NEW -DCZ $(CCrmFLAGS) $(CCnlFlags)
-
 #-------------------------------------------------------------#
 # Define all the layers that are part of this binary so that  #
 # their coupling requirements get defined from envopt.h.      #
 #-------------------------------------------------------------#
-# TODO -DRM has conflict with some cm_atm files. It is temp-  #
-# orarily removed from this list.                             #
 MOD_FLAGS=-DNH -DWR -DNX -DSZ -DCZ -DSB -DHI -DEG -DSM -DNL -DSM -DRG -DKW -DYS
 #This module does not support binary logging so disable it
 TEXT_LOG=YES
@@ -89,4 +79,6 @@ clean:
 	@echo -e "$(COLOR_RED) $(REVERT_COLOR)"
 	$(Q)\rm -f $(LIB_DIR)/libcm.a $(C_OBJS_WO_LOG)
 
-
+#**********************************************************************
+#         End of file
+#**********************************************************************
diff --git a/build/common/compile.mak b/build/common/compile.mak
index 0af6203d7..9ff5c9316 100644
--- a/build/common/compile.mak
+++ b/build/common/compile.mak
@@ -14,29 +14,6 @@
 #   limitations under the License.                                             #
 ################################################################################
 
-#/********************************************************************16**
-#
-#       Name:   gNodeB Sample Application
-#
-#       Type:   make file
-#
-#       Desc:   Compile, assemble and link product software for
-#               various configurations. Further comments are
-#               embedded in the file. 
-#
-#               This file supports a variety of environments and
-#               build targets. The default build target will be the
-#               portable target for the Linu 2.4.x with GNU C(gcc)
-#
-#       Env:    Linux 2.4.x with GNU C (gcc)
-#
-#       File:  compile.mak
-#
-#********************************************************************21*/
-#=======================================================================
-
-STOPTS=-DENB 
-
 Q=
 S=
 # Check for verbose build
@@ -91,9 +68,6 @@ ALL_FLAGS=$(SS_FLAGS) $(CMN_FLAGS) $(ENV_FLAGS) $(RVW_FLAGS) $(TENB_FLAGS) $(LNX
 C_OPTS+=-g -pipe -Wall -Wno-comment -Wshadow \
     -Wcast-qual -fno-strict-aliasing -fsigned-char --std=c99
 
-COPTS_WO_PEDANTIC=-g -O3 -pipe -Wall -Werror -Wno-comment -Wshadow \
-    -Wcast-qual -fno-strict-aliasing -fsigned-char --std=c99
-
 COPTS_WO_WERROR=-g -O3 -pipe -pedantic -Wall -Wno-comment -Wshadow \
     -Wcast-qual -fno-strict-aliasing -fsigned-char --std=c99
 
@@ -115,11 +89,6 @@ $(C_WO_WERR_OBJS):$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c $(HDR_FILES)
 	$(Q)$(CC) -c -o $@ $(COPTS_WO_WERROR) $(I_OPTS) $(ALL_FLAGS) $(TEXT_LOGGING) $(MOD_FLAGS) \
     $(PLTFRM_FLAGS) $<
 
-$(C_WO_PED_OBJS):$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c $(HDR_FILES)
-	@echo -e "Compiling $(COLOR_RED) $< $(REVERT_COLOR)"
-	$(Q)$(CC) -c -o $@ $(COPTS_WO_PEDANTIC) $(I_OPTS) $(ALL_FLAGS) $(TEXT_LOGGING) $(MOD_FLAGS) \
-    $(PLTFRM_FLAGS) $<
-
 $(CPP_OBJS):$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp $(HDR_FILES)
 	@echo -e "Compiling $(COLOR_RED) $< $(REVERT_COLOR)"
 	$(Q)$(CC) -c -o $@ $(CPP_OPTS) $(I_OPTS) $(ALL_FLAGS) $(TEXT_LOGGING) $(MOD_FLAGS) \
@@ -130,13 +99,11 @@ $(C_OBJS_WO_LOG):$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c $(HDR_FILES)
 	$(Q)$(CC) -c -o $@ $(C_OPTS) $(I_OPTS) $(ALL_FLAGS) $(TEXT_LOGGING) $(MOD_FLAGS) \
     $(PLTFRM_FLAGS) $<
 
-$(C_WO_PED_OBJS_WO_LOG):$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c $(HDR_FILES)
-	@echo -e "Compiling $(COLOR_RED) $< $(REVERT_COLOR)"
-	$(Q)$(CC) -c -o $@ $(COPTS_WO_PEDANTIC) $(I_OPTS) $(ALL_FLAGS) $(TEXT_LOGGING) $(MOD_FLAGS) \
-    $(PLTFRM_FLAGS) $<
-
 $(CPP_OBJS_WO_LOG):$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp $(HDR_FILES)
 	@echo -e "Compiling $(COLOR_RED) $< $(REVERT_COLOR)"
 	$(Q)$(CC) -c -o $@ $(CPP_OPTS) $(I_OPTS) $(ALL_FLAGS) $(TEXT_LOGGING) $(MOD_FLAGS) \
     $(PLTFRM_FLAGS) $<
 
+#**********************************************************************
+#         End of file
+#**********************************************************************
diff --git a/build/common/cu_stub.mak b/build/common/cu_stub.mak
index 431398902..b95ec585a 100755
--- a/build/common/cu_stub.mak
+++ b/build/common/cu_stub.mak
@@ -23,9 +23,6 @@ COLOR=$(COLOR_RED)
 SRC_DIR=$(ROOT_DIR)/src/cu_stub/
 C_SRCS=$(wildcard $(SRC_DIR)/*.c)
 C_OBJS=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(C_SRCS))
-LOG_FILES=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i,$(C_SRCS))
-BAK_FILES=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i.bak,$(C_SRCS))
-DB_FILES =$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i.db,$(C_SRCS))
 
 # prepare the list of common header files
 HDR_FILES+=$(wildcard $(CM_DIR)/env*.[hx])
@@ -45,9 +42,9 @@ I_OPTS+=-I$(ROOT_DIR)/src/codec_utils/RRC
 #-------------------------------------------------------------#
 #Linker macros
 #-------------------------------------------------------------#
-$(LIB_DIR)/libcu.a:$(C_OBJS) $(C_WO_PED_OBJS)
+$(LIB_DIR)/libcu.a:$(C_OBJS) 
 		  @echo -e "Creating Archive $(COLOR) $@ $(REVERT_COLOR)"
-		  $(Q)ar -cr $(LIB_DIR)/libcu.a $(C_OBJS) $(C_WO_PED_OBJS)
+		  $(Q)ar -cr $(LIB_DIR)/libcu.a $(C_OBJS)
 
 #-------------------------------------------------------------#
 #Clean macros
@@ -55,5 +52,8 @@ $(LIB_DIR)/libcu.a:$(C_OBJS) $(C_WO_PED_OBJS)
 clean:
 		  @echo -e "$(COLOR_RED)Cleaning CU STUB$(REVERT_COLOR)"
 		  @echo $(SRC_DIR) $(CM_DIR)
-		  $(Q)\rm -f $(LIB_DIR)/libcu.a $(C_OBJS) $(C_WO_PED_OBJS) $(LOG_FILES) $(BAK_FILES)
+		  $(Q)\rm -f $(LIB_DIR)/libcu.a $(C_OBJS) 
 
+#**********************************************************************
+#         End of file
+#**********************************************************************
diff --git a/build/common/du_app.mak b/build/common/du_app.mak
index 43151c0c1..d194a0eab 100644
--- a/build/common/du_app.mak
+++ b/build/common/du_app.mak
@@ -23,9 +23,6 @@ COLOR=$(COLOR_RED)
 SRC_DIR=$(ROOT_DIR)/src/du_app/
 C_SRCS=$(wildcard $(SRC_DIR)/*.c)
 C_OBJS=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(C_SRCS))
-LOG_FILES=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i,$(C_SRCS))
-BAK_FILES=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i.bak,$(C_SRCS))
-DB_FILES =$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i.db,$(C_SRCS))
 
 # prepare the list of common header files
 HDR_FILES+=$(wildcard $(CM_DIR)/env*.[hx])
@@ -47,9 +44,9 @@ I_OPTS+=-I$(ROOT_DIR)/src/codec_utils/E2AP
 #-------------------------------------------------------------#
 #Linker macros
 #-------------------------------------------------------------#
-$(LIB_DIR)/libduapp.a:$(C_OBJS) $(C_WO_PED_OBJS)
+$(LIB_DIR)/libduapp.a:$(C_OBJS)
 		  @echo -e "Creating Archive $(COLOR) $@ $(REVERT_COLOR)"
-		  $(Q)ar -cr $(LIB_DIR)/libduapp.a $(C_OBJS) $(C_WO_PED_OBJS)
+		  $(Q)ar -cr $(LIB_DIR)/libduapp.a $(C_OBJS) 
 
 #-------------------------------------------------------------#
 #Clean macros
@@ -57,5 +54,8 @@ $(LIB_DIR)/libduapp.a:$(C_OBJS) $(C_WO_PED_OBJS)
 clean:
 		  @echo -e "$(COLOR_RED)Cleaning DU APP$(REVERT_COLOR)"
 		  @echo $(SRC_DIR) $(CM_DIR)
-		  $(Q)\rm -f $(LIB_DIR)/libduapp.a $(C_OBJS) $(C_WO_PED_OBJS) $(LOG_FILES) $(BAK_FILES)
+		  $(Q)\rm -f $(LIB_DIR)/libduapp.a $(C_OBJS) 
 
+#**********************************************************************
+#         End of file
+#**********************************************************************
diff --git a/build/common/env.mak b/build/common/env.mak
index 700ed6076..56277c69f 100644
--- a/build/common/env.mak
+++ b/build/common/env.mak
@@ -14,29 +14,6 @@
 #   limitations under the License.                                             #
 ################################################################################
 
-#*********************************************************************17*/
-#
-#       Name:   gNodeB Sample Application
-#
-#       Type:   make file
-#
-#       Desc:   Compile, assemble and link product software for
-#               various configurations. Further comments are
-#               embedded in the file. 
-#
-#               This file supports a variety of environments and
-#               build targets. The default build target will be the
-#               portable target for the Linu 2.4.x with GNU C(gcc)
-#
-#       Env:    Linux 2.4.x with GNU C (gcc)
-#
-#       File:   env.mak
-#
-#********************************************************************21*/
-#=======================================================================
-
-STOPTS=-DENB 
-
 Q=
 S=
 # Check for verbose build
@@ -80,3 +57,7 @@ export EXT_LIB_DIR
 CMENBE2EOPTS += $(RLOG_OPTS_TEXT)
 
 L_OPTS = -lrt -lm -lpthread -lpcap -lstdc++  -L $(LIB_ROOT)
+
+#**********************************************************************
+#         End of file
+#**********************************************************************
diff --git a/build/common/f1ap.mak b/build/common/f1ap.mak
deleted file mode 100755
index f1946ef17..000000000
--- a/build/common/f1ap.mak
+++ /dev/null
@@ -1,62 +0,0 @@
-################################################################################
-#   Copyright (c) [2017-2019] [Radisys]                                        #
-#                                                                              #
-#   Licensed under the Apache License, Version 2.0 (the "License");            #
-#   you may not use this file except in compliance with the License.           #
-#   You may obtain a copy of the License at                                    #
-#                                                                              #
-#       http://www.apache.org/licenses/LICENSE-2.0                             #
-#                                                                              #
-#   Unless required by applicable law or agreed to in writing, software        #
-#   distributed under the License is distributed on an "AS IS" BASIS,          #
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-#   See the License for the specific language governing permissions and        #
-#   limitations under the License.                                             #
-################################################################################
-
-# This is makefile for DU APP
-
-include ../common/rsys_fancy.mak
-include ../common/env.mak
-COLOR=$(COLOR_RED)
-
-SRC_DIR=$(ROOT_DIR)/src/du_app/F1AP
-C_SRCS=$(wildcard $(SRC_DIR)/*.c)
-C_OBJS=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(C_SRCS))
-LOG_FILES=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i,$(C_SRCS))
-BAK_FILES=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i.bak,$(C_SRCS))
-DB_FILES =$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i.db,$(C_SRCS))
-
-# prepare the list of common header files
-HDR_FILES+=$(wildcard $(CM_DIR)/env*.[hx])
-HDR_FILES+=$(wildcard $(CM_DIR)/gen*.[hx])
-HDR_FILES+=$(wildcard $(CM_DIR)/ssi*.[hx])
-HDR_FILES+=$(wildcard $(CM_DIR)/cm*.[hx])
-HDR_FILES+=$(wildcard $(CM_DIR)/lkw*.[hx])
-HDR_FILES+=$(wildcard $(CM_DIR)/lrg*.[hx])
-
-
-lib: $(LIB_DIR)/libf1ap.a
-include $(COM_BUILD_DIR)/compile.mak
-
-I_OPTS+=-I$(ROOT_DIR)/src/mt
-I_OPTS+=-I$(ROOT_DIR)/src/du_app
-I_OPTS+=-I$(ROOT_DIR)/src/cu_stub #TODO: Remove this dependency
-I_OPTS+=-I$(ROOT_DIR)/src/du_app/F1AP/asn
-
-
-#-------------------------------------------------------------#
-#Linker macros
-#-------------------------------------------------------------#
-$(LIB_DIR)/libf1ap.a:$(C_OBJS) $(C_WO_PED_OBJS)
-		  @echo -e "Creating Archive $(COLOR) $@ $(REVERT_COLOR)"
-		  $(Q)ar -cr $(LIB_DIR)/libf1ap.a $(C_OBJS) $(C_WO_PED_OBJS)
-
-#-------------------------------------------------------------#
-#Clean macros
-#-------------------------------------------------------------#
-clean:
-		  @echo -e "$(COLOR_RED)Cleaning F1AP$(REVERT_COLOR)"
-		  @echo $(SRC_DIR) $(CM_DIR)
-		  $(Q)\rm -f $(LIB_DIR)/libf1ap.a $(C_OBJS) $(C_WO_PED_OBJS) $(LOG_FILES) $(BAK_FILES)
-
diff --git a/build/common/mac.mak b/build/common/mac.mak
index 2c0f44edd..38899efad 100644
--- a/build/common/mac.mak
+++ b/build/common/mac.mak
@@ -14,9 +14,6 @@
 #   limitations under the License.                                             #
 ################################################################################
 
-##-------------------------------------------------------------#
-#Makefile for product RG - script generated.
-#-------------------------------------------------------------#
 include ../common/rsys_fancy.mak
 include ../common/env.mak
 COLOR=$(COLOR_GREEN)
@@ -74,3 +71,6 @@ clean:
 	@echo -e "$(COLOR_RED)Cleaing MAC$(REVERT_COLOR)"
 	$(Q)\rm -f $(LIB_DIR)/librg.a $(C_OBJS)
 
+#**********************************************************************
+#         End of file
+#**********************************************************************
diff --git a/build/common/mt.mak b/build/common/mt.mak
index 81f94c4a7..3cf54ae64 100755
--- a/build/common/mt.mak
+++ b/build/common/mt.mak
@@ -52,89 +52,6 @@ I_OPTS+=-isystem $(BSPPATH)/usr/include/brcm
 I_OPTS+=-I$(SRC_DIR)/security
 I-OPTS+=-I$(ROOT_DIR)/src/wls_lib
 
-
-#mtSRCS= \
-#	$(IN_DIR)/mt_id.c\
-#	$(IN_DIR)/mt_ss.c\
-#	$(IN_DIR)/ss_gen.c\
-#	$(IN_DIR)/ss_id.c\
-#	$(IN_DIR)/ss_mem.c\
-#	$(IN_DIR)/ss_msg.c\
-#	$(IN_DIR)/ss_pack.c\
-#	$(IN_DIR)/ss_queue.c\
-#	$(IN_DIR)/ss_strm.c\
-#	$(IN_DIR)/ss_task.c\
-#	$(IN_DIR)/ss_drvr.c\
-#	$(IN_DIR)/ss_timer.c\
-#	$(IN_DIR)/ss_diag.c
-#ifeq (${BLDENV},lnx_e2e_ms)
-#	mtSRCS+=$(IN_DIR)/mt_4gmx.c
-#else
-#ifeq (${BLDENV},lnx_ms_withoutdiag)
-#	mtSRCS+=$(IN_DIR)/mt_4gmx.c
-#endif
-#endif
-#ifeq ($(BLDENV),lnx_e2e_bc)
-#	mtSRCS+=$(IN_DIR)/bc_cpu_overload.c
-#	mtSRCS+=$(IN_DIR)/bc_icpu_snd.c
-#	mtSRCS+=$(IN_DIR)/bc_icpu_rcv.c
-#	mtSRCS+=$(IN_DIR)/bc_cpu_init.c
-#	mtSRCS+=$(IN_DIR)/rb_log.c
-#	mtSRCS+=$(IN_DIR)/ss_rbuf.c
-#	mtSRCS+=$(IN_DIR)/bc_free_mgr.c
-#	mtSRCS+=$(IN_DIR)/bc_batch_mgr.c
-#else
-#	mtSRCS+=$(IN_DIR)/bc_cpu_overload.c
-#	mtSRCS+=$(IN_DIR)/bc_icpu_snd.c
-#	mtSRCS+=$(IN_DIR)/bc_icpu_rcv.c
-#	mtSRCS+=$(IN_DIR)/bc_cpu_init.c
-#	mtSRCS+=$(IN_DIR)/rb_log.c
-#	mtSRCS+=$(IN_DIR)/ss_rbuf.c
-#	mtSRCS+=$(IN_DIR)/bc_free_mgr.c
-#	mtSRCS+=$(IN_DIR)/bc_batch_mgr.c
-#endif
-#
-#mtOBJS= \
-#	$(OUT_DIR)/mt_id.$(OBJ)\
-#	$(OUT_DIR)/mt_ss.$(OBJ)\
-#	$(OUT_DIR)/ss_gen.$(OBJ)\
-#	$(OUT_DIR)/ss_id.$(OBJ)\
-#	$(OUT_DIR)/ss_mem.$(OBJ)\
-#	$(OUT_DIR)/ss_msg.$(OBJ)\
-#	$(OUT_DIR)/ss_pack.$(OBJ)\
-#	$(OUT_DIR)/ss_queue.$(OBJ)\
-#	$(OUT_DIR)/ss_strm.$(OBJ)\
-#	$(OUT_DIR)/ss_task.$(OBJ)\
-#	$(OUT_DIR)/ss_drvr.$(OBJ)\
-#	$(OUT_DIR)/ss_timer.$(OBJ)\
-#	$(OUT_DIR)/ss_diag.$(OBJ)
-#ifeq (${BLDENV},lnx_e2e_ms)
-#	mtOBJS+=$(OUT_DIR)/mt_4gmx.$(OBJ)
-#else
-#ifeq (${BLDENV},lnx_ms_withoutdiag)
-#	mtOBJS+=$(OUT_DIR)/mt_4gmx.$(OBJ)
-#endif
-#endif
-#ifeq ($(BLDENV),lnx_e2e_bc)
-#	mtOBJS+=$(OUT_DIR)/bc_cpu_overload.$(OBJ)
-#	mtOBJS+=$(OUT_DIR)/bc_icpu_snd.$(OBJ)
-#	mtOBJS+=$(OUT_DIR)/bc_icpu_rcv.$(OBJ)
-#	mtOBJS+=$(OUT_DIR)/bc_cpu_init.$(OBJ)
-#	mtOBJS+=$(OUT_DIR)/rb_log.$(OBJ)
-#	mtOBJS+=$(OUT_DIR)/ss_rbuf.$(OBJ)
-#	mtOBJS+=$(OUT_DIR)/bc_free_mgr.$(OBJ)
-#	mtOBJS+=$(OUT_DIR)/bc_batch_mgr.$(OBJ)
-#else
-#	mtOBJS+=$(OUT_DIR)/bc_cpu_overload.$(OBJ)
-#	mtOBJS+=$(OUT_DIR)/bc_icpu_snd.$(OBJ)
-#	mtOBJS+=$(OUT_DIR)/bc_icpu_rcv.$(OBJ)
-#	mtOBJS+=$(OUT_DIR)/bc_cpu_init.$(OBJ)
-#	mtOBJS+=$(OUT_DIR)/rb_log.$(OBJ)
-#	mtOBJS+=$(OUT_DIR)/ss_rbuf.$(OBJ)
-#	mtOBJS+=$(OUT_DIR)/bc_free_mgr.$(OBJ)
-#	mtOBJS+=$(OUT_DIR)/bc_batch_mgr.$(OBJ)
-#endif
-
 HDR_FILES+=$(wildcard $(CM_DIR)/env*.[hx])
 HDR_FILES+=$(wildcard $(CM_DIR)/gen*.[hx])
 HDR_FILES+=$(wildcard $(CM_DIR)/ssi*.[hx])
@@ -142,102 +59,6 @@ HDR_FILES+=$(wildcard $(CM_DIR)/cm*.[hx])
 HDR_FILES+=$(wildcard $(SRC_DIR)/*.[hx])
 HDR_FILES+=$(wildcard $(SRC_DIR)/*.[hx])
 
-#ifeq ($(BLDENV),lnx_e2e_bc)
-#	MT_INC+=$(IN_DIR)/bc_icpu.h
-#	MT_INC+=$(IN_DIR)/bc_cpu_init.h
-#        MT_INC+=$(IN_DIR)/rb_log.x 
-#        MT_INC+=$(IN_DIR)/rb_log.h
-#        MT_INC+=$(IN_DIR)/bc_cpu_overload.h
-#else
-#	MT_INC+=$(IN_DIR)/bc_icpu.h
-#	MT_INC+=$(IN_DIR)/bc_cpu_init.h
-#        MT_INC+=$(IN_DIR)/rb_log.x 
-#        MT_INC+=$(IN_DIR)/rb_log.h
-#        MT_INC+=$(IN_DIR)/bc_cpu_overload.h
-#endif
-
-#ALL_INC=$(MT_INC) $(CM_INC)
-
-#-------------------------------------------------------------#
-#Compiler macros             
-#-------------------------------------------------------------#
-#Compiler macros             
-#-------------------------------------------------------------#
-#$(OUT_DIR)/mt_id.$(OBJ): $(IN_DIR)/mt_id.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/mt_id.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/mt_id.c
-#$(OUT_DIR)/mt_ss.$(OBJ): $(IN_DIR)/mt_ss.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/mt_ss.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/mt_ss.c
-#ifeq (${BLDENV},lnx_e2e_ms)
-#$(OUT_DIR)/mt_4gmx.$(OBJ): $(IN_DIR)/mt_4gmx.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/mt_4gmx.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/mt_4gmx.c
-#else
-#ifeq (${BLDENV},lnx_ms_withoutdiag)
-#$(OUT_DIR)/mt_4gmx.$(OBJ): $(IN_DIR)/mt_4gmx.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/mt_4gmx.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/mt_4gmx.c
-#endif
-#endif
-#
-#ifeq ($(BLDENV),lnx_e2e_bc)
-#$(OUT_DIR)/bc_cpu_overload.$(OBJ): $(IN_DIR)/bc_cpu_overload.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/bc_cpu_overload.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/bc_cpu_overload.c
-#$(OUT_DIR)/bc_icpu_snd.$(OBJ): $(IN_DIR)/bc_icpu_snd.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/bc_icpu_snd.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/bc_icpu_snd.c
-#$(OUT_DIR)/bc_icpu_rcv.$(OBJ): $(IN_DIR)/bc_icpu_rcv.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/bc_icpu_rcv.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/bc_icpu_rcv.c
-#$(OUT_DIR)/bc_cpu_init.$(OBJ): $(IN_DIR)/bc_cpu_init.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/bc_cpu_init.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/bc_cpu_init.c
-#$(OUT_DIR)/rb_log.$(OBJ): $(IN_DIR)/rb_log.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/rb_log.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/rb_log.c
-#$(OUT_DIR)/ss_rbuf.$(OBJ): $(IN_DIR)/ss_rbuf.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/ss_rbuf.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/ss_rbuf.c
-#$(OUT_DIR)/bc_free_mgr.$(OBJ): $(IN_DIR)/bc_free_mgr.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/bc_free_mgr.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/bc_free_mgr.c
-#$(OUT_DIR)/bc_batch_mgr.$(OBJ): $(IN_DIR)/bc_batch_mgr.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/bc_batch_mgr.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/bc_batch_mgr.c
-#else
-#$(OUT_DIR)/bc_cpu_overload.$(OBJ): $(IN_DIR)/bc_cpu_overload.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/bc_cpu_overload.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/bc_cpu_overload.c
-#$(OUT_DIR)/bc_icpu_snd.$(OBJ): $(IN_DIR)/bc_icpu_snd.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/bc_icpu_snd.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/bc_icpu_snd.c
-#$(OUT_DIR)/bc_icpu_rcv.$(OBJ): $(IN_DIR)/bc_icpu_rcv.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/bc_icpu_rcv.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/bc_icpu_rcv.c
-#$(OUT_DIR)/bc_cpu_init.$(OBJ): $(IN_DIR)/bc_cpu_init.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/bc_cpu_init.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/bc_cpu_init.c
-#$(OUT_DIR)/rb_log.$(OBJ): $(IN_DIR)/rb_log.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/rb_log.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/rb_log.c
-#$(OUT_DIR)/ss_rbuf.$(OBJ): $(IN_DIR)/ss_rbuf.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/ss_rbuf.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/ss_rbuf.c
-#$(OUT_DIR)/bc_free_mgr.$(OBJ): $(IN_DIR)/bc_free_mgr.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/bc_free_mgr.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/bc_free_mgr.c
-#$(OUT_DIR)/bc_batch_mgr.$(OBJ): $(IN_DIR)/bc_batch_mgr.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/bc_batch_mgr.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/bc_batch_mgr.c
-#endif
-#$(OUT_DIR)/ss_drvr.$(OBJ): $(IN_DIR)/ss_drvr.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/ss_drvr.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/ss_drvr.c
-#$(OUT_DIR)/ss_gen.$(OBJ): $(IN_DIR)/ss_gen.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/ss_gen.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/ss_gen.c
-#$(OUT_DIR)/ss_id.$(OBJ): $(IN_DIR)/ss_id.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/ss_id.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/ss_id.c
-#$(OUT_DIR)/ss_mem.$(OBJ): $(IN_DIR)/ss_mem.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/ss_mem.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/ss_mem.c
-#$(OUT_DIR)/ss_msg.$(OBJ): $(IN_DIR)/ss_msg.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/ss_msg.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/ss_msg.c
-#$(OUT_DIR)/ss_pack.$(OBJ): $(IN_DIR)/ss_pack.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/ss_pack.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/ss_pack.c
-#$(OUT_DIR)/ss_queue.$(OBJ): $(IN_DIR)/ss_queue.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/ss_queue.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/ss_queue.c
-#$(OUT_DIR)/ss_rtr.$(OBJ): $(IN_DIR)/ss_rtr.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/ss_rtr.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/ss_rtr.c
-#$(OUT_DIR)/ss_strm.$(OBJ): $(IN_DIR)/ss_strm.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/ss_strm.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/ss_strm.c
-##$(OUT_DIR)/ss_task.$(OBJ): $(IN_DIR)/ss_task.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/ss_task.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/ss_task.c
-#$(OUT_DIR)/ss_timer.$(OBJ): $(IN_DIR)/ss_timer.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/ss_timer.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/ss_timer.c
-#$(OUT_DIR)/ss_diag.$(OBJ): $(IN_DIR)/ss_diag.c $(ALL_INC)
-#	$(CC) -c -o $(OUT_DIR)/ss_diag.o $(COPTS) $(IOPTS) $(POPTS) $(CCmtFLAGS) $(IN_DIR)/ss_diag.c
-#
-
 lib:$(LIB_DIR)/libmt.a
 
 include $(COM_BUILD_DIR)/compile.mak
@@ -255,4 +76,6 @@ clean:
 	@echo -e "$(COLOR_RED)Cleaning SSI from $(OBJ_DIR)$(REVERT_COLOR)"
 	$(Q)\rm -f $(LIB_DIR)/libmt.a $(C_OBJS_WO_LOG)
 
-
+#**********************************************************************
+#         End of file
+#**********************************************************************
diff --git a/build/common/phy_stub.mak b/build/common/phy_stub.mak
index 4d03698af..1723b5706 100755
--- a/build/common/phy_stub.mak
+++ b/build/common/phy_stub.mak
@@ -23,9 +23,6 @@ COLOR=$(COLOR_RED)
 SRC_DIR=$(ROOT_DIR)/src/phy_stub/
 C_SRCS=$(wildcard $(SRC_DIR)/*.c)
 C_OBJS=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(C_SRCS))
-LOG_FILES=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i,$(C_SRCS))
-BAK_FILES=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i.bak,$(C_SRCS))
-DB_FILES =$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i.db,$(C_SRCS))
 
 # prepare the list of common header files
 HDR_FILES+=$(wildcard $(CM_DIR)/env*.[hx])
@@ -47,9 +44,9 @@ I_OPTS+=-I$(ROOT_DIR)/src/intel_fapi
 #-------------------------------------------------------------#
 #Linker macros
 #-------------------------------------------------------------#
-$(LIB_DIR)/libphystub.a:$(C_OBJS) $(C_WO_PED_OBJS)
+$(LIB_DIR)/libphystub.a:$(C_OBJS)
 		  @echo -e "Creating Archive $(COLOR) $@ $(REVERT_COLOR)"
-		  $(Q)ar -cr $(LIB_DIR)/libphystub.a $(C_OBJS) $(C_WO_PED_OBJS)
+		  $(Q)ar -cr $(LIB_DIR)/libphystub.a $(C_OBJS) 
 
 #-------------------------------------------------------------#
 #Clean macros
@@ -58,5 +55,8 @@ clean:
 		  @echo $(OAM_ENABLE)
 		  @echo -e "$(COLOR_RED)Cleaning PHY stub$(REVERT_COLOR)"
 		  @echo $(SRC_DIR) $(CM_DIR)
-		  $(Q)\rm -f $(LIB_DIR)/libphystub.a $(C_OBJS) $(C_WO_PED_OBJS) $(LOG_FILES) $(BAK_FILES)
+		  $(Q)\rm -f $(LIB_DIR)/libphystub.a $(C_OBJS) 
 
+#**********************************************************************
+#         End of file
+#**********************************************************************
diff --git a/build/common/ric_stub.mak b/build/common/ric_stub.mak
index 6d4348105..bf2f94fea 100644
--- a/build/common/ric_stub.mak
+++ b/build/common/ric_stub.mak
@@ -23,9 +23,6 @@ COLOR=$(COLOR_RED)
 SRC_DIR=$(ROOT_DIR)/src/ric_stub/
 C_SRCS=$(wildcard $(SRC_DIR)/*.c)
 C_OBJS=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(C_SRCS))
-LOG_FILES=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i,$(C_SRCS))
-BAK_FILES=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i.bak,$(C_SRCS))
-DB_FILES =$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.i.db,$(C_SRCS))
 
 # prepare the list of common header files
 HDR_FILES+=$(wildcard $(CM_DIR)/env*.[hx])
@@ -44,9 +41,9 @@ I_OPTS+=-I$(ROOT_DIR)/src/codec_utils/E2AP
 #-------------------------------------------------------------#
 #Linker macros
 #-------------------------------------------------------------#
-$(LIB_DIR)/libric.a:$(C_OBJS) $(C_WO_PED_OBJS)
+$(LIB_DIR)/libric.a:$(C_OBJS)
 		  @echo -e "Creating Archive $(COLOR) $@ $(REVERT_COLOR)"
-		  $(Q)ar -cr $(LIB_DIR)/libric.a $(C_OBJS) $(C_WO_PED_OBJS)
+		  $(Q)ar -cr $(LIB_DIR)/libric.a $(C_OBJS) 
 
 #-------------------------------------------------------------#
 #Clean macros
@@ -54,5 +51,8 @@ $(LIB_DIR)/libric.a:$(C_OBJS) $(C_WO_PED_OBJS)
 clean:
 		  @echo -e "$(COLOR_RED)Cleaning RIC STUB$(REVERT_COLOR)"
 		  @echo $(SRC_DIR) $(CM_DIR)
-		  $(Q)\rm -f $(LIB_DIR)/libric.a $(C_OBJS) $(C_WO_PED_OBJS) $(LOG_FILES) $(BAK_FILES)
+		  $(Q)\rm -f $(LIB_DIR)/libric.a $(C_OBJS)
 
+#**********************************************************************
+#         End of file
+#**********************************************************************
diff --git a/build/common/rl.mak b/build/common/rl.mak
index 1212f6ce1..b2285e008 100755
--- a/build/common/rl.mak
+++ b/build/common/rl.mak
@@ -42,20 +42,6 @@ C_OBJS_WO_LOG=$(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(C_SRCS))
 #-------------------------------------------------------------#
 rlPOSTPROCOPTS=-DSS_LINUX -DUSE_RLOG_DATA_TYPES
 
-#-------------------------------------------------------------#
-#-------------------------------------------------------------#
-#Compiler macros             
-#-------------------------------------------------------------#
-#$(OBJ_DIR)/rl_rlog.$(OBJ):$(rlSRCS)
-#	@echo -e "Compiling $(COLOR) $< $(REVERT_COLOR)..."
-#	$(Q) $(CC) -c $(COPTS) $(IOPTS) $(POPTS) $(IN_DIR)/rl_rlog.$(SRC) -rdynamic -o $(OBJ_DIR)/rl_rlog.$(OBJ)
-#$(OBJ_DIR)/rl_common.$(OBJ):$(rlSRCS)
-#	@echo -e "Compiling $(COLOR) $< $(REVERT_COLOR)..."
-#	$(Q) $(CC) -c $(COPTS) $(IOPTS) $(POPTS) $(IN_DIR)/rl_common.$(SRC) -o $(OBJ_DIR)/rl_common.$(OBJ)
-#$(OBJ_DIR)/rl_platform.$(OBJ):$(rlSRCS)
-#	@echo -e "Compiling $(COLOR) $< $(REVERT_COLOR)..."
-#	$(Q) $(CC) -c $(COPTS) $(IOPTS) $(POPTS) $(IN_DIR)/rl_platform.$(SRC) -o $(OBJ_DIR)/rl_platform.$(OBJ)
-
 lib:$(LIB_DIR)/librl.a
 
 include $(COM_BUILD_DIR)/compile.mak
@@ -76,5 +62,6 @@ clean:
 	@echo -e "$(COLOR_RED)Clearing binary logging$(REVERT_COLOR)"
 	$(Q)rm -f $(LIB_DIR)/librl.a $(C_OBJS_WO_LOG)
 
-
-
+#**********************************************************************
+#         End of file
+#**********************************************************************
diff --git a/build/common/kw.mak b/build/common/rlc.mak
similarity index 93%
rename from build/common/kw.mak
rename to build/common/rlc.mak
index cb44684ce..b48962acd 100644
--- a/build/common/kw.mak
+++ b/build/common/rlc.mak
@@ -52,3 +52,6 @@ clean:
 	@echo -e "$(COLOR_RED)Cleaning RLC$(REVERT_COLOR)"
 	$(Q)\rm -f $(LIB_DIR)/libkw.a $(C_OBJS)
 
+#**********************************************************************
+#         End of file
+#**********************************************************************
diff --git a/build/common/rsys_fancy.mak b/build/common/rsys_fancy.mak
index 8eb3a835c..c0b766854 100644
--- a/build/common/rsys_fancy.mak
+++ b/build/common/rsys_fancy.mak
@@ -47,3 +47,6 @@ export QUIET=@
 MK_QUIET=-s # Make works in quite mode
 endif
 
+#**********************************************************************
+#         End of file
+#**********************************************************************
diff --git a/build/common/sch.mak b/build/common/sch.mak
index a6c0797cd..f40349773 100644
--- a/build/common/sch.mak
+++ b/build/common/sch.mak
@@ -71,3 +71,6 @@ clean:
 	@echo -e "$(COLOR_RED)Cleaing MAC$(REVERT_COLOR)"
 	$(Q)\rm -f $(LIB_DIR)/librg.a $(C_OBJS)
 
+#**********************************************************************
+#         End of file
+#**********************************************************************
diff --git a/build/odu/makefile b/build/odu/makefile
index d07491deb..dd6357366 100644
--- a/build/odu/makefile
+++ b/build/odu/makefile
@@ -95,7 +95,6 @@ export BUILD
 export I_OPTS
 
 # Add to the linker options the platform specific components
-#L_OPTS+=-lnsl -lrt -lm -lpthread -lsctp
 L_OPTS+=-lnsl -lrt -lm -lpthread -lsctp #-L/root/intel/phy/wls_lib/lib -lwls                         \
         -lhugetlbfs -lnuma -ldl -L/root/intel/dpdk-19.11/x86_64-native-linuxapp-gcc/lib             \
         -ldpdk -lrte_gso -lrte_pmd_atlantic -lrte_pmd_iavf -lrte_pmd_tap -lrte_acl                  \
@@ -182,8 +181,7 @@ du:
 		$(Q)$(MAKE) -f $(COM_BUILD_DIR)/asn_e2ap.mak OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
 		$(Q)$(MAKE) -f $(COM_BUILD_DIR)/asn_rrc.mak OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
 		$(Q)$(MAKE) -f $(COM_BUILD_DIR)/du_app.mak OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
-		#$(Q)$(MAKE) -f $(COM_BUILD_DIR)/f1ap.mak OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
-		$(Q)$(MAKE) -f $(COM_BUILD_DIR)/kw.mak OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
+		$(Q)$(MAKE) -f $(COM_BUILD_DIR)/rlc.mak OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
 		$(Q)$(MAKE) -f $(COM_BUILD_DIR)/cm.mak OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
 		$(Q)$(MAKE) -f $(COM_BUILD_DIR)/mac.mak OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
 		$(Q)$(MAKE) -f $(COM_BUILD_DIR)/sch.mak OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
@@ -201,7 +199,7 @@ clean_odu:
 		$(Q)$(MAKE) -f $(COM_BUILD_DIR)/asn_f1ap.mak clean OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
 		$(Q)$(MAKE) -f $(COM_BUILD_DIR)/asn_e2ap.mak clean OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
 		$(Q)$(MAKE) -f $(COM_BUILD_DIR)/asn_rrc.mak clean OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
-		$(Q)$(MAKE) -f $(COM_BUILD_DIR)/kw.mak clean OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
+		$(Q)$(MAKE) -f $(COM_BUILD_DIR)/rlc.mak clean OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
 		$(Q)$(MAKE) -f $(COM_BUILD_DIR)/cm.mak clean OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
 		$(Q)$(MAKE) -f $(COM_BUILD_DIR)/mac.mak clean OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
 		$(Q)$(MAKE) -f $(COM_BUILD_DIR)/sch.mak clean OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)'
@@ -292,3 +290,6 @@ odu: prepare_dirs copy_build
 cu_stub: prepare_cu_dirs cu link_cu
 ric_stub: prepare_ric_dirs ric link_ric
 
+#**********************************************************************
+#         End of file
+#**********************************************************************
diff --git a/docs/README b/docs/README
index c8ba9eb11..d14d72937 100644
--- a/docs/README
+++ b/docs/README
@@ -2,8 +2,8 @@ Directory Structure :
 ---------------------
 1. l2/build/ : contains files required to compile the code
    a. common : contains individual module's makefile
-   b. config : contains SSI memory configuration
-   c. odu    : contains main makefile to generate an executable binary
+   b. odu    : contains main makefile to generate an executable binary
+   c. scripts: contains scripts for logging
 
 2. l2/docs/  : contains README and other configuration files for building docs