From 968137cc1b81e4d5ed181785824ee7f66bd62d9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Autin?= Date: Wed, 5 Apr 2023 17:05:55 +0200 Subject: [PATCH] Refactored makefiles --- Makefile | 4 ++-- test/Makefile | 3 +++ test/riscv_instructions/Makefile | 5 ----- test/riscv_instructions/boolean_logic/Makefile | 13 +++++-------- .../jump_instructions/Makefile | 13 +++++-------- .../simple_arithmetics/Makefile | 14 +++++--------- test/syscall_tests/Makefile | 10 +++------- test/syscall_tests/halt | Bin 19552 -> 0 bytes test/syscall_tests/prints | Bin 19616 -> 0 bytes 9 files changed, 23 insertions(+), 39 deletions(-) create mode 100644 test/Makefile delete mode 100755 test/syscall_tests/halt delete mode 100755 test/syscall_tests/prints diff --git a/Makefile b/Makefile index cdbbde4..7879073 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ TOPDIR=. include $(TOPDIR)/Makefile.config -all: dumps user_lib instruction_tests +all: dumps user_lib instruction_tests syscall # # Main targets # @@ -26,6 +26,6 @@ syscall: user_lib clean: $(MAKE) clean -C userlib/ - $(MAKE) clean -C test/riscv_instructions/ + $(MAKE) clean -C test/ $(RM) -rf $(TOPDIR)/target \ No newline at end of file diff --git a/test/Makefile b/test/Makefile new file mode 100644 index 0000000..ff1194e --- /dev/null +++ b/test/Makefile @@ -0,0 +1,3 @@ +clean: + make clean -C riscv_instructions + make clean -C syscall_tests \ No newline at end of file diff --git a/test/riscv_instructions/Makefile b/test/riscv_instructions/Makefile index 7c9a691..68747d1 100644 --- a/test/riscv_instructions/Makefile +++ b/test/riscv_instructions/Makefile @@ -8,11 +8,6 @@ dumps: make dumps -C jump_instructions/ make dumps -C simple_arithmetics/ -tests: - make tests -C boolean_logic/ - make tests -C jump_instructions/ - make tests -C simple_arithmetics/ - clean: $(MAKE) clean -C boolean_logic/ $(MAKE) clean -C jump_instructions/ diff --git a/test/riscv_instructions/boolean_logic/Makefile b/test/riscv_instructions/boolean_logic/Makefile index b0d2554..8b68cbb 100644 --- a/test/riscv_instructions/boolean_logic/Makefile +++ b/test/riscv_instructions/boolean_logic/Makefile @@ -1,17 +1,14 @@ -PROGRAMS = comparisons if switch +PROGRAMS = comparisons.guac if.guac switch.guac +TOPDIR = ../../.. +include $(TOPDIR)/Makefile.rules build: $(PROGRAMS) dumps: comparisons.dump if.dump switch.dump -tests: comparisons.guac if.guac switch.guac - -TOPDIR = ../../.. -include $(TOPDIR)/Makefile.rules - clean: - $(RM) comparisons comparisons.o if if.o + $(RM) *.o *.guac # Dependances -$(PROGRAMS): % : $(USERLIB)/sys.o $(USERLIB)/libnachos.o %.o \ No newline at end of file +$(PROGRAMS): %.guac : $(USERLIB)/sys.o $(USERLIB)/libnachos.o %.o \ No newline at end of file diff --git a/test/riscv_instructions/jump_instructions/Makefile b/test/riscv_instructions/jump_instructions/Makefile index 72523a3..25669fe 100644 --- a/test/riscv_instructions/jump_instructions/Makefile +++ b/test/riscv_instructions/jump_instructions/Makefile @@ -1,15 +1,12 @@ -PROGRAMS = jump ret +PROGRAMS = jump.guac ret.guac +TOPDIR = ../../.. +include $(TOPDIR)/Makefile.rules build: $(PROGRAMS) dumps: jump.dump ret.dump -tests: jump.guac ret.guac - clean: - $(RM) jump jump.o ret ret.o + $(RM) *.o *.guac -TOPDIR = ../../.. -include $(TOPDIR)/Makefile.rules - -$(PROGRAMS): % : $(USERLIB)/sys.o $(USERLIB)/libnachos.o %.o \ No newline at end of file +$(PROGRAMS): %.guac : $(USERLIB)/sys.o $(USERLIB)/libnachos.o %.o \ No newline at end of file diff --git a/test/riscv_instructions/simple_arithmetics/Makefile b/test/riscv_instructions/simple_arithmetics/Makefile index 1d3dcf2..741e9e6 100644 --- a/test/riscv_instructions/simple_arithmetics/Makefile +++ b/test/riscv_instructions/simple_arithmetics/Makefile @@ -1,16 +1,12 @@ - -PROGRAMS = unsigned_addition unsigned_division unsigned_multiplication unsigned_substraction +PROGRAMS = unsigned_addition.guac unsigned_division.guac unsigned_multiplication.guac unsigned_substraction.guac +TOPDIR = ../../.. +include $(TOPDIR)/Makefile.rules build: $(PROGRAMS) dumps: unsigned_addition.dump unsigned_division.dump unsigned_multiplication.dump unsigned_substraction.dump -tests: unsigned_addition.guac unsigned_division.guac unsigned_multiplication.guac unsigned_substraction.guac - clean: - $(RM) unsigned_addition unsigned_addition.o unsigned_division unsigned_division.o unsigned_multiplication unsigned_multiplication.o unsigned_substraction unsigned_substraction.o + $(RM) *.o *.guac -TOPDIR = ../../.. -include $(TOPDIR)/Makefile.rules - -$(PROGRAMS): % : $(USERLIB)/sys.o $(USERLIB)/libnachos.o %.o \ No newline at end of file +$(PROGRAMS): %.guac : $(USERLIB)/sys.o $(USERLIB)/libnachos.o %.o \ No newline at end of file diff --git a/test/syscall_tests/Makefile b/test/syscall_tests/Makefile index 40e1364..c374c49 100644 --- a/test/syscall_tests/Makefile +++ b/test/syscall_tests/Makefile @@ -1,16 +1,12 @@ - PROGRAMS = halt.guac prints.guac +TOPDIR = ../.. +include $(TOPDIR)/Makefile.rules build: $(PROGRAMS) dumps: halt.dump prints.dump -tests: halt.guac prints.guac - clean: - $(RM) halt.o prints.o - -TOPDIR = ../.. -include $(TOPDIR)/Makefile.rules + $(RM) *.o *.guac $(PROGRAMS): %.guac : $(USERLIB)/sys.o $(USERLIB)/libnachos.o %.o diff --git a/test/syscall_tests/halt b/test/syscall_tests/halt deleted file mode 100755 index 351625f7403bfeb9dfb536c54141c538b8d9d7fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19552 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