Makefiles: improve header dependencies

src/Makefile

@@ -13,7 +13,7 @@ FLAGS = \
 	-Wall -Wno-strict-aliasing -fno-omit-frame-pointer \
 	-Iflisp -Isupport -fvisibility=hidden -fno-common \
 	-I$(shell $(LLVM_CONFIG) --includedir) \
-	-I$(JULIAHOME)/deps/libuv  -I$(USR)/include
+	-I$(JULIAHOME)/deps/libuv/include
 
 ifneq ($(MAKECMDGOALS),debug)
 TARGET =
@@ -38,16 +38,18 @@ default: release
 
 release debug: %: libjulia-%
 
-%.o: %.c julia.h
+HEADERS = julia.h $(wildcard support/*.h) $(JULIAHOME)/deps/libuv/include/uv.h
+
+%.o: %.c $(HEADERS)
 	$(QUIET_CC) $(CC) $(CFLAGS) $(SHIPFLAGS) -c $< -o $@
-%.do: %.c julia.h
+%.do: %.c $(HEADERS)
 	$(QUIET_CC) $(CC) $(CFLAGS) $(DEBUGFLAGS) -c $< -o $@
-%.o: %.cpp julia.h
+%.o: %.cpp $(HEADERS)
 	$(QUIET_CC) $(CXX) $(CXXFLAGS) $(SHIPFLAGS) $(shell $(LLVM_CONFIG) --cppflags) -c $< -o $@
-%.do: %.cpp julia.h
+%.do: %.cpp $(HEADERS)
 	$(QUIET_CC) $(CXX) $(CXXFLAGS) $(DEBUGFLAGS) $(shell $(LLVM_CONFIG) --cppflags) -c $< -o $@
 
-ast.o ast.do: julia_flisp.boot.inc
+ast.o ast.do: julia_flisp.boot.inc flisp/*.h
 
 julia_flisp.boot.inc: julia_flisp.boot flisp/libflisp.a
 	$(QUIET_FLISP) flisp/flisp ./bin2hex.scm < $< > $@

src/support/Makefile

@@ -28,9 +28,11 @@ SHIPFLAGS += $(FLAGS)
 
 default: release
 
-%.o: %.c
+HEADERS = $(wildcard *.h) $(JULIAHOME)/deps/libuv/include/uv.h
+
+%.o: %.c $(HEADERS)
 	$(QUIET_CC) $(CC) $(SHIPFLAGS) -c $< -o $@
-%.do: %.c
+%.do: %.c $(HEADERS)
 	$(QUIET_CC) $(CC) $(DEBUGFLAGS) -c $< -o $@
 
 release debug: libsupport.a