|
diff --git a/Makefile b/Makefile index 84790a8..a988751 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -70,96 +70,97 @@ endif |
70 | ifndef V |
70 | ifndef V |
71 | QUIET_CC = @echo ' ' CC $@; |
71 | QUIET_CC = @echo ' ' CC $@; |
72 | QUIET_MM = @echo ' ' MM $@; |
72 | QUIET_MM = @echo ' ' MM $@; |
73 | QUIET_SUBDIR0 = +@subdir= |
73 | QUIET_SUBDIR0 = +@subdir= |
74 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
74 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
75 | $(MAKE) $(PRINT_DIR) -C $$subdir |
75 | $(MAKE) $(PRINT_DIR) -C $$subdir |
76 | endif |
76 | endif |
77 | |
77 | |
78 | # |
78 | # |
79 | # Define a pattern rule for automatic dependency building |
79 | # Define a pattern rule for automatic dependency building |
80 | # |
80 | # |
81 | %.d: %.c |
81 | %.d: %.c |
82 | $(QUIET_MM)$(CC) $(CFLAGS) -MM -MP $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
82 | $(QUIET_MM)$(CC) $(CFLAGS) -MM -MP $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
83 | |
83 | |
84 | # |
84 | # |
85 | # Define a pattern rule for silent object building |
85 | # Define a pattern rule for silent object building |
86 | # |
86 | # |
87 | %.o: %.c |
87 | %.o: %.c |
88 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
88 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
89 | |
89 | |
90 | |
90 | |
91 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread |
91 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread |
92 | OBJECTS = |
92 | OBJECTS = |
93 | OBJECTS += cache.o |
93 | OBJECTS += cache.o |
94 | OBJECTS += cgit.o |
94 | OBJECTS += cgit.o |
95 | OBJECTS += cmd.o |
95 | OBJECTS += cmd.o |
96 | OBJECTS += configfile.o |
96 | OBJECTS += configfile.o |
97 | OBJECTS += html.o |
97 | OBJECTS += html.o |
98 | OBJECTS += parsing.o |
98 | OBJECTS += parsing.o |
99 | OBJECTS += scan-tree.o |
99 | OBJECTS += scan-tree.o |
100 | OBJECTS += shared.o |
100 | OBJECTS += shared.o |
101 | OBJECTS += ui-atom.o |
101 | OBJECTS += ui-atom.o |
102 | OBJECTS += ui-blob.o |
102 | OBJECTS += ui-blob.o |
103 | OBJECTS += ui-clone.o |
103 | OBJECTS += ui-clone.o |
104 | OBJECTS += ui-commit.o |
104 | OBJECTS += ui-commit.o |
105 | OBJECTS += ui-diff.o |
105 | OBJECTS += ui-diff.o |
106 | OBJECTS += ui-log.o |
106 | OBJECTS += ui-log.o |
107 | OBJECTS += ui-patch.o |
107 | OBJECTS += ui-patch.o |
108 | OBJECTS += ui-plain.o |
108 | OBJECTS += ui-plain.o |
109 | OBJECTS += ui-refs.o |
109 | OBJECTS += ui-refs.o |
110 | OBJECTS += ui-repolist.o |
110 | OBJECTS += ui-repolist.o |
111 | OBJECTS += ui-shared.o |
111 | OBJECTS += ui-shared.o |
112 | OBJECTS += ui-snapshot.o |
112 | OBJECTS += ui-snapshot.o |
113 | OBJECTS += ui-ssdiff.o |
113 | OBJECTS += ui-ssdiff.o |
114 | OBJECTS += ui-stats.o |
114 | OBJECTS += ui-stats.o |
115 | OBJECTS += ui-summary.o |
115 | OBJECTS += ui-summary.o |
116 | OBJECTS += ui-tag.o |
116 | OBJECTS += ui-tag.o |
117 | OBJECTS += ui-tree.o |
117 | OBJECTS += ui-tree.o |
| |
118 | OBJECTS += vector.o |
118 | |
119 | |
119 | ifdef NEEDS_LIBICONV |
120 | ifdef NEEDS_LIBICONV |
120 | EXTLIBS += -liconv |
121 | EXTLIBS += -liconv |
121 | endif |
122 | endif |
122 | |
123 | |
123 | |
124 | |
124 | .PHONY: all libgit test install uninstall clean force-version get-git \ |
125 | .PHONY: all libgit test install uninstall clean force-version get-git \ |
125 | doc clean-doc install-doc install-man install-html install-pdf \ |
126 | doc clean-doc install-doc install-man install-html install-pdf \ |
126 | uninstall-doc uninstall-man uninstall-html uninstall-pdf |
127 | uninstall-doc uninstall-man uninstall-html uninstall-pdf |
127 | |
128 | |
128 | all: cgit |
129 | all: cgit |
129 | |
130 | |
130 | VERSION: force-version |
131 | VERSION: force-version |
131 | @./gen-version.sh "$(CGIT_VERSION)" |
132 | @./gen-version.sh "$(CGIT_VERSION)" |
132 | -include VERSION |
133 | -include VERSION |
133 | |
134 | |
134 | |
135 | |
135 | CFLAGS += -g -Wall -Igit |
136 | CFLAGS += -g -Wall -Igit |
136 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
137 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
137 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
138 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
138 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
139 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
139 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
140 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
140 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
141 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
141 | |
142 | |
142 | GIT_OPTIONS = prefix=/usr |
143 | GIT_OPTIONS = prefix=/usr |
143 | |
144 | |
144 | ifdef NO_ICONV |
145 | ifdef NO_ICONV |
145 | CFLAGS += -DNO_ICONV |
146 | CFLAGS += -DNO_ICONV |
146 | endif |
147 | endif |
147 | ifdef NO_STRCASESTR |
148 | ifdef NO_STRCASESTR |
148 | CFLAGS += -DNO_STRCASESTR |
149 | CFLAGS += -DNO_STRCASESTR |
149 | endif |
150 | endif |
150 | ifdef NO_C99_FORMAT |
151 | ifdef NO_C99_FORMAT |
151 | CFLAGS += -DNO_C99_FORMAT |
152 | CFLAGS += -DNO_C99_FORMAT |
152 | endif |
153 | endif |
153 | ifdef NO_OPENSSL |
154 | ifdef NO_OPENSSL |
154 | CFLAGS += -DNO_OPENSSL |
155 | CFLAGS += -DNO_OPENSSL |
155 | GIT_OPTIONS += NO_OPENSSL=1 |
156 | GIT_OPTIONS += NO_OPENSSL=1 |
156 | else |
157 | else |
157 | EXTLIBS += -lcrypto |
158 | EXTLIBS += -lcrypto |
158 | endif |
159 | endif |
159 | |
160 | |
160 | cgit: $(OBJECTS) libgit |
161 | cgit: $(OBJECTS) libgit |
161 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
162 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
162 | |
163 | |
163 | cgit.o: VERSION |
164 | cgit.o: VERSION |
164 | |
165 | |
165 | ifneq "$(MAKECMDGOALS)" "clean" |
166 | ifneq "$(MAKECMDGOALS)" "clean" |
|