From 66dbf0dd03f5dcedc1bce9f18437f211871a69e6 Mon Sep 17 00:00:00 2001 From: Zeev Belinsky Date: Sun, 3 May 2026 08:40:27 -0700 Subject: [PATCH] Fix make clean to remove orphaned .o files --- kernel/Makefile | 2 +- libs/blast/Makefile | 6 +++--- libs/locks/Makefile | 2 +- libs/qurt/Makefile | 4 ++-- libs/syscall/angel/Makefile | 4 ++-- libs/syscall/wrapper/Makefile | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index 360b65435..9f7d16fbc 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -185,7 +185,7 @@ build/ref/libh2check.a: $(CHECK_OFILES) $(CC) $(CFLAGS) -c -o $@ $< clean: - rm -rf $(ALL_OFILES) $(DEST_HFILES) $(CLEAN_EXTRAS) include/* build/ref build/opt* \ + rm -rf $$(find . -name '*.o') $(DEST_HFILES) $(CLEAN_EXTRAS) include/* build/ref build/opt* \ sched/check_sanity/check_sanity_debug.h util/intcontrol/intcontrol_debug.h \ pmu_statsfile.txt diff --git a/libs/blast/Makefile b/libs/blast/Makefile index a1d0646d7..61bf71619 100644 --- a/libs/blast/Makefile +++ b/libs/blast/Makefile @@ -8,15 +8,15 @@ OPTIMIZE := -O2 export BLAST_LIB_INCLUDE=$(shell pwd)/include -ASM_FILES = src/blast_lifo.S -C_FILES = src/blast_fd.c src/blast_int.c src/blast_tls.c src/blast_anysignal.c src/blast_thread.c +ASM_FILES = $(wildcard src/*.S) +C_FILES = $(wildcard src/*.c) O_FILES = $(ASM_FILES:.S=.o) $(C_FILES:.c=.o) all: libblast.a clean: - rm -f libblast.a $(O_FILES) + rm -f libblast.a src/*.o libblast.a: $(O_FILES) $(AR) cru $@ $(sort $(O_FILES)) diff --git a/libs/locks/Makefile b/libs/locks/Makefile index ea32293d2..dd148877b 100644 --- a/libs/locks/Makefile +++ b/libs/locks/Makefile @@ -29,7 +29,7 @@ O_FILES = $(ASM_FILES:.S=.o) $(C_FILES:.c=.o) all: liblocks.a clean: - rm -f liblocks.a $(O_FILES) + rm -f liblocks.a src/*.o liblocks.a: $(O_FILES) $(AR) cru $@ $(sort $(O_FILES)) diff --git a/libs/qurt/Makefile b/libs/qurt/Makefile index e27120b94..42e16e09a 100644 --- a/libs/qurt/Makefile +++ b/libs/qurt/Makefile @@ -10,14 +10,14 @@ CFLAGS = -g $(OPTIMIZE) $(OPT_ADD) -G0 export QURT_LIB_INCLUDE=$(shell pwd)/include ASM_FILES = $(wildcard src/*.S) -C_FILES = src/qurt_fatal.c src/qurt_memory.c src/qurtos_sclk.c src/qurtos_timer_libs.c src/qurtos_timer_server.c src/qurt_pgalloc.c src/qurt_thread.c src/qurt_timer.c src/qurt_timer_hw.c src/qurt_tls.c src/qurt_int.c src/qurt_fd.c src/qurt_qdi.c src/qurt_qdi_local_client.c src/qurt_qdi_signal.c src/qurt_mmap.c src/qurt_misc.c src/qurt_trace.c src/qmutex.c src/qurt_cache.c src/qurt_tlb.c src/qurt_s5alloc.c +C_FILES = $(wildcard src/*.c) O_FILES = $(ASM_FILES:.S=.o) $(C_FILES:.c=.o) all: libqurt.a clean: - rm -f libqurt.a $(O_FILES) + rm -f libqurt.a src/*.o libqurt.a: $(O_FILES) $(AR) cru $@ $(O_FILES) diff --git a/libs/syscall/angel/Makefile b/libs/syscall/angel/Makefile index 27ce53f5f..42d78642e 100644 --- a/libs/syscall/angel/Makefile +++ b/libs/syscall/angel/Makefile @@ -12,7 +12,7 @@ CFLAGS += $(LIB_CFLAGS) $(H2_EXTRA_CFLAGS) export BLAST_LIB_INCLUDE=$(shell pwd)/include -ASM_FILES = src/angel.S +ASM_FILES = $(wildcard src/*.S) C_FILES = $(wildcard src/*.c) O_FILES = $(ASM_FILES:.S=.o) $(C_FILES:.c=.o) @@ -20,7 +20,7 @@ O_FILES = $(ASM_FILES:.S=.o) $(C_FILES:.c=.o) all: libangel.a clean: - rm -f libangel.a $(O_FILES) + rm -f libangel.a src/*.o libangel.a: $(O_FILES) $(AR) cru $@ $(sort $(O_FILES)) diff --git a/libs/syscall/wrapper/Makefile b/libs/syscall/wrapper/Makefile index 4a8924489..725b61159 100644 --- a/libs/syscall/wrapper/Makefile +++ b/libs/syscall/wrapper/Makefile @@ -25,7 +25,7 @@ O_FILES = $(ASM_FILES:.S=.o) $(C_FILES:.c=.o) all: libsyscall_wrapper.a clean: - rm -f libsyscall_wrapper.a $(O_FILES) + rm -f libsyscall_wrapper.a src/*.o libsyscall_wrapper.a: $(O_FILES) $(AR) cru $@ $(sort $(O_FILES))