diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-04 18:13:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-04 18:13:54 -0700 |
| commit | 110cb41cbf7b7cfefdc1f9fab521f165dd1d5d00 (patch) | |
| tree | 4f605e3892d749c2c70b1366cd826299d4da3e57 /Makefile | |
| parent | afb28f239ff677cc57fc5dad47c2104537aff922 (diff) | |
| parent | 8d9fbe57b3acf756a9325884d11f004ef6f7e884 (diff) | |
| download | git-110cb41cbf7b7cfefdc1f9fab521f165dd1d5d00.tar.gz git-110cb41cbf7b7cfefdc1f9fab521f165dd1d5d00.tar.xz | |
Merge branch 'nh/http' into next
* nh/http:
http-fetch: add optional DAV-based pack list
cvsimport: use git-update-ref when updating
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -513,6 +513,11 @@ exec_cmd.o: exec_cmd.c http.o: http.c $(CC) -o $*.o -c $(ALL_CFLAGS) -DGIT_USER_AGENT='"git/$(GIT_VERSION)"' $< +ifdef NO_EXPAT +http-fetch.o: http-fetch.c + $(CC) -o $*.o -c $(ALL_CFLAGS) -DNO_EXPAT $< +endif + git-%$X: %.o $(GITLIBS) $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) @@ -535,7 +540,7 @@ git-imap-send$X: imap-send.o $(LIB_FILE) git-http-fetch$X: fetch.o http.o http-fetch.o $(LIB_FILE) $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ - $(LIBS) $(CURL_LIBCURL) + $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) git-http-push$X: revision.o http.o http-push.o $(LIB_FILE) $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ |