Mirror von
https://github.com/tkuschel/bees.git
synchronisiert 2026-10-10 20:51:49 +02:00
src: use correct flags for compiling .c files, fix missing dependencies
fiewalk and fiemap depend on a lot of crucible, and incremental builds fail hard without proper dependency tracking. All binaries must be rebuilt when makeflags changes. This dependency exists already in lib and test, but src was missing. Signed-off-by: Zygo Blaxell <bees@furryterror.org>
Dieser Commit ist enthalten in:
1 Ursprung
d2ecb4c9ea
Commit
ab5316a3da
1 Datei geändert
+9
-2
+9
-2
@@ -3,6 +3,8 @@ PROGRAMS = \
|
||||
../bin/fiemap \
|
||||
../bin/fiewalk \
|
||||
|
||||
PROGRAM_OBJS = $(foreach b,$(PROGRAMS),$(patsubst ../bin/%,%.o,$(b)))
|
||||
|
||||
all: $(BEES) $(PROGRAMS)
|
||||
|
||||
include ../makeflags
|
||||
@@ -19,6 +21,8 @@ BEES_OBJS = \
|
||||
bees-thread.o \
|
||||
bees-types.o \
|
||||
|
||||
ALL_OBJS = $(BEES_OBJS) $(PROGRAM_OBJS)
|
||||
|
||||
bees-version.c: bees.h $(BEES_OBJS:.o=.cc) Makefile
|
||||
echo "const char *BEES_VERSION = \"$(BEES_VERSION)\";" > bees-version.new.c
|
||||
mv -f bees-version.new.c bees-version.c
|
||||
@@ -33,13 +37,16 @@ bees-usage.c: bees-usage.txt Makefile
|
||||
.depends/%.dep: %.cc Makefile | .depends
|
||||
$(CXX) $(BEES_CXXFLAGS) -M -MF $@ -MT $(<:.cc=.o) $<
|
||||
|
||||
depends.mk: $(BEES_OBJS:%.o=.depends/%.dep)
|
||||
depends.mk: $(ALL_OBJS:%.o=.depends/%.dep)
|
||||
cat $^ > $@.new
|
||||
mv -f $@.new $@
|
||||
|
||||
include depends.mk
|
||||
|
||||
$(BEES_OBJS) fiemap.o fiewalk.o: %.o: %.cc
|
||||
%.o: %.c ../makeflags
|
||||
$(CC) $(BEES_CFLAGS) -o $@ -c $<
|
||||
|
||||
%.o: %.cc ../makeflags
|
||||
$(CXX) $(BEES_CXXFLAGS) -o $@ -c $<
|
||||
|
||||
$(PROGRAMS): ../bin/%: %.o
|
||||
|
||||
In neuem Issue referenzieren
Einen Benutzer sperren