diff --git a/ThirdParty/sw_services/xilopenamp/src/Makefile b/ThirdParty/sw_services/xilopenamp/src/Makefile
index 6ae7495c..a2586aad 100644
--- a/ThirdParty/sw_services/xilopenamp/src/Makefile
+++ b/ThirdParty/sw_services/xilopenamp/src/Makefile
@@ -33,65 +33,41 @@
 COMPILER=
 ARCHIVER=
 CP=cp
-COMPILER_FLAGS =
+COMPILER_FLAGS=
+EXTRA_COMPILER_FLAGS=
 EXTRA_ARCHIVE_FLAGS=rc
-CC_FLAGS= -mcpu=cortex-r5
+LIB=libxilopenamp.a
+
 RELEASEDIR=../../../lib
-#RELEASEDIR= .
 INCLUDEDIR=../../../include
-INCLUDES=-I./include/ -I${INCLUDEDIR}
+INCLUDES=-I./. -I${INCLUDEDIR}
+
 OPENAMP_DIR = .
+OUTS = *.o
 
-LIB_SRCS = $(OPENAMP_DIR)/config.c \
-          $(OPENAMP_DIR)/bm_env.c \
-          $(OPENAMP_DIR)/elf_loader.c \
-          $(OPENAMP_DIR)/hil.c \
-          $(OPENAMP_DIR)/llist.c \
-          $(OPENAMP_DIR)/remote_device.c \
-          $(OPENAMP_DIR)/remoteproc.c \
-          $(OPENAMP_DIR)/remoteproc_loader.c \
-          $(OPENAMP_DIR)/rpmsg.c \
-          $(OPENAMP_DIR)/rpmsg_core.c \
-          $(OPENAMP_DIR)/rpmsg_retarget.c\
-          $(OPENAMP_DIR)/rsc_table_parser.c \
-          $(OPENAMP_DIR)/sh_mem.c \
-          $(OPENAMP_DIR)/virtio.c \
-          $(OPENAMP_DIR)/virtqueue.c
-
-
-# create SECURE_SRCS based on configured options
-
-OPENAMP_SRCS = $(LIB_SRCS)
-
-OPENAMP_OBJS = $(OPENAMP_SRCS:%.c=%.o)
-
-
-EXPORT_INCLUDE_FILES:=*.h
+OPENAMP_SRCS := $(wildcard *.c)
+OPENAMP_OBJS = $(addprefix $(OPENAMP_DIR)/, $(OPENAMP_SRCS:%.c=%.o))
 
+INCLUDEFILES=*.h
 
 libs: libxilopenamp.a
-	cp libxilopenamp.a $(RELEASEDIR)
-	make clean
 
-include:
-	${CP} ${EXPORT_INCLUDE_FILES} ${INCLUDEDIR}
+libxilopenamp.a: print_msg_xilopenamp $(OPENAMP_OBJS)
+	$(ARCHIVER) $(EXTRA_ARCHIVE_FLAGS) ${RELEASEDIR}/${LIB} ${OUTS}
+
+print_msg_xilopenamp:
+	@echo "Compiling XilOpenAMP Library"
+
+.PHONY: include
+include: libxilopenamp_includes
+
+libxilopenamp_includes:
+	${CP} ${INCLUDEFILES} ${INCLUDEDIR}
 
 clean:
-	rm -rf obj/config.o obj/bm_env.o obj/rpmsg_retarget.o obj/elf_loader.o obj/hil.o obj/llist.o obj/remote_device.o obj/remoteproc.o obj/remoteproc_loader.o obj/rpmsg.o obj/rpmsg_core.o obj/rsc_table_parser.o obj/sh_mem.o obj/virtio.o obj/virtqueue.o
-	rmdir obj
-	rm libxilopenamp.a
+	rm -rf $(OPENAMP_DIR)/${OUTS}
+	rm -rf ${RELEASEDIR}/${LIB}
 
+$(OPENAMP_DIR)/%.o: $(OPENAMP_DIR)/%.c $(INCLUDEFILES)
+	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) -c $< -o $@
 
-libxilopenamp.a: obj_dir print_msg_secure_base $(OPENAMP_OBJS)
-	@echo "Creating archive $@"
-	$(ARCHIVER) $(EXTRA_ARCHIVE_FLAGS) $@ obj/config.o obj/bm_env.o obj/rpmsg_retarget.o obj/elf_loader.o obj/hil.o obj/llist.o obj/remote_device.o obj/remoteproc.o obj/remoteproc_loader.o obj/rpmsg.o obj/rpmsg_core.o obj/rsc_table_parser.o obj/sh_mem.o obj/virtio.o obj/virtqueue.o
-
-
-obj_dir:
-	mkdir obj
-
-print_msg_secure_base:
-	@echo "Compiling XilOpenAmp Library"
-
-.c.o:
-	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(CC_FLAGS) $(INCLUDES) -c $< -o obj/$(@F)