diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-17 15:52:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-17 15:52:03 -0700 |
| commit | 39be92643624bbd96160338a8c9f296bfa5441f3 (patch) | |
| tree | 322dc5e54d7c41945903f5e3db1b950eb3fa9b7c /Makefile | |
| parent | Merge branch 'lt/dirwalk' into next (diff) | |
| parent | Revert "builtin-grep: workaround for non GNU grep." (diff) | |
| download | tgif-39be92643624bbd96160338a8c9f296bfa5441f3.tar.xz | |
Merge branch 'jc/grep' into next
* jc/grep:
Revert "builtin-grep: workaround for non GNU grep."
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 0 insertions, 11 deletions
@@ -46,8 +46,6 @@ all: # # Define NO_MMAP if you want to avoid mmap. # -# Define NO_H_OPTION_IN_GREP if your grep does not understand -H. -# # Define WITH_OWN_SUBPROCESS_PY if you want to use with python 2.3. # # Define NO_IPV6 if you lack IPv6 support and getaddrinfo(). @@ -446,12 +444,6 @@ ifdef NO_ACCURATE_DIFF ALL_CFLAGS += -DNO_ACCURATE_DIFF endif -ifdef NO_H_OPTION_IN_GREP - NO_H_OPTION_IN_GREP=1 -else - NO_H_OPTION_IN_GREP=0 -endif - # Shell quote (do not use $(call) to accomodate ancient setups); SHA1_HEADER_SQ = $(subst ','\'',$(SHA1_HEADER)) @@ -534,9 +526,6 @@ git$X git.spec \ %.o: %.S $(CC) -o $*.o -c $(ALL_CFLAGS) $< -builtin-grep.o: builtin-grep.c - $(CC) -o $*.o -c $(ALL_CFLAGS) -DNO_H_OPTION_IN_GREP=$(NO_H_OPTION_IN_GREP) $< - exec_cmd.o: exec_cmd.c $(CC) -o $*.o -c $(ALL_CFLAGS) '-DGIT_EXEC_PATH="$(gitexecdir_SQ)"' $< |