Merge branch 'stable'

[ps-cgit] / Makefile

diff --git a/Makefile b/Makefile
index 68d617e02e0b89287f39c314e1ebb89700cd7668..e39be189a0a51e9d2889ce4e667500b3a0b0cbf1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,15 @@ GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
 OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
        ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \
 EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
 OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
        ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \

-       ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o
+       ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o ui-patch.o

 
 
 
 

-.PHONY: all git install clean distclean emptycache force-version get-git
+ifdef NEEDS_LIBICONV
+       EXTLIBS += -liconv
+endif
+
+
+.PHONY: all git test install clean distclean emptycache force-version get-git

 
 all: cgit git
 
 
 all: cgit git
 


@@ -49,6 +54,9 @@ git:
        cd git && $(MAKE) xdiff/lib.a
        cd git && $(MAKE) libgit.a
 
        cd git && $(MAKE) xdiff/lib.a
        cd git && $(MAKE) libgit.a
 

+test: all
+       $(MAKE) -C tests
+

 install: all
        mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
        install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
 install: all
        mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
        install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)