diff options
author | Lars Hjemli | 2008-07-22 19:30:06 +0200 |
---|---|---|
committer | Lars Hjemli | 2008-07-22 19:42:06 +0200 |
commit | bb7485e8d7932ba04a94714bfe6a86a1e323435c (patch) | |
tree | 1add8c867ba8ecd54314e131859d985de5f790fe | |
parent | f49ea2c9968a8b30c0c268ca52aa066960fd98f7 (diff) | |
download | cgit-bb7485e8d7932ba04a94714bfe6a86a1e323435c.tar.gz cgit-bb7485e8d7932ba04a94714bfe6a86a1e323435c.tar.bz2 cgit-bb7485e8d7932ba04a94714bfe6a86a1e323435c.zip |
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>
-rw-r--r-- | Makefile | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -75,7 +75,7 @@ endif | |||
75 | 75 | ||
76 | .PHONY: all git test install clean distclean emptycache force-version get-git | 76 | .PHONY: all git test install clean distclean emptycache force-version get-git |
77 | 77 | ||
78 | all: cgit git | 78 | all: cgit |
79 | 79 | ||
80 | VERSION: force-version | 80 | VERSION: force-version |
81 | @./gen-version.sh "$(CGIT_VERSION)" | 81 | @./gen-version.sh "$(CGIT_VERSION)" |
@@ -93,15 +93,13 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' | |||
93 | cgit: $(OBJECTS) | 93 | cgit: $(OBJECTS) |
94 | $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) | 94 | $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
95 | 95 | ||
96 | $(OBJECTS): git/xdiff/lib.a git/libgit.a | 96 | $(OBJECTS): | git/xdiff/lib.a git/libgit.a |
97 | 97 | ||
98 | cgit.o: VERSION | 98 | cgit.o: VERSION |
99 | 99 | ||
100 | -include $(OBJECTS:.o=.d) | 100 | -include $(OBJECTS:.o=.d) |
101 | 101 | ||
102 | git/xdiff/lib.a: | git | 102 | git/xdiff/lib.a, git/libgit.a: git |
103 | |||
104 | git/libgit.a: | git | ||
105 | 103 | ||
106 | git: | 104 | git: |
107 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a | 105 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a |