diff --git a/ip/Pmods/PmodOLED_v1_0/drivers/PmodOLED_v1_0/src/Makefile b/ip/Pmods/PmodOLED_v1_0/drivers/PmodOLED_v1_0/src/Makefile
index bfd9c1f5..eb284263 100644
--- a/ip/Pmods/PmodOLED_v1_0/drivers/PmodOLED_v1_0/src/Makefile
+++ b/ip/Pmods/PmodOLED_v1_0/drivers/PmodOLED_v1_0/src/Makefile
@@ -12,15 +12,18 @@ INCLUDES=-I./. -I${INCLUDEDIR}
 INCLUDEFILES=*.h
 LIBSOURCES=*.c
 OUTS = *.o
+OBJECTS = $(addsuffix .o, $(basename $(wildcard *.c)))
+ASSEMBLY_OBJECTS = $(addsuffix .o, $(basename $(wildcard *.S)))
 
 libs:
 	echo "Compiling PmodOLED..."
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OBJECTS} ${ASSEMBLY_OBJECTS}
 	make clean
 
 include:
 	${CP} $(INCLUDEFILES) $(INCLUDEDIR)
 
 clean:
-	rm -rf ${OUTS}
+	rm -rf ${OBJECTS} 
+	rm -rf ${ASSEMBLY_OBJECTS}