From 9a47be5bcc91d7fc044d5ccaf7f5eb1a67de6971 Mon Sep 17 00:00:00 2001 From: mo khan Date: Fri, 10 Jan 2025 14:30:36 -0700 Subject: Generate project1 tarball using nested makefile --- 3431709-project-1.tar.gz | Bin 99616 -> 99646 bytes Makefile | 3 ++- projects/1/GoodDocsF-Darwin.exe | Bin 9904 -> 9904 bytes projects/1/GoodDocsF.exe | Bin 145461 -> 145461 bytes projects/1/GoodDocsF2-Darwin.exe | Bin 10000 -> 10000 bytes projects/1/GoodDocsF2.exe | Bin 145519 -> 145519 bytes projects/1/Makefile | 11 +++++++---- 7 files changed, 9 insertions(+), 5 deletions(-) diff --git a/3431709-project-1.tar.gz b/3431709-project-1.tar.gz index ac6cf12..fb09f19 100644 Binary files a/3431709-project-1.tar.gz and b/3431709-project-1.tar.gz differ diff --git a/Makefile b/Makefile index 1e093f7..7355172 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,7 @@ export PATH := /Library/TeX/Root/bin/universal-darwin:$(PATH) 3431709-assignment-2.pdf: assignments/2-solution.md pandoc -f markdown -t pdf -o 3431709-assignment-2.pdf assignments/2-solution.md -3431709-project-1.tar.gz: projects/1/GoodDocsF.exe projects/1/GoodDocsF2.exe projects/1/GoodDocsF-Darwin.exe projects/1/GoodDocsF2-Darwin.exe +3431709-project-1.tar.gz: rm -f 3431709-project-1.tar.gz + $(MAKE) -C projects/1 clean default tar -czvf 3431709-project-1.tar.gz projects/1 diff --git a/projects/1/GoodDocsF-Darwin.exe b/projects/1/GoodDocsF-Darwin.exe index c6c70f5..7d09390 100755 Binary files a/projects/1/GoodDocsF-Darwin.exe and b/projects/1/GoodDocsF-Darwin.exe differ diff --git a/projects/1/GoodDocsF.exe b/projects/1/GoodDocsF.exe index 176d63e..6eb7f5a 100755 Binary files a/projects/1/GoodDocsF.exe and b/projects/1/GoodDocsF.exe differ diff --git a/projects/1/GoodDocsF2-Darwin.exe b/projects/1/GoodDocsF2-Darwin.exe index e4b3ea4..494ede6 100755 Binary files a/projects/1/GoodDocsF2-Darwin.exe and b/projects/1/GoodDocsF2-Darwin.exe differ diff --git a/projects/1/GoodDocsF2.exe b/projects/1/GoodDocsF2.exe index e569895..716884b 100755 Binary files a/projects/1/GoodDocsF2.exe and b/projects/1/GoodDocsF2.exe differ diff --git a/projects/1/Makefile b/projects/1/Makefile index 4e2f245..44d3fd2 100644 --- a/projects/1/Makefile +++ b/projects/1/Makefile @@ -1,13 +1,16 @@ default: GoodDocsF.exe GoodDocsF-Darwin.exe GoodDocsF2.exe GoodDocsF2-Darwin.exe +clean: + rm $(CURDIR)/*.exe + GoodDocsF.exe: GoodDocsF.cpp - /usr/local/Cellar/mingw-w64/12.0.0_1/bin/x86_64-w64-mingw32-g++ -o GoodDocsF.exe GoodDocsF.cpp + /usr/local/Cellar/mingw-w64/12.0.0_1/bin/x86_64-w64-mingw32-g++ -o $(CURDIR)/GoodDocsF.exe $(CURDIR)/GoodDocsF.cpp GoodDocsF-Darwin.exe: GoodDocsF.cpp - /usr/local/Cellar/gcc/14.2.0_1/bin/g++-14 -o GoodDocsF-Darwin.exe GoodDocsF.cpp + /usr/local/Cellar/gcc/14.2.0_1/bin/g++-14 -o $(CURDIR)/GoodDocsF-Darwin.exe $(CURDIR)/GoodDocsF.cpp GoodDocsF2.exe: GoodDocsF2.cpp - /usr/local/Cellar/mingw-w64/12.0.0_1/bin/x86_64-w64-mingw32-g++ -o GoodDocsF2.exe GoodDocsF2.cpp + /usr/local/Cellar/mingw-w64/12.0.0_1/bin/x86_64-w64-mingw32-g++ -o $(CURDIR)/GoodDocsF2.exe $(CURDIR)/GoodDocsF2.cpp GoodDocsF2-Darwin.exe: GoodDocsF2.cpp - /usr/local/Cellar/gcc/14.2.0_1/bin/g++-14 -o GoodDocsF2-Darwin.exe GoodDocsF2.cpp + /usr/local/Cellar/gcc/14.2.0_1/bin/g++-14 -o $(CURDIR)/GoodDocsF2-Darwin.exe $(CURDIR)/GoodDocsF2.cpp -- cgit v1.2.3