author | Lars Hjemli <hjemli@gmail.com> | 2009-01-27 19:16:37 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-27 19:16:37 (UTC) |
commit | 7710178e45dee61e85ea77c4221309ce8c086f95 (patch) (unidiff) | |
tree | 281c5251777308f18c05d323183b28470445f4bc /Makefile | |
parent | e78186dcb63ec67a38dddfcd8f91d2108583320b (diff) | |
parent | b54ef9749c083afd86573112fad3b3ed8ee2d0e4 (diff) | |
download | cgit-7710178e45dee61e85ea77c4221309ce8c086f95.zip cgit-7710178e45dee61e85ea77c4221309ce8c086f95.tar.gz cgit-7710178e45dee61e85ea77c4221309ce8c086f95.tar.bz2 |
Merge branch 'lh/stats'
Conflicts:
cgit.c
cgit.css
cgit.h
ui-tree.c
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -69,48 +69,49 @@ endif | |||
69 | 69 | ||
70 | 70 | ||
71 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | 71 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
72 | OBJECTS = | 72 | OBJECTS = |
73 | OBJECTS += cache.o | 73 | OBJECTS += cache.o |
74 | OBJECTS += cgit.o | 74 | OBJECTS += cgit.o |
75 | OBJECTS += cmd.o | 75 | OBJECTS += cmd.o |
76 | OBJECTS += configfile.o | 76 | OBJECTS += configfile.o |
77 | OBJECTS += html.o | 77 | OBJECTS += html.o |
78 | OBJECTS += parsing.o | 78 | OBJECTS += parsing.o |
79 | OBJECTS += scan-tree.o | 79 | OBJECTS += scan-tree.o |
80 | OBJECTS += shared.o | 80 | OBJECTS += shared.o |
81 | OBJECTS += ui-atom.o | 81 | OBJECTS += ui-atom.o |
82 | OBJECTS += ui-blob.o | 82 | OBJECTS += ui-blob.o |
83 | OBJECTS += ui-clone.o | 83 | OBJECTS += ui-clone.o |
84 | OBJECTS += ui-commit.o | 84 | OBJECTS += ui-commit.o |
85 | OBJECTS += ui-diff.o | 85 | OBJECTS += ui-diff.o |
86 | OBJECTS += ui-log.o | 86 | OBJECTS += ui-log.o |
87 | OBJECTS += ui-patch.o | 87 | OBJECTS += ui-patch.o |
88 | OBJECTS += ui-plain.o | 88 | OBJECTS += ui-plain.o |
89 | OBJECTS += ui-refs.o | 89 | OBJECTS += ui-refs.o |
90 | OBJECTS += ui-repolist.o | 90 | OBJECTS += ui-repolist.o |
91 | OBJECTS += ui-shared.o | 91 | OBJECTS += ui-shared.o |
92 | OBJECTS += ui-snapshot.o | 92 | OBJECTS += ui-snapshot.o |
93 | OBJECTS += ui-stats.o | ||
93 | OBJECTS += ui-summary.o | 94 | OBJECTS += ui-summary.o |
94 | OBJECTS += ui-tag.o | 95 | OBJECTS += ui-tag.o |
95 | OBJECTS += ui-tree.o | 96 | OBJECTS += ui-tree.o |
96 | 97 | ||
97 | ifdef NEEDS_LIBICONV | 98 | ifdef NEEDS_LIBICONV |
98 | EXTLIBS += -liconv | 99 | EXTLIBS += -liconv |
99 | endif | 100 | endif |
100 | 101 | ||
101 | 102 | ||
102 | .PHONY: all libgit test install uninstall clean force-version get-git | 103 | .PHONY: all libgit test install uninstall clean force-version get-git |
103 | 104 | ||
104 | all: cgit | 105 | all: cgit |
105 | 106 | ||
106 | VERSION: force-version | 107 | VERSION: force-version |
107 | @./gen-version.sh "$(CGIT_VERSION)" | 108 | @./gen-version.sh "$(CGIT_VERSION)" |
108 | -include VERSION | 109 | -include VERSION |
109 | 110 | ||
110 | 111 | ||
111 | CFLAGS += -g -Wall -Igit | 112 | CFLAGS += -g -Wall -Igit |
112 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | 113 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
113 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | 114 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
114 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | 115 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
115 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | 116 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
116 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' | 117 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |