diff options
| author | Matthew Strapp <strap012@umn.edu> | 2020-10-26 08:49:51 -0500 |
|---|---|---|
| committer | GitHub Enterprise <noreply-github@umn.edu> | 2020-10-26 08:49:51 -0500 |
| commit | 3a06aa2a44eb3fa4850d7b12b8192fce1bdac578 (patch) | |
| tree | 7c398b08a0be744d3301cd7f4448dd30d28fe541 /P2/solutionexe/Makefile | |
| parent | Revert "Add new template" (diff) | |
| parent | Add functions made before (diff) | |
| download | csci4061-3a06aa2a44eb3fa4850d7b12b8192fce1bdac578.tar csci4061-3a06aa2a44eb3fa4850d7b12b8192fce1bdac578.tar.gz csci4061-3a06aa2a44eb3fa4850d7b12b8192fce1bdac578.tar.bz2 csci4061-3a06aa2a44eb3fa4850d7b12b8192fce1bdac578.tar.lz csci4061-3a06aa2a44eb3fa4850d7b12b8192fce1bdac578.tar.xz csci4061-3a06aa2a44eb3fa4850d7b12b8192fce1bdac578.tar.zst csci4061-3a06aa2a44eb3fa4850d7b12b8192fce1bdac578.zip | |
Merge pull request #10 from STRAP012/NewTemplate
Change files changed by new template
(should probably not break things)
Diffstat (limited to '')
| -rw-r--r-- | P2/solutionexe/Makefile | 57 |
1 files changed, 5 insertions, 52 deletions
diff --git a/P2/solutionexe/Makefile b/P2/solutionexe/Makefile index 231a15e..4a969ac 100644 --- a/P2/solutionexe/Makefile +++ b/P2/solutionexe/Makefile @@ -1,57 +1,10 @@ -CC=gcc -CFLAGS=-g +.PHONY: run -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 +run: + chmod +x mapreduce + chmod +x mapper + chmod +x reducer ./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 |