From: Carl Worth <cworth@cworth.org>
Date: Fri, 23 Sep 2011 06:04:07 +0000 (-0700)
Subject: Makefile: Fix automatic generation of dependencies.
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;ds=sidebyside;h=f15abc24d2c9a574d1209922a0d9825df21245f8;p=scherzo

Makefile: Fix automatic generation of dependencies.

Without this, updates to the header file were not triggering rebuilds
of the source. Things are much more convenient with this.
---

diff --git a/Makefile b/Makefile
index a5e8015..a00d6bf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 all: scherzo
 
-scherzo_srcs =		\
+scherzo_srcs :=		\
 	scherzo.c	\
 	score.c
 
@@ -25,16 +25,16 @@ endif
 # Otherwise, print the full command line.
 quiet ?= $($(shell echo $1 | sed -e s'/ .*//'))
 
-.deps/%.d: %.cpp $(global_deps)
+.deps/%.d: %.c Makefile
 	@set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
-	$(CXX) -M $(CPPFLAGS) $(FINAL_CXXFLAGS) $< > $@.$$$$ 2>/dev/null ; \
+	$(CC) -M $(CPPFLAGS) $(SCHERZO_CFLAGS) $< > $@.$$$$ 2>/dev/null ; \
 	sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
 	rm -f $@.$$$$
 
-DEPS := $(DEPS:%.cpp=.deps/%.d)
+DEPS := $(scherzo_srcs:%.c=.deps/%.d)
 -include $(DEPS)
 
-%.o: %.c $(global_deps)
+%.o: %.c Makefile
 	$(call quiet,CC $(CFLAGS)) -c $(SCHERZO_CFLAGS) $< -o $@
 
 scherzo: $(scherzo_modules)