quentinlegot/burritos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile fixes

Browse Source
This commit is contained in:
François Autin 2023-04-05 15:09:10 +02:00
parent cb25b09cff
commit 7179931224
No known key found for this signature in database
GPG Key ID: 343F5D382E1DD77C
7 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -2,7 +2,7 @@ TOPDIR=.
include $(TOPDIR)/Makefile.config include $(TOPDIR)/Makefile.config
all: dumps user_lib tests all: dumps user_lib instruction_tests
# #
# Main targets # Main targets
# #
@ -18,8 +18,9 @@ dumps:
user_lib: user_lib:
$(MAKE) -C userlib/ $(MAKE) -C userlib/
tests: user_lib syscall: user_lib
$(MAKE) tests -C test/riscv_instructions/ $(MAKE) build -C test/syscall_tests/
$(RM) test/syscall_tests/*.o
mkdir -p ${TOPDIR}/target/guac/ mkdir -p ${TOPDIR}/target/guac/
find . -name '*.guac' -exec mv {} ${TOPDIR}/target/guac/ \; find . -name '*.guac' -exec mv {} ${TOPDIR}/target/guac/ \;

4
test/riscv_instructions/Makefile
View File

@ -2,22 +2,18 @@ build:
make build -C boolean_logic/ make build -C boolean_logic/
make build -C jump_instructions/ make build -C jump_instructions/
make build -C simple_arithmetics/ make build -C simple_arithmetics/
make build -C syscall_tests/
dumps: dumps:
make dumps -C boolean_logic/ make dumps -C boolean_logic/
make dumps -C jump_instructions/ make dumps -C jump_instructions/
make dumps -C simple_arithmetics/ make dumps -C simple_arithmetics/
make dumps -C syscall_tests/
tests: tests:
make tests -C boolean_logic/ make tests -C boolean_logic/
make tests -C jump_instructions/ make tests -C jump_instructions/
make tests -C simple_arithmetics/ make tests -C simple_arithmetics/
make tests -C syscall_tests/
clean: clean:
$(MAKE) clean -C boolean_logic/ $(MAKE) clean -C boolean_logic/
$(MAKE) clean -C jump_instructions/ $(MAKE) clean -C jump_instructions/
$(MAKE) clean -C simple_arithmetics/ $(MAKE) clean -C simple_arithmetics/
$(MAKE) clean -C syscall_tests/

2
test/riscv_instructions/syscall_tests/Makefile → test/syscall_tests/Makefile
View File

@ -10,7 +10,7 @@ tests: halt.guac prints.guac
clean: clean:
$(RM) halt.o halt prints prints.o $(RM) halt.o halt prints prints.o
TOPDIR = ../../.. TOPDIR = ../..
include $(TOPDIR)/Makefile.rules include $(TOPDIR)/Makefile.rules
$(PROGRAMS): % : $(USERLIB)/sys.o $(USERLIB)/libnachos.o %.o $(PROGRAMS): % : $(USERLIB)/sys.o $(USERLIB)/libnachos.o %.o

BIN
test/syscall_tests/halt Executable file
View File

Binary file not shown.

0
test/riscv_instructions/syscall_tests/halt.c → test/syscall_tests/halt.c
View File

BIN
test/syscall_tests/prints Executable file
View File

Binary file not shown.

0
test/riscv_instructions/syscall_tests/prints.c → test/syscall_tests/prints.c
View File