Makefile: fix git dependency rules

[ps-cgit] / Makefile

diff --git a/Makefile b/Makefile
index 223765d6642f45a5751ca8ef2a16cca6ca5f2495..e807d1e48e9b850309ac5a0deb2e5ebc263d278b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.5.4.1
+GIT_VER = 1.5.6
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
 #
@@ -51,6 +51,7 @@ OBJECTS =
 OBJECTS += cache.o
 OBJECTS += cgit.o
 OBJECTS += cmd.o
+OBJECTS += configfile.o
 OBJECTS += html.o
 OBJECTS += parsing.o
 OBJECTS += shared.o
@@ -74,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)"
@@ -92,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