From d6e2c01a085d9eebd529fa59fff654663b39e31a Mon Sep 17 00:00:00 2001
From: Matt Strapp <strap012@umn.edu>
Date: Mon, 26 Oct 2020 08:45:04 -0500
Subject: Revert "Add new template"

This reverts commit cd43f361676b151a90607fdeb76724b694288ef9.
---
 P2/solutionexe/Makefile | 57 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 52 insertions(+), 5 deletions(-)

(limited to 'P2/solutionexe/Makefile')

diff --git a/P2/solutionexe/Makefile b/P2/solutionexe/Makefile
index 4a969ac..231a15e 100644
--- a/P2/solutionexe/Makefile
+++ b/P2/solutionexe/Makefile
@@ -1,10 +1,57 @@
-.PHONY: run
+CC=gcc
+CFLAGS=-g
 
-run:
-	chmod +x mapreduce
-	chmod +x mapper
-	chmod +x reducer
+SRCDIR=src
+INCLDIR=include
+LIBDIR=lib
+
+mapreduce: $(SRCDIR)/mapreduce.c $(LIBDIR)/utils.o mapper reducer
+	$(CC) $(CFLAGS) -I$(INCLDIR) $(LIBDIR)/utils.o $(SRCDIR)/mapreduce.c -o mapreduce
+
+mapper: $(SRCDIR)/mapper.c $(LIBDIR)/utils.o
+	$(CC) $(CFLAGS) -I$(INCLDIR) $(LIBDIR)/utils.o $(SRCDIR)/mapper.c -o mapper
+
+reducer: $(SRCDIR)/reducer.c $(LIBDIR)/utils.o
+	$(CC) $(CFLAGS) -I$(INCLDIR)  $(LIBDIR)/utils.o $(SRCDIR)/reducer.c -o reducer
+
+$(LIBDIR)/utils.o: $(LIBDIR)/utils.c
+	$(CC) $(CFLAGS) -I$(INCLDIR) -c $(LIBDIR)/utils.c -o $(LIBDIR)/utils.o	
+
+.PHONY: run clean t1 t2 t3
+
+#500KB
+t1:
+# 	make -i clean
+# 	make
 	./mapreduce 5 2 test/T1/F1.txt
 
+#44KB
+t2:
+# 	make -i clean
+# 	make
+	./mapreduce 5 2 test/T2/F2.txt
+
+#0KB
+t3:
+# 	make -i clean
+# 	make
+	./mapreduce 5 2 test/T3/F3.txt
+
+# m >= r
+
+# m=1 r=1 (min case)
+t4:
+# 	make -i clean
+# 	make
+	./mapreduce 1 1 test/T1/F1.txt
+
+# m=32 r=26 (max case)
+t5:
+# 	make -i clean
+# 	make
+	./mapreduce 32 26 test/T1/F1.txt
+
+
 clean:
+	rm lib/utils.o mapreduce mapper reducer
 	rm -rf output
\ No newline at end of file
-- 
cgit v1.2.3