diff options
| -rw-r--r-- | Makefile.in | 10 | ||||
| -rw-r--r-- | usr.bin/Makefile | 8 | ||||
| -rw-r--r-- | usr.sbin/Makefile | 8 |
3 files changed, 20 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index 457173e..d3bef70 100644 --- a/Makefile.in +++ b/Makefile.in @@ -77,15 +77,13 @@ all: base libc sbin bin base/boot/hyra-kernel ramfs iso .PHONY: sbin sbin: $(SBIN_MAKEDIRS) - $(MAKE) -C $^ -I$(shell pwd)/builddeps \ - LDSCRIPT=$(shell pwd)/usr.sbin/link.ld USRDIR=$(USRDIR)\ - ROOT=$(PROJECT_ROOT) + make -C usr.sbin/ LDSCRIPT=$(shell pwd)/usr.sbin/link.ld USRDIR=$(USRDIR)\ + ROOT=$(PROJECT_ROOT)\ .PHONY: bin bin: $(BIN_MAKEDIRS) - $(MAKE) -C $^ -I$(shell pwd)/builddeps \ - LDSCRIPT=$(shell pwd)/usr.bin/link.ld USRDIR=$(USRDIR) \ - ROOT=$(PROJECT_ROOT) + make -C usr.bin/ LDSCRIPT=$(shell pwd)/usr.bin/link.ld USRDIR=$(USRDIR)\ + ROOT=$(PROJECT_ROOT) .PHONY: libc libc: diff --git a/usr.bin/Makefile b/usr.bin/Makefile new file mode 100644 index 0000000..1c973ff --- /dev/null +++ b/usr.bin/Makefile @@ -0,0 +1,8 @@ +LDSCRIPT = +USRDIR = +ROOT = +ARGS = -I$(ROOT)/builddeps LDSCRIPT=$(LDSCRIPT) USRDIR=$(USRDIR) ROOT=$(ROOT) + +.PHONY: all +all: + make -C osh/ $(ARGS) diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile new file mode 100644 index 0000000..b517c2f --- /dev/null +++ b/usr.sbin/Makefile @@ -0,0 +1,8 @@ +LDSCRIPT = +USRDIR = +ROOT = +ARGS = -I$(ROOT)/builddeps LDSCRIPT=$(LDSCRIPT) USRDIR=$(USRDIR) ROOT=$(ROOT) + +.PHONY: all +all: + make -C init/ $(ARGS) |