Unidiff1 files changed, 3 insertions, 0 deletions
|
diff --git a/Makefile b/Makefile index 3ee2a59..3c27422 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -84,24 +84,27 @@ all: cgit |
84 | VERSION: force-version |
84 | VERSION: force-version |
85 | @./gen-version.sh "$(CGIT_VERSION)" |
85 | @./gen-version.sh "$(CGIT_VERSION)" |
86 | -include VERSION |
86 | -include VERSION |
87 | |
87 | |
88 | |
88 | |
89 | CFLAGS += -g -Wall -Igit |
89 | CFLAGS += -g -Wall -Igit |
90 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
90 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
91 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
91 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
92 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
92 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
93 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
93 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
94 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
94 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
95 | |
95 | |
| |
96 | ifdef NO_ICONV |
| |
97 | CFLAGS += -DNO_ICONV |
| |
98 | endif |
96 | |
99 | |
97 | cgit: $(OBJECTS) libgit |
100 | cgit: $(OBJECTS) libgit |
98 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
101 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
99 | |
102 | |
100 | cgit.o: VERSION |
103 | cgit.o: VERSION |
101 | |
104 | |
102 | -include $(OBJECTS:.o=.d) |
105 | -include $(OBJECTS:.o=.d) |
103 | |
106 | |
104 | libgit: |
107 | libgit: |
105 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a |
108 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a |
106 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a |
109 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a |
107 | |
110 | |
|