aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 5 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index a305894..e4265f7 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
4CGIT_CONFIG = /etc/cgitrc 4CGIT_CONFIG = /etc/cgitrc
5CACHE_ROOT = /var/cache/cgit 5CACHE_ROOT = /var/cache/cgit
6SHA1_HEADER = <openssl/sha.h> 6SHA1_HEADER = <openssl/sha.h>
7GIT_VER = 1.5.6 7GIT_VER = 1.6.0.rc1
8GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 8GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
9 9
10# 10#
@@ -55,6 +55,7 @@ OBJECTS += configfile.o
55OBJECTS += html.o 55OBJECTS += html.o
56OBJECTS += parsing.o 56OBJECTS += parsing.o
57OBJECTS += shared.o 57OBJECTS += shared.o
58OBJECTS += ui-atom.o
58OBJECTS += ui-blob.o 59OBJECTS += ui-blob.o
59OBJECTS += ui-clone.o 60OBJECTS += ui-clone.o
60OBJECTS += ui-commit.o 61OBJECTS += ui-commit.o
@@ -75,7 +76,7 @@ ifdef NEEDS_LIBICONV
75endif 76endif
76 77
77 78
78.PHONY: all git test install uninstall clean force-version get-git 79.PHONY: all libgit test install uninstall clean force-version get-git
79 80
80all: cgit 81all: cgit
81 82
@@ -92,17 +93,15 @@ CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
92CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' 93CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
93 94
94 95
95cgit: $(OBJECTS) git/libgit.a git/xdiff/lib.a 96cgit: $(OBJECTS) libgit
96 $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) 97 $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
97 98
98cgit.o: VERSION 99cgit.o: VERSION
99 100
100-include $(OBJECTS:.o=.d) 101-include $(OBJECTS:.o=.d)
101 102
102git/libgit.a: git 103libgit:
103 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a 104 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
104
105git/xdiff/lib.a: git
106 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a 105 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
107 106
108test: all 107test: all