| author | Lars Hjemli <hjemli@gmail.com> | 2008-10-11 18:21:17 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2008-10-11 18:21:17 (UTC) |
| commit | 8011587ef34d98398b60be8fcd6c6ecf499c0676 (patch) (side-by-side diff) | |
| tree | e5b980763fe2c86b52932e959aa8eeeefb6bd44c | |
| parent | ed7ff095ca467cdc4c8a1a1459847d68e50c9b91 (diff) | |
| parent | efaccb3d6ab7abc459681e27b6c9b2d8119333eb (diff) | |
| download | cgit-8011587ef34d98398b60be8fcd6c6ecf499c0676.zip cgit-8011587ef34d98398b60be8fcd6c6ecf499c0676.tar.gz cgit-8011587ef34d98398b60be8fcd6c6ecf499c0676.tar.bz2 | |
Merge branch 'stable'
* stable:
Makefile: enable compilation on uclibc
| -rw-r--r-- | Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -80,32 +80,35 @@ endif .PHONY: all libgit test install uninstall clean force-version get-git all: cgit VERSION: force-version @./gen-version.sh "$(CGIT_VERSION)" -include VERSION CFLAGS += -g -Wall -Igit CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' +ifdef NO_ICONV + CFLAGS += -DNO_ICONV +endif cgit: $(OBJECTS) libgit $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) cgit.o: VERSION -include $(OBJECTS:.o=.d) libgit: $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a test: all $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all install: all |