X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Makefile;h=2a1e6392dddeac520b90e5bccfb841f58018f858;hb=dc5869c00d9aafbddcc11b93b5a0a7fcdeb755ea;hp=004c2169c97c167ada9c8da68aad3998b61501ea;hpb=16a4c6ee0d9a3d07d4d0afbbc4e3467e78065eca;p=git.git diff --git a/Makefile b/Makefile index 004c2169..2a1e6392 100644 --- a/Makefile +++ b/Makefile @@ -144,7 +144,7 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ # The ones that do not have to link with lcrypto, lz nor xdiff. SIMPLE_PROGRAMS = \ - git-get-tar-commit-id$X git-mailsplit$X \ + git-mailsplit$X \ git-stripspace$X git-daemon$X # ... and all the rest that could be moved out of bindir to gitexecdir @@ -169,7 +169,7 @@ BUILT_INS = git-log$X git-whatchanged$X git-show$X \ git-grep$X git-add$X git-rm$X git-rev-list$X \ git-check-ref-format$X git-rev-parse$X \ git-init-db$X git-tar-tree$X git-upload-tar$X git-format-patch$X \ - git-ls-files$X git-ls-tree$X \ + git-ls-files$X git-ls-tree$X git-get-tar-commit-id$X \ git-read-tree$X git-commit-tree$X \ git-apply$X git-show-branch$X git-diff-files$X \ git-diff-index$X git-diff-stages$X git-diff-tree$X git-cat-file$X @@ -210,7 +210,7 @@ DIFF_OBJS = \ LIB_OBJS = \ blob.o commit.o connect.o csum-file.o cache-tree.o base85.o \ - date.o diff-delta.o entry.o exec_cmd.o ident.o index.o \ + date.o diff-delta.o entry.o exec_cmd.o ident.o lockfile.o \ object.o pack-check.o patch-delta.o path.o pkt-line.o \ quote.o read-cache.o refs.o run-command.o dir.o \ server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \ @@ -552,7 +552,7 @@ 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 +http-fetch.o: http-fetch.c http.h $(CC) -o $*.o -c $(ALL_CFLAGS) -DNO_EXPAT $< endif @@ -576,6 +576,7 @@ git-ssh-push$X: rsh.o git-imap-send$X: imap-send.o $(LIB_FILE) +http.o http-fetch.o http-push.o: http.h git-http-fetch$X: fetch.o http.o http-fetch.o $(LIB_FILE) $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) @@ -706,7 +707,7 @@ clean: rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags rm -rf $(GIT_TARNAME) .doc-tmp-dir rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz - rm -f $(htmldocs).tar $(manpages).tar + rm -f $(htmldocs).tar.gz $(manpages).tar.gz $(MAKE) -C Documentation/ clean $(MAKE) -C templates clean $(MAKE) -C t/ clean