diff options
| author | Ian Moffett <ian@osmora.org> | 2025-09-14 15:01:34 -0400 |
|---|---|---|
| committer | Ian Moffett <ian@osmora.org> | 2025-09-14 15:01:34 -0400 |
| commit | 1c0dfd67e7c181951f490f4e58693582f2c3871a (patch) | |
| tree | 76fd404af48d6fca09d91afff450e4005bf56d49 | |
| parent | 5c5212939765f421e5bb39f93b67430f8dfab6ae (diff) | |
build: Do not have per subsystem libs
Signed-off-by: Ian Moffett <ian@osmora.org>
| -rw-r--r-- | src/sys/Makefile | 4 | ||||
| -rw-r--r-- | src/sys/arch/amd64/Makefile | 2 | ||||
| -rw-r--r-- | src/sys/lib/Makefile | 25 | ||||
| -rw-r--r-- | src/sys/os/Makefile | 1 |
4 files changed, 2 insertions, 30 deletions
diff --git a/src/sys/Makefile b/src/sys/Makefile index 6cdf604..561da50 100644 --- a/src/sys/Makefile +++ b/src/sys/Makefile @@ -12,10 +12,6 @@ all: os lib md os: cd os; make CC=$(CC) LD=$(LD) AS=$(AS) TARGETDIR=$(TARGETDIR) -.PHONY: lib -lib: - cd lib; make CC=$(CC) LD=$(LD) AS=$(AS) TARGETDIR=$(TARGETDIR) - .PHONY: md md: cd $(TARGETDIR); make CC=$(CC) LD=$(LD) AS=$(AS) diff --git a/src/sys/arch/amd64/Makefile b/src/sys/arch/amd64/Makefile index 6bb723b..f4f4f48 100644 --- a/src/sys/arch/amd64/Makefile +++ b/src/sys/arch/amd64/Makefile @@ -13,7 +13,7 @@ ASMOBJECTS = $(ASMFILES:.S=.S.o) DEPS = $(CFILES:.c=.d) ASMDEPS = $(ASMFILES:.S=.S.d) OBJECTS = $(CFILES:%.c=%.o) -LD_FLAGS = -Tconf/sys.ld -L../../target -lkern -lstring +LD_FLAGS = -Tconf/sys.ld -L../../target -lkern .PHONY: all all: $(OBJECTS) $(ASMOBJECTS) diff --git a/src/sys/lib/Makefile b/src/sys/lib/Makefile deleted file mode 100644 index 46e4aec..0000000 --- a/src/sys/lib/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -include ../conf/sys.mk - -.SILENT: -override PROMPT := printf "%s\t\t%s\n" - -TARGET_LIB = ../target/libstring.a -CFLAGS = -I../include/ -I../include/lib/ -I../target/header/ $(MI_CFLAGS) -O0 -CFILES = $(shell find . -name "*.c") - -DEPS = $(CFILES:.c=.d) -OBJECTS = $(CFILES:%.c=%.o) - -.PHONY: all -all: $(OBJECTS) - $(PROMPT) " MI.AR " $< - ar rcs $(TARGET_LIB) $(OBJECTS) - --include $(DEPS) -%.o: %.c - $(PROMPT) " MI.CC " $< - $(CC) -c $(CFLAGS) $< -o $@ - -.PHONY: clean -clean: - rm -f $(DEPS) $(OBJECTS) diff --git a/src/sys/os/Makefile b/src/sys/os/Makefile index 47211b3..c0bd363 100644 --- a/src/sys/os/Makefile +++ b/src/sys/os/Makefile @@ -6,6 +6,7 @@ override PROMPT := printf "%s\t\t%s\n" TARGET_LIB = ../target/libkern.a CFLAGS = -I../include/ -I../include/lib/ -I../target/header/ $(MI_CFLAGS) -O0 CFILES = $(shell find . -name "*.c") +CFILES += $(shell find ../lib -name "*.c") DEPS = $(CFILES:.c=.d) OBJECTS = $(CFILES:%.c=%.o) |