From bb7485e8d7932ba04a94714bfe6a86a1e323435c Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Tue, 22 Jul 2008 19:30:06 +0200 Subject: [PATCH] Makefile: fix git dependency rules The objectfiles depends unconditionally on some specific git binaries while those git binaries depends on the phony `git` target and this patch seems to get these dependencies spelled out correctly. Signed-off-by: Lars Hjemli --- Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 3719e96..e807d1e 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,7 @@ endif .PHONY: all git test install clean distclean emptycache force-version get-git -all: cgit git +all: cgit VERSION: force-version @./gen-version.sh "$(CGIT_VERSION)" @@ -93,15 +93,13 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' cgit: $(OBJECTS) $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) -$(OBJECTS): git/xdiff/lib.a git/libgit.a +$(OBJECTS): | git/xdiff/lib.a git/libgit.a cgit.o: VERSION -include $(OBJECTS:.o=.d) -git/xdiff/lib.a: | git - -git/libgit.a: | git +git/xdiff/lib.a, git/libgit.a: git git: $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a