aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2008-08-06 18:52:27 +0200
committerLars Hjemli <hjemli@gmail.com>2008-08-06 18:52:27 +0200
commit8c2a1367c49dbe54c90f63ae93e0c78473c7dfba (patch)
tree5ed4ea816af2f82ed43b9f875406b9394cbadde4
parente352a013aed6e925a10a92916500c7deccf1410a (diff)
downloadcgit-8c2a1367c49dbe54c90f63ae93e0c78473c7dfba.tar.gz
cgit-8c2a1367c49dbe54c90f63ae93e0c78473c7dfba.tar.xz
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>
-rw-r--r--Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 6458431..ab0bbd4 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@ ifdef NEEDS_LIBICONV
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
@@ -91,17 +91,15 @@ CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
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)
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
test: all