From cb6aa7dd9703eb3dba275905f98de682b57d3a78 Mon Sep 17 00:00:00 2001 From: aqua Date: Sun, 11 Jun 2023 23:11:25 +0300 Subject: Rework leaf makefiles to be included from top-level - remove Makefile.all --- devices/Makefile | 16 ---------------- devices/build.mk | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 16 deletions(-) delete mode 100644 devices/Makefile create mode 100755 devices/build.mk (limited to 'devices') diff --git a/devices/Makefile b/devices/Makefile deleted file mode 100644 index 3222ad8..0000000 --- a/devices/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -include ../Makefile.config - -INCLUDES := -I../${ARCH} -${ARCH}_CFLAGS += ${INCLUDES} -${ARCH}_CXXFLAGS += ${INCLUDES} - -TARGETLIB += devs -devs.SRCS = pic_8259.c uart/uart_16550.c vga.c i8042.c pckbd.c mouse.c - -HOSTTARGETBIN += uart/test_uart_16550 -uart/test_uart_16550.SRCS = uart/uart_16550.c uart/unittest_uart_16550.cc - -TESTS += uart/test_uart_16550 - -include ../rules.mk - diff --git a/devices/build.mk b/devices/build.mk new file mode 100755 index 0000000..b27d945 --- /dev/null +++ b/devices/build.mk @@ -0,0 +1,14 @@ +#!../mach + +INCLUDES := -I../${ARCH} +${ARCH}_CFLAGS += ${INCLUDES} +${ARCH}_CXXFLAGS += ${INCLUDES} + +TARGETLIB += devs +devs.SRCS = pic_8259.c uart/uart_16550.c vga.c i8042.c pckbd.c mouse.c + +HOSTTARGETBIN += uart/test_uart_16550 +uart/test_uart_16550.SRCS = uart/uart_16550.c uart/unittest_uart_16550.cc + +TESTS += uart/test_uart_16550 + -- cgit v1.2.1