Unidiff1 files changed, 3 insertions, 5 deletions
|
diff --git a/Makefile b/Makefile index 3719e96..e807d1e 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -74,9 +74,9 @@ endif |
74 | |
74 | |
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)" |
82 | -include VERSION |
82 | -include VERSION |
@@ -92,17 +92,15 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
92 | |
92 | |
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 |
108 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a |
106 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a |
|