From ffe72ed4a02fa27a1cc3af78f70dfa1220b61f78 Mon Sep 17 00:00:00 2001 From: slk325 <148670597+slk325@users.noreply.github.com> Date: Tue, 7 May 2024 16:50:45 -0700 Subject: [PATCH 1/5] Update README.md; step 3 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index aa90123..762bfa8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # CS305_FINAL Contributors: -Tayyaba Shaheen -ADD YOUR NAME HERE +Tayyaba Shaheen, +Shurie Kamewada From bd30a3774b902a320d6e5997d1cd990860c337c1 Mon Sep 17 00:00:00 2001 From: slk325 <148670597+slk325@users.noreply.github.com> Date: Tue, 7 May 2024 16:51:27 -0700 Subject: [PATCH 2/5] Update get_student_id.c; step 3 --- get_student_id.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/get_student_id.c b/get_student_id.c index 8ffa600..bc4e98a 100644 --- a/get_student_id.c +++ b/get_student_id.c @@ -1,3 +1,3 @@ int get_student_id(void){ - return 3331212; + return 5885882; } From 8c5f4c2e2e5f3a06cb7e3091c12133107a2eaa34 Mon Sep 17 00:00:00 2001 From: slk325 <148670597+slk325@users.noreply.github.com> Date: Tue, 7 May 2024 17:10:49 -0700 Subject: [PATCH 3/5] Create Makefile; step 5 --- Makefile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ed27d7d --- /dev/null +++ b/Makefile @@ -0,0 +1,15 @@ +# depends on main, command to run is ./main|tee main.out +main.out: main.c + ./main|tee main.out + +# depends on both .o files, command should use cc -o to compile and link executable progam called main +main: get_student_id.o main.o + gcc get_student_id.o main.o -o main + +# depends on main.c, command should use cc -c to compile but not link +main.o: main.c + gcc main.c -c main.o + +# depends on get_student_id.c, command should use cc -c to compile but not link +get_student_id.o: get_student_id.c + gcc get_student_id.c -c get_student_id.o From 1edb75ff578b26f6fc2efdf0e3663863a97cf531 Mon Sep 17 00:00:00 2001 From: slk325 <148670597+slk325@users.noreply.github.com> Date: Tue, 7 May 2024 17:33:05 -0700 Subject: [PATCH 4/5] Update Makefile; step 4 --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ed27d7d..d13a8d5 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,15 @@ # depends on main, command to run is ./main|tee main.out main.out: main.c - ./main|tee main.out + ./main|tee main.out # depends on both .o files, command should use cc -o to compile and link executable progam called main main: get_student_id.o main.o - gcc get_student_id.o main.o -o main + gcc get_student_id.o main.o -o main # depends on main.c, command should use cc -c to compile but not link main.o: main.c - gcc main.c -c main.o + gcc main.c -c main.o # depends on get_student_id.c, command should use cc -c to compile but not link get_student_id.o: get_student_id.c - gcc get_student_id.c -c get_student_id.o + gcc get_student_id.c -c get_student_id.o From bf85f920df69eb634cdedc2d7ae4dce3f5abb667 Mon Sep 17 00:00:00 2001 From: slk325 <148670597+slk325@users.noreply.github.com> Date: Tue, 7 May 2024 17:41:03 -0700 Subject: [PATCH 5/5] Update Makefile; step 4 --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d13a8d5..89622a6 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,15 @@ # depends on main, command to run is ./main|tee main.out main.out: main.c - ./main|tee main.out + ./main|tee main.out # depends on both .o files, command should use cc -o to compile and link executable progam called main main: get_student_id.o main.o - gcc get_student_id.o main.o -o main + gcc get_student_id.o main.o -o main # depends on main.c, command should use cc -c to compile but not link main.o: main.c - gcc main.c -c main.o + gcc main.c -c main.o # depends on get_student_id.c, command should use cc -c to compile but not link get_student_id.o: get_student_id.c - gcc get_student_id.c -c get_student_id.o + gcc get_student_id.c -c get_student_id.o