diff --git a/src/userland/Makefile b/src/userland/Makefile index d4f368e..fb510dd 100644 --- a/src/userland/Makefile +++ b/src/userland/Makefile @@ -11,12 +11,15 @@ PROGRAM_NAMES := $(shell ls -d */ | sed "s/\/$$//" | sed "s|build||") PROGRAMS := $(PROGRAM_NAMES:%=../../initrd/%) -../../rootfs/initrd.tar: all - @echo "packing files into rootfs/initrd.tar" - @tar cf ../../rootfs/initrd.tar ../../initrd/ +default: ../../rootfs/initrd.tar all: $(PROGRAMS) +../../rootfs/initrd.tar: $(PROGRAMS) + @echo "packing files into rootfs/initrd.tar" + @echo "$(PROGRAMS)" + @tar cf ../../rootfs/initrd.tar ../../initrd/ + .SUFFIXES: define MAKE_PROGRAM diff --git a/src/userland/Makefile b/src/userland/Makefile index d4f368e..fb510dd 100644 --- a/src/userland/Makefile +++ b/src/userland/Makefile @@ -11,12 +11,15 @@ PROGRAM_NAMES := $(shell ls -d */ | sed "s/\/$$//" | sed "s|build||") PROGRAMS := $(PROGRAM_NAMES:%=../../initrd/%) -../../rootfs/initrd.tar: all - @echo "packing files into rootfs/initrd.tar" - @tar cf ../../rootfs/initrd.tar ../../initrd/ +default: ../../rootfs/initrd.tar all: $(PROGRAMS) +../../rootfs/initrd.tar: $(PROGRAMS) + @echo "packing files into rootfs/initrd.tar" + @echo "$(PROGRAMS)" + @tar cf ../../rootfs/initrd.tar ../../initrd/ + .SUFFIXES: define MAKE_PROGRAM diff --git a/src/userland/vga/main.c b/src/userland/vga/main.c index 2875fcf..bad3462 100644 --- a/src/userland/vga/main.c +++ b/src/userland/vga/main.c @@ -4,7 +4,7 @@ #include #include -uint16_t *videoSource; +volatile uint16_t *videoSource; uint32_t offset = 0; #define WIDTH 80