diff --git a/build.sh b/build.sh
index a918819..5212e7e 100755
--- a/build.sh
+++ b/build.sh
@@ -50,7 +50,12 @@ if [[ "${fronthaul_option}" == "jesd" ]]; then
     export BOARD_TYPE=${board_option}
     chmod +x build_jesd.sh
     source ./build_jesd.sh
-    cp ${RFIC_DIR}/librfic.a ${DIR_ROOT}/lib
+    cp ${RFIC_DIR}/out/rfic/*.a ${DIR_ROOT}/lib
+    cp ${RFIC_DIR}/out/rfic/*.h ${DIR_ROOT}/interface     
+    cp ${RFIC_DIR}/out/jesd/*.a ${DIR_ROOT}/lib    
+    cp ${RFIC_DIR}/out/jesd/*.h ${DIR_ROOT}/interface  
+    mkdir -p ${BUILD_DIR}
+    cp ${DIR_ROOT}/lib/*.a ${BUILD_DIR}/
 fi
 
 cd ${DIR_ROOT}/
diff --git a/makefile b/makefile
index 293d6a9..d6afa53 100644
--- a/makefile
+++ b/makefile
@@ -103,13 +103,13 @@ LIB_FILE := $(BUILD_DIR)/libmsgtransfer.a
 OBJ_FILES += $(foreach f,$(FINAL_SRCS_FILES),$(OBJ_DIR)/$(patsubst %.c,%.o,$(notdir $(f))))
 OBJ_MAIN_FILES += $(foreach f,$(MAIN_FILE),$(OBJ_MAIN_DIR)/$(patsubst %.c,%.o,$(notdir $(f))))
 
-ifeq ($(fronthaul_option),jesd)
+#ifeq ($(fronthaul_option),jesd)
 #OBJ_FILES += $(wildcard $(RFIC_DIR)/*.o)
-RFIC_OBJ_DIR := $(BUILD_DIR)/rfic_obj
-RFIC_OBJ_FILES := $(wildcard $(RFIC_OBJ_DIR)/*.o)
-else
-RFIC_OBJ_FILES := 
-endif
+#RFIC_OBJ_DIR := $(BUILD_DIR)/rfic_obj
+#RFIC_OBJ_FILES := $(wildcard $(RFIC_OBJ_DIR)/*.o)
+#else
+#RFIC_OBJ_FILES := 
+#endif
 
 # ==============================================================================
 # Rules: Compilation
@@ -143,7 +143,8 @@ $(BIN_FILE):$(OBJ_FILES) $(OBJ_MAIN_FILES)
 	$(CC) -o $@ $^ $(LD_FLAGS) $(patsubst %,-L %,$(LIB_DIRS))
 #	$(CC) -o $@ $^ $(LD_FLAGS) -T$(LINK_FILE)	
 
-$(LIB_FILE):$(OBJ_FILES) $(RFIC_OBJ_FILES)
+#$(LIB_FILE):$(OBJ_FILES) $(RFIC_OBJ_FILES)
+$(LIB_FILE):$(OBJ_FILES)
 #	@echo "# Creating lib directory $(LIB_DIR)"
 #	mkdir -p $(LIB_DIR)