global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-21 16:06:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jn/makedepend' into next

Browse Source 
* jn/makedepend:
  Makefile: clarify definition of TEST_OBJS
This commit is contained in:
Junio C Hamano
2010-02-28 11:52:21 -08:00
parent 5c1c2620c4 5b8805e75c
commit 6604fd09b0
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -714,8 +714,6 @@ BUILTIN_OBJS += builtin/verify-pack.o
BUILTIN_OBJS += builtin/verify-tag.o
BUILTIN_OBJS += builtin/write-tree.o
TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS))
GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
EXTLIBS =
@@ -1634,6 +1632,7 @@ git.o git.spec \
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
: GIT-VERSION-FILE
TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS))
GIT_OBJS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \
git.o http.o http-walker.o remote-curl.o
XDIFF_OBJS = xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \