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 --- lib/Makefile | 38 -------------------------------------- lib/build.mk | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 38 deletions(-) delete mode 100644 lib/Makefile create mode 100755 lib/build.mk (limited to 'lib') diff --git a/lib/Makefile b/lib/Makefile deleted file mode 100644 index 0494a85..0000000 --- a/lib/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -include ../Makefile.config - -# minimal C standard library -TARGETLIB += libk -libk.SRCS = \ - libk/endian/little.c \ - libk/stdio/printf.c libk/stdio/fprintf.c libk/stdio/vfprintf.cpp \ - libk/stdlib/memcpy.c libk/stdlib/memset.c libk/stdlib/linked_list_allocator.c \ - libk/string/itoa.c - -HOSTTARGETBIN += libk/endian/test_endian_little -libk/endian/test_endian_little.SRCS = libk/endian/test_endian_little.cc - -HOSTTARGETBIN += libk/stdlib/test_linked_list_allocator -libk/stdlib/test_linked_list_allocator.SRCS = libk/stdlib/test_linked_list_allocator.cc - -HOSTTARGETBIN += libk/stdlib/test_mem -libk/stdlib/test_mem.SRCS = libk/stdlib/test_mem.cc - -HOSTTARGETBIN += libk/string/test_string -libk/string/test_string.SRCS = libk/string/test_string.cc - -TESTS += \ - libk/endian/test_endian_little \ - libk/stdlib/test_linked_list_allocator libk/stdlib/test_mem \ - libk/string/test_string - -# blake2s hash algorithm -TARGETLIB += blake2 -blake2.SRCS = blake2/blake2s.c - -HOSTTARGETBIN += blake2/test_blake2s_selftest -blake2/test_blake2s_selftest.SRCS = blake2/test_blake2s_selftest.cc - -TESTS += blake2/test_blake2s_selftest - -include ../rules.mk - diff --git a/lib/build.mk b/lib/build.mk new file mode 100755 index 0000000..06c6006 --- /dev/null +++ b/lib/build.mk @@ -0,0 +1,36 @@ +#!../mach + +# minimal C standard library +TARGETLIB += libk +libk.SRCS = \ + libk/endian/little.c \ + libk/stdio/printf.c libk/stdio/fprintf.c libk/stdio/vfprintf.cpp \ + libk/stdlib/memcpy.c libk/stdlib/memset.c libk/stdlib/linked_list_allocator.c \ + libk/string/itoa.c + +HOSTTARGETBIN += libk/endian/test_endian_little +libk/endian/test_endian_little.SRCS = libk/endian/test_endian_little.cc + +HOSTTARGETBIN += libk/stdlib/test_linked_list_allocator +libk/stdlib/test_linked_list_allocator.SRCS = libk/stdlib/test_linked_list_allocator.cc + +HOSTTARGETBIN += libk/stdlib/test_mem +libk/stdlib/test_mem.SRCS = libk/stdlib/test_mem.cc + +HOSTTARGETBIN += libk/string/test_string +libk/string/test_string.SRCS = libk/string/test_string.cc + +TESTS += \ + libk/endian/test_endian_little \ + libk/stdlib/test_linked_list_allocator libk/stdlib/test_mem \ + libk/string/test_string + +# blake2s hash algorithm +TARGETLIB += blake2 +blake2.SRCS = blake2/blake2s.c + +HOSTTARGETBIN += blake2/test_blake2s_selftest +blake2/test_blake2s_selftest.SRCS = blake2/test_blake2s_selftest.cc + +TESTS += blake2/test_blake2s_selftest + -- cgit v1.2.1