summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-08-06 16:52:27 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-08-06 16:52:27 (UTC)
commit8c2a1367c49dbe54c90f63ae93e0c78473c7dfba (patch) (unidiff)
tree5ed4ea816af2f82ed43b9f875406b9394cbadde4
parente352a013aed6e925a10a92916500c7deccf1410a (diff)
downloadcgit-8c2a1367c49dbe54c90f63ae93e0c78473c7dfba.zip
cgit-8c2a1367c49dbe54c90f63ae93e0c78473c7dfba.tar.gz
cgit-8c2a1367c49dbe54c90f63ae93e0c78473c7dfba.tar.bz2
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>
Diffstat (more/less context) (ignore whitespace changes)
-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
@@ -75,5 +75,5 @@ endif
75 75
76 76
77.PHONY: all git test install uninstall clean force-version get-git 77.PHONY: all libgit test install uninstall clean force-version get-git
78 78
79all: cgit 79all: cgit
@@ -92,5 +92,5 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
92 92
93 93
94cgit: $(OBJECTS) git/libgit.a git/xdiff/lib.a 94cgit: $(OBJECTS) libgit
95 $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) 95 $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
96 96
@@ -99,8 +99,6 @@ cgit.o: VERSION
99-include $(OBJECTS:.o=.d) 99-include $(OBJECTS:.o=.d)
100 100
101git/libgit.a: git 101libgit:
102 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a 102 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
103
104git/xdiff/lib.a: git
105 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a 103 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
106 104