Flatten libs

libterminal/src.mk

@@ -1 +1,3 @@
-include terminal/src.mk
+c += terminal.c
+
+o += terminal.o

libterminal/terminal.c

@@ -1,7 +1,6 @@
 #include <m/system.h>
 #include <stddef.h>
-#include <terminal/device.h>
-#include <terminal/terminal.h>
+#include <terminal.h>
 
 void terminal_print (const char* string, size_t len) {
   device_do (TERMINAL_DEVICE, TERMINAL_PUTSTR, (void*)string, &len, NULL, NULL);

libterminal/terminal.h

@@ -1,8 +1,11 @@
 #ifndef _LIBTERMINAL_TERMINAL_TERMINAL_H
 #define _LIBTERMINAL_TERMINAL_TERMINAL_H
 
+#include <m/terminal_device.h>
 #include <stddef.h>
 
+#define TERMINAL_DEVICE 1
+
 void terminal_print (const char* string, size_t len);
 
 #endif // _LIBTERMINAL_TERMINAL_TERMINAL_H

libterminal/terminal/device.h

@@ -1,8 +0,0 @@
-#ifndef _LIBTERMINAL_TERMINAL_DEVICE_H
-#define _LIBTERMINAL_TERMINAL_DEVICE_H
-
-#define TERMINAL_DEVICE 1
-
-#include <m/terminal_device.h>
-
-#endif // _LIBTERMINAL_TERMINAL_DEVICE_H

libterminal/terminal/src.mk

@@ -1,3 +0,0 @@
-c += terminal/terminal.c
-
-o += terminal/terminal.o