author | Lars Hjemli <hjemli@gmail.com> | 2009-12-08 18:32:48 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-12-08 18:32:48 (UTC) |
commit | f4f6210b4f9c214dc247567bbd06b1135c9ecd06 (patch) (unidiff) | |
tree | 432b3dc327e05220c6ac0aff9ca81cf38a47524c /Makefile | |
parent | 57bb4fdb8419d7c250d4c6146910df3263943951 (diff) | |
parent | 735e15e38a484bf0daa98776fa7cde270a271cda (diff) | |
download | cgit-f4f6210b4f9c214dc247567bbd06b1135c9ecd06.zip cgit-f4f6210b4f9c214dc247567bbd06b1135c9ecd06.tar.gz cgit-f4f6210b4f9c214dc247567bbd06b1135c9ecd06.tar.bz2 |
Merge branch 'ro/ssdiff'
-rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -72,48 +72,49 @@ endif | |||
72 | 72 | ||
73 | 73 | ||
74 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz | 74 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz |
75 | OBJECTS = | 75 | OBJECTS = |
76 | OBJECTS += cache.o | 76 | OBJECTS += cache.o |
77 | OBJECTS += cgit.o | 77 | OBJECTS += cgit.o |
78 | OBJECTS += cmd.o | 78 | OBJECTS += cmd.o |
79 | OBJECTS += configfile.o | 79 | OBJECTS += configfile.o |
80 | OBJECTS += html.o | 80 | OBJECTS += html.o |
81 | OBJECTS += parsing.o | 81 | OBJECTS += parsing.o |
82 | OBJECTS += scan-tree.o | 82 | OBJECTS += scan-tree.o |
83 | OBJECTS += shared.o | 83 | OBJECTS += shared.o |
84 | OBJECTS += ui-atom.o | 84 | OBJECTS += ui-atom.o |
85 | OBJECTS += ui-blob.o | 85 | OBJECTS += ui-blob.o |
86 | OBJECTS += ui-clone.o | 86 | OBJECTS += ui-clone.o |
87 | OBJECTS += ui-commit.o | 87 | OBJECTS += ui-commit.o |
88 | OBJECTS += ui-diff.o | 88 | OBJECTS += ui-diff.o |
89 | OBJECTS += ui-log.o | 89 | OBJECTS += ui-log.o |
90 | OBJECTS += ui-patch.o | 90 | OBJECTS += ui-patch.o |
91 | OBJECTS += ui-plain.o | 91 | OBJECTS += ui-plain.o |
92 | OBJECTS += ui-refs.o | 92 | OBJECTS += ui-refs.o |
93 | OBJECTS += ui-repolist.o | 93 | OBJECTS += ui-repolist.o |
94 | OBJECTS += ui-shared.o | 94 | OBJECTS += ui-shared.o |
95 | OBJECTS += ui-snapshot.o | 95 | OBJECTS += ui-snapshot.o |
96 | OBJECTS += ui-ssdiff.o | ||
96 | OBJECTS += ui-stats.o | 97 | OBJECTS += ui-stats.o |
97 | OBJECTS += ui-summary.o | 98 | OBJECTS += ui-summary.o |
98 | OBJECTS += ui-tag.o | 99 | OBJECTS += ui-tag.o |
99 | OBJECTS += ui-tree.o | 100 | OBJECTS += ui-tree.o |
100 | 101 | ||
101 | ifdef NEEDS_LIBICONV | 102 | ifdef NEEDS_LIBICONV |
102 | EXTLIBS += -liconv | 103 | EXTLIBS += -liconv |
103 | endif | 104 | endif |
104 | 105 | ||
105 | 106 | ||
106 | .PHONY: all libgit test install uninstall clean force-version get-git \ | 107 | .PHONY: all libgit test install uninstall clean force-version get-git \ |
107 | doc man-doc html-doc clean-doc | 108 | doc man-doc html-doc clean-doc |
108 | 109 | ||
109 | all: cgit | 110 | all: cgit |
110 | 111 | ||
111 | VERSION: force-version | 112 | VERSION: force-version |
112 | @./gen-version.sh "$(CGIT_VERSION)" | 113 | @./gen-version.sh "$(CGIT_VERSION)" |
113 | -include VERSION | 114 | -include VERSION |
114 | 115 | ||
115 | 116 | ||
116 | CFLAGS += -g -Wall -Igit | 117 | CFLAGS += -g -Wall -Igit |
117 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | 118 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
118 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | 119 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
119 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | 120 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |