summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorLars Hjemli2008-07-22 19:30:06 +0200
committerLars Hjemli2008-07-22 19:42:06 +0200
commitbb7485e8d7932ba04a94714bfe6a86a1e323435c (patch)
tree1add8c867ba8ecd54314e131859d985de5f790fe
parentf49ea2c9968a8b30c0c268ca52aa066960fd98f7 (diff)
downloadcgit-bb7485e8d7932ba04a94714bfe6a86a1e323435c.tar.gz
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 <hjemli@gmail.com>
Diffstat (limited to '')
-rw-r--r--Makefile8
1 files 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