made a load of stuff

2 files changed, 24 insertions, 14 deletions

diff --git a/comp/lucas-standen-NEA/code2/stdlib/Makefile b/comp/lucas-standen-NEA/code2/stdlib/Makefile
index c69992c..7d70f73 100644
--- a/comp/lucas-standen-NEA/code2/stdlib/Makefile
+++ b/comp/lucas-standen-NEA/code2/stdlib/Makefile
@@ -4,20 +4,21 @@ CFLAGS=-O3
 SRC = zpylib.c
 OBJ = ${SRC:.c=.o}
 
-all: zpy 
 
-.c.o:
-	${CC} -c ${CFLAGS} $<
+all:
+	${CC} -c ${SRC} -o ${OBJ} ${CFLAGS}
 	cd String && make
 install: all 
-	cp zpy /usr/local/bin/zpy
-	cd stdlib && make install
-	cd zpypkg && make install
+	mkdir -p /usr/local/share/zpylib
+	cp zpylib.o /usr/local/share/zpylib/
+	
+	mkdir -p /usr/local/share/zpylib/include
+	cp zpylib.h /usr/local/share/zpylib/include/
+	cd String && make install
 clean:
-	rm -rf zpy*.o
-	cd stdlib && make clean
-	cd examples && make clean
+	rm -rf *.o
+	cd String && make clean
 uninstall: 
-	rm /usr/local/bin/zpy
+	rm -rf /usr/local/share/zpylib
 
 .PHONY: all clean install uninstall
diff --git a/comp/lucas-standen-NEA/code2/stdlib/String/Makefile b/comp/lucas-standen-NEA/code2/stdlib/String/Makefile
index 053ab59..65c308b 100644
--- a/comp/lucas-standen-NEA/code2/stdlib/String/Makefile
+++ b/comp/lucas-standen-NEA/code2/stdlib/String/Makefile
@@ -1,7 +1,16 @@
 CC=cc
 CFLAGS=-O3
 
-all: String.c
-	${CC} String.c -c -o String.o ${CFLAGS}
-clean: 
-	rm -rf String.o
+SRC = String.c
+OBJ = ${SRC:.c=.o}
+
+
+all:
+	${CC} -c ${SRC} -o ${OBJ} ${CFLAGS}
+install: all 
+	cp String.o /usr/local/share/zpylib/
+	cp String.h /usr/local/share/zpylib/include/
+clean:
+	rm -rf *.o
+
+.PHONY: all clean install uninstall