X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Makefile;h=9ba608c805e6a9864414a963422094ae010e4a86;hb=e9ce27543d29aa23bb4740a241339c6d42674f7d;hp=f4b6ef8751d8db2162a6e430ebf72ef5f444ec16;hpb=05f743f328e56780fb86c57da65f41df6e3b19a3;p=git.git diff --git a/Makefile b/Makefile index f4b6ef87..9ba608c8 100644 --- a/Makefile +++ b/Makefile @@ -124,7 +124,7 @@ SCRIPT_SH = \ git-tag.sh git-verify-tag.sh \ git-applymbox.sh git-applypatch.sh git-am.sh \ git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \ - git-merge-resolve.sh git-merge-ours.sh git-grep.sh \ + git-merge-resolve.sh git-merge-ours.sh \ git-lost-found.sh SCRIPT_PERL = \ @@ -169,7 +169,8 @@ PROGRAMS = \ git-describe$X git-merge-tree$X git-blame$X git-imap-send$X BUILT_INS = git-log$X git-whatchanged$X git-show$X \ - git-count-objects$X git-diff$X git-push$X + git-count-objects$X git-diff$X git-push$X \ + git-grep$X # what 'all' will build and 'install' will install, in gitexecdir ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS) @@ -216,7 +217,8 @@ LIB_OBJS = \ $(DIFF_OBJS) BUILTIN_OBJS = \ - builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o + builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \ + builtin-grep.o GITLIBS = $(LIB_FILE) $(XDIFF_LIB) LIBS = $(GITLIBS) -lz