summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-10-11 18:21:17 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-10-11 18:21:17 (UTC)
commit8011587ef34d98398b60be8fcd6c6ecf499c0676 (patch) (unidiff)
treee5b980763fe2c86b52932e959aa8eeeefb6bd44c
parented7ff095ca467cdc4c8a1a1459847d68e50c9b91 (diff)
parentefaccb3d6ab7abc459681e27b6c9b2d8119333eb (diff)
downloadcgit-8011587ef34d98398b60be8fcd6c6ecf499c0676.zip
cgit-8011587ef34d98398b60be8fcd6c6ecf499c0676.tar.gz
cgit-8011587ef34d98398b60be8fcd6c6ecf499c0676.tar.bz2
Merge branch 'stable'
* stable: Makefile: enable compilation on uclibc
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 3ee2a59..3c27422 100644
--- a/Makefile
+++ b/Makefile
@@ -88,16 +88,19 @@ VERSION: force-version
88 88
89CFLAGS += -g -Wall -Igit 89CFLAGS += -g -Wall -Igit
90CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' 90CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
91CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' 91CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
92CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' 92CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
93CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' 93CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
94CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' 94CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
95 95
96ifdef NO_ICONV
97 CFLAGS += -DNO_ICONV
98endif
96 99
97cgit: $(OBJECTS) libgit 100cgit: $(OBJECTS) libgit
98 $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) 101 $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
99 102
100cgit.o: VERSION 103cgit.o: VERSION
101 104
102-include $(OBJECTS:.o=.d) 105-include $(OBJECTS:.o=.d)
103 106