From 54057e15f6160d2d8691b5f193063fd95495a37b Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Tue, 11 Jul 2023 03:30:05 -0300 Subject: build: move EXTRA vars directly into targets --- src/prog.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/prog.mk') diff --git a/src/prog.mk b/src/prog.mk index 87e1806a8..debdf3572 100644 --- a/src/prog.mk +++ b/src/prog.mk @@ -5,18 +5,18 @@ # The includer should probably define PROG and TARGET and may also want to # define EXTRA_HDRS and EXTRA_OBJS and extend CLEANFILES. -HDRS := $(sort $(wildcard $(MOD_DIR)/*.h)) $(EXTRA_HDRS) +HDRS := $(sort $(wildcard $(MOD_DIR)/*.h)) SRCS := $(sort $(wildcard $(MOD_DIR)/*.c)) -OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS) +OBJS := $(SRCS:.c=.o) .PHONY: all all: $(TARGET) -%.o : %.c $(HDRS) $(ROOT)/config.mk +%.o : %.c $(HDRS) $(EXTRA_HDRS) $(ROOT)/config.mk $(CC) $(PROG_CFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ -$(PROG): $(OBJS) $(ROOT)/config.mk - $(CC) $(PROG_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) +$(PROG): $(OBJS) $(EXTRA_OBJS) $(ROOT)/config.mk + $(CC) $(PROG_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRA_OBJS) $(LIBS) .PHONY: clean clean:; rm -fr $(PROG) $(CLEANFILES) -- cgit v1.2.3-54-g00ecf