Refactored makefiles
This commit is contained in:
parent
01ac29160b
commit
968137cc1b
4
Makefile
4
Makefile
@ -2,7 +2,7 @@ TOPDIR=.
|
|||||||
include $(TOPDIR)/Makefile.config
|
include $(TOPDIR)/Makefile.config
|
||||||
|
|
||||||
|
|
||||||
all: dumps user_lib instruction_tests
|
all: dumps user_lib instruction_tests syscall
|
||||||
#
|
#
|
||||||
# Main targets
|
# Main targets
|
||||||
#
|
#
|
||||||
@ -26,6 +26,6 @@ syscall: user_lib
|
|||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(MAKE) clean -C userlib/
|
$(MAKE) clean -C userlib/
|
||||||
$(MAKE) clean -C test/riscv_instructions/
|
$(MAKE) clean -C test/
|
||||||
$(RM) -rf $(TOPDIR)/target
|
$(RM) -rf $(TOPDIR)/target
|
||||||
|
|
3
test/Makefile
Normal file
3
test/Makefile
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
clean:
|
||||||
|
make clean -C riscv_instructions
|
||||||
|
make clean -C syscall_tests
|
@ -8,11 +8,6 @@ dumps:
|
|||||||
make dumps -C jump_instructions/
|
make dumps -C jump_instructions/
|
||||||
make dumps -C simple_arithmetics/
|
make dumps -C simple_arithmetics/
|
||||||
|
|
||||||
tests:
|
|
||||||
make tests -C boolean_logic/
|
|
||||||
make tests -C jump_instructions/
|
|
||||||
make tests -C simple_arithmetics/
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(MAKE) clean -C boolean_logic/
|
$(MAKE) clean -C boolean_logic/
|
||||||
$(MAKE) clean -C jump_instructions/
|
$(MAKE) clean -C jump_instructions/
|
||||||
|
@ -1,17 +1,14 @@
|
|||||||
|
|
||||||
PROGRAMS = comparisons if switch
|
PROGRAMS = comparisons.guac if.guac switch.guac
|
||||||
|
TOPDIR = ../../..
|
||||||
|
include $(TOPDIR)/Makefile.rules
|
||||||
|
|
||||||
build: $(PROGRAMS)
|
build: $(PROGRAMS)
|
||||||
|
|
||||||
dumps: comparisons.dump if.dump switch.dump
|
dumps: comparisons.dump if.dump switch.dump
|
||||||
|
|
||||||
tests: comparisons.guac if.guac switch.guac
|
|
||||||
|
|
||||||
TOPDIR = ../../..
|
|
||||||
include $(TOPDIR)/Makefile.rules
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(RM) comparisons comparisons.o if if.o
|
$(RM) *.o *.guac
|
||||||
|
|
||||||
# Dependances
|
# Dependances
|
||||||
$(PROGRAMS): % : $(USERLIB)/sys.o $(USERLIB)/libnachos.o %.o
|
$(PROGRAMS): %.guac : $(USERLIB)/sys.o $(USERLIB)/libnachos.o %.o
|
@ -1,15 +1,12 @@
|
|||||||
PROGRAMS = jump ret
|
PROGRAMS = jump.guac ret.guac
|
||||||
|
TOPDIR = ../../..
|
||||||
|
include $(TOPDIR)/Makefile.rules
|
||||||
|
|
||||||
build: $(PROGRAMS)
|
build: $(PROGRAMS)
|
||||||
|
|
||||||
dumps: jump.dump ret.dump
|
dumps: jump.dump ret.dump
|
||||||
|
|
||||||
tests: jump.guac ret.guac
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(RM) jump jump.o ret ret.o
|
$(RM) *.o *.guac
|
||||||
|
|
||||||
TOPDIR = ../../..
|
$(PROGRAMS): %.guac : $(USERLIB)/sys.o $(USERLIB)/libnachos.o %.o
|
||||||
include $(TOPDIR)/Makefile.rules
|
|
||||||
|
|
||||||
$(PROGRAMS): % : $(USERLIB)/sys.o $(USERLIB)/libnachos.o %.o
|
|
@ -1,16 +1,12 @@
|
|||||||
|
PROGRAMS = unsigned_addition.guac unsigned_division.guac unsigned_multiplication.guac unsigned_substraction.guac
|
||||||
PROGRAMS = unsigned_addition unsigned_division unsigned_multiplication unsigned_substraction
|
TOPDIR = ../../..
|
||||||
|
include $(TOPDIR)/Makefile.rules
|
||||||
|
|
||||||
build: $(PROGRAMS)
|
build: $(PROGRAMS)
|
||||||
|
|
||||||
dumps: unsigned_addition.dump unsigned_division.dump unsigned_multiplication.dump unsigned_substraction.dump
|
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:
|
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 = ../../..
|
$(PROGRAMS): %.guac : $(USERLIB)/sys.o $(USERLIB)/libnachos.o %.o
|
||||||
include $(TOPDIR)/Makefile.rules
|
|
||||||
|
|
||||||
$(PROGRAMS): % : $(USERLIB)/sys.o $(USERLIB)/libnachos.o %.o
|
|
@ -1,16 +1,12 @@
|
|||||||
|
|
||||||
PROGRAMS = halt.guac prints.guac
|
PROGRAMS = halt.guac prints.guac
|
||||||
|
TOPDIR = ../..
|
||||||
|
include $(TOPDIR)/Makefile.rules
|
||||||
|
|
||||||
build: $(PROGRAMS)
|
build: $(PROGRAMS)
|
||||||
|
|
||||||
dumps: halt.dump prints.dump
|
dumps: halt.dump prints.dump
|
||||||
|
|
||||||
tests: halt.guac prints.guac
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(RM) halt.o prints.o
|
$(RM) *.o *.guac
|
||||||
|
|
||||||
TOPDIR = ../..
|
|
||||||
include $(TOPDIR)/Makefile.rules
|
|
||||||
|
|
||||||
$(PROGRAMS): %.guac : $(USERLIB)/sys.o $(USERLIB)/libnachos.o %.o
|
$(PROGRAMS): %.guac : $(USERLIB)/sys.o $(USERLIB)/libnachos.o %.o
|
||||||
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user