Makefile: Git dependency, take 3

In commit a1266edfe the build instructions for the git libs where moved
to their real targets, which in turn depended on the phony target `git`.
But since `git` is an actual directory in cgit the git libs wouldn't be
recompiled when needed.

So with this patch (third time lucky), cgit is declared to depend on the
really phony target `libgit` and the build instructions for `libgit` is
to unconditionally rebuild git/libgit.a and git/xdiff/lib.a.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 3 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 6458431..ab0bbd4 100644
--- a/Makefile
+++ b/Makefile
@@ -75,5 +75,5 @@ endif
 
 
-.PHONY: all git test install uninstall clean force-version get-git
+.PHONY: all libgit test install uninstall clean force-version get-git
 
 all: cgit
@@ -92,5 +92,5 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
 
-cgit: $(OBJECTS) git/libgit.a git/xdiff/lib.a
+cgit: $(OBJECTS) libgit
         $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
 
@@ -99,8 +99,6 @@ cgit.o: VERSION
 -include $(OBJECTS:.o=.d)
 
-git/libgit.a: git
+libgit:
         $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
-
-git/xdiff/lib.a: git
         $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a