diff options
| author | Miguel <m.i@gmx.at> | 2018-10-05 14:36:42 +0200 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2018-10-05 14:36:42 +0200 |
| commit | 4dbe6a264d7a3bd38ca1ac0921248654a50f1b5e (patch) | |
| tree | 5ab6b10a281eec07d46dc678805a9a4eb59e6341 /userspace/Makefile | |
| parent | 7e56d9ac1e6888faed2109e2eefe124650aa4a72 (diff) | |
user space xterm continued
Diffstat (limited to 'userspace/Makefile')
| -rw-r--r-- | userspace/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/userspace/Makefile b/userspace/Makefile index 3b7a6b9..b1b077d 100644 --- a/userspace/Makefile +++ b/userspace/Makefile @@ -7,6 +7,7 @@ GIT_REVISION=$(shell git rev-parse HEAD) CC=i686-foolos-gcc CC=i686-elf-gcc AS=i686-elf-as + CC = @echo "Compiling (i686-elf-gcc) $<..."; i686-elf-gcc AS = @echo "Assembling (i686-elf-as) $<..."; i686-elf-as @@ -29,9 +30,9 @@ include ../Makefile.common all: crt0.o ext2.img - ext2.img: $(PROGS) make -C fonts + make -C xterm @echo "----------------------" @echo "Creating ext2.img ...." @dd if=/dev/zero of=ext2.img bs=1024 count=$(IMAGESIZE) @@ -48,6 +49,7 @@ ext2.img: $(PROGS) @mkdir -p mnt/pipes # mountpoint for pipes @cp $(PROGS) mnt/bin @cp fonts/binfont.bin mnt/doc/fonts + @cp xterm/xterm mnt/bin # cp ~/temp/fool-os-stuff/binutils-build-host-foolos/binutils/readelf mnt/bin # cp ../font/binfont.bin mnt/ @@ -69,6 +71,7 @@ ext2.img: $(PROGS) clean: make -C fonts clean + make -C xterm clean @echo "Cleaning userspace ..."; rm -f *.o $(PROGS) ext2.img *.d new: clean all |