diff options
| author | Mole Shang <135e2@135e2.dev> | 2024-02-10 13:46:25 +0800 |
|---|---|---|
| committer | Mole Shang <135e2@135e2.dev> | 2024-02-10 13:50:34 +0800 |
| commit | 3673a2cdfb30e1e3936e695a3fb8adee74488d6b (patch) | |
| tree | 282b4677f47bbb15949e24b3bfa455b173a38a29 /Makefile | |
| parent | f379c1c4c80947365eb6c4046c3ab165629dc8cd (diff) | |
| parent | c9284cd93525436cc823258ab309c1b27eeec714 (diff) | |
| download | xv6-labs-3673a2cdfb30e1e3936e695a3fb8adee74488d6b.tar.gz xv6-labs-3673a2cdfb30e1e3936e695a3fb8adee74488d6b.tar.bz2 xv6-labs-3673a2cdfb30e1e3936e695a3fb8adee74488d6b.zip | |
Merge branch 'pgtbl' into traps
Conflicts:
.gitignore
Makefile
conf/lab.mk
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 13 insertions, 3 deletions
@@ -19,6 +19,7 @@ OBJS = \ $K/trampoline.o \ $K/trap.o \ $K/syscall.o \ + $K/sysinfo.o \ $K/sysproc.o \ $K/bio.o \ $K/fs.o \ @@ -90,7 +91,7 @@ CFLAGS = -Wall -Werror -O -fno-omit-frame-pointer -ggdb -gdwarf-2 ifdef LAB LABUPPER = $(shell echo $(LAB) | tr a-z A-Z) -XCFLAGS += -DSOL_$(LABUPPER) -DLAB_$(LABUPPER) +XCFLAGS += -DSOL_$(LABUPPER) -DLAB_$(LABUPPER) -DLAB_PGTBL endif CFLAGS += $(XCFLAGS) @@ -188,6 +189,13 @@ UPROGS=\ $U/_grind\ $U/_wc\ $U/_zombie\ + $U/_sleep\ + $U/_pingpong\ + $U/_primes\ + $U/_find\ + $U/_xargs\ + $U/_trace\ + $U/_sysinfotest\ @@ -268,9 +276,11 @@ fs.img: mkfs/mkfs README $(UEXTRA) $(UPROGS) clean: rm -f *.tex *.dvi *.idx *.aux *.log *.ind *.ilg *.dSYM *.zip \ */*.o */*.d */*.asm */*.sym \ - $U/initcode $U/initcode.out $K/kernel $U/usys.S \ - mkfs/mkfs fs.img .gdbinit \ + $U/initcode $U/initcode.out $K/kernel fs.img \ + mkfs/mkfs .gdbinit \ + $U/usys.S \ $(UPROGS) \ + *.zip \ ph barrier # try to generate a unique GDB port |