From 93e53acd73ec00526096a492952fc0d9c6d2755c Mon Sep 17 00:00:00 2001 From: Gitea Date: Mon, 21 Dec 2020 13:45:13 -0600 Subject: [PATCH] Rearranged for hosted v. freestanding --- makefile | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/makefile b/makefile index b8c0c25..39996cf 100755 --- a/makefile +++ b/makefile @@ -29,15 +29,24 @@ LIBK_CPPFLAGS:=$(LIBK_CPPFLAGS) $(KERNEL_ARCH_CPPFLAGS) FREEOBJS=\ $(ARCH_FREEOBJS) \ +stdio/printf.o \ +stdio/putchar.o \ +stdio/puts.o \ +string/memcmp.o \ +string/memcpy.o \ +string/memmove.o \ +string/memset.o \ +string/strcmp.o \ +string/strlen.o \ + +HOSTEDOBJS=\ +$(ARCH_HOSTEDOBJS) math/cos.o \ math/cosf.o \ math/cosl.o \ math/fabs.o \ math/fabsf.o \ math/fabsl.o \ -stdio/printf.o \ -stdio/putchar.o \ -stdio/puts.o \ stdlib/abort.o \ stdlib/abs.o \ stdlib/div.o \ @@ -46,19 +55,10 @@ stdlib/ldiv.o \ stdlib/llabs.o \ stdlib/lldiv.o \ stdlib/rand.o \ -string/memcmp.o \ -string/memcpy.o \ -string/memmove.o \ -string/memset.o \ -string/strcmp.o \ string/strcspn.o \ string/strtok.o \ -string/strlen.o \ time/time.o -HOSTEDOBJS=\ -$(ARCH_HOSTEDOBJS) - OBJS=\ $(FREEOBJS) \ $(HOSTEDOBJS) @@ -100,6 +100,7 @@ install: install-headers install-libs install-headers: mkdir -p $(DESTDIR)$(INCLUDEDIR) cp -R include/. $(DESTDIR)$(INCLUDEDIR)/. + cp -R arch/$(HOSTARCH)/*.h $(DESTDIR)$(INCLUDEDIR)/. install-libs: $(BINARIES) mkdir -p $(DESTDIR)$(LIBDIR)