Unidiff1 files changed, 3 insertions, 5 deletions
|
diff --git a/Makefile b/Makefile index 6458431..ab0bbd4 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -71,13 +71,13 @@ OBJECTS += ui-tree.o |
71 | |
71 | |
72 | ifdef NEEDS_LIBICONV |
72 | ifdef NEEDS_LIBICONV |
73 | EXTLIBS += -liconv |
73 | EXTLIBS += -liconv |
74 | endif |
74 | 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 | |
79 | all: cgit |
79 | all: cgit |
80 | |
80 | |
81 | VERSION: force-version |
81 | VERSION: force-version |
82 | @./gen-version.sh "$(CGIT_VERSION)" |
82 | @./gen-version.sh "$(CGIT_VERSION)" |
83 | -include VERSION |
83 | -include VERSION |
@@ -88,23 +88,21 @@ CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
88 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
88 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
89 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
89 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
90 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
90 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
91 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
91 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
92 | |
92 | |
93 | |
93 | |
94 | cgit: $(OBJECTS) git/libgit.a git/xdiff/lib.a |
94 | cgit: $(OBJECTS) libgit |
95 | $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
95 | $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
96 | |
96 | |
97 | cgit.o: VERSION |
97 | cgit.o: VERSION |
98 | |
98 | |
99 | -include $(OBJECTS:.o=.d) |
99 | -include $(OBJECTS:.o=.d) |
100 | |
100 | |
101 | git/libgit.a: git |
101 | libgit: |
102 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a |
102 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a |
103 | |
| |
104 | git/xdiff/lib.a: git |
| |
105 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a |
103 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a |
106 | |
104 | |
107 | test: all |
105 | test: all |
108 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
106 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
109 | |
107 | |
110 | install: all |
108 | install: all |
|