undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile: list one vcs-svn/xdiff object or header per line

Browse Source 
As the svn import infrastructure evolves, it's getting to be a pain to
tell by eye what files were added or removed from a dependency line
like

	VCSSVN_OBJS = vcs-svn/string_pool.o vcs-svn/line_buffer.o \
		vcs-svn/repo_tree.o vcs-svn/fast_export.o vcs-svn/svndump.o

So use a style with one entry per line instead, like the existing
BUILTIN_OBJS:

	# protect against environment
	VCSSVN_OBJS =
	...
	VCSSVN_OBJS += vcs-svn/string_pool.o
	VCSSVN_OBJS += vcs-svn/line_buffer.o
	...

which is readable on its own and produces nice, clear diffs.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
This commit is contained in:
Jonathan Nieder 2011-03-27 13:13:22 -05:00
parent 41e6b91f01
commit 3371f9b3fb
1 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Makefile
View File

@ -341,6 +341,11 @@ BUILTIN_OBJS =
BUILT_INS = BUILT_INS =
COMPAT_CFLAGS = COMPAT_CFLAGS =
COMPAT_OBJS = COMPAT_OBJS =
XDIFF_H =
XDIFF_OBJS =
VCSSVN_H =
VCSSVN_OBJS =
VCSSVN_TEST_OBJS =
EXTRA_CPPFLAGS = EXTRA_CPPFLAGS =
LIB_H = LIB_H =
LIB_OBJS = LIB_OBJS =
@ -1836,12 +1841,25 @@ GIT_OBJS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \
ifndef NO_CURL ifndef NO_CURL
GIT_OBJS += http.o http-walker.o remote-curl.o GIT_OBJS += http.o http-walker.o remote-curl.o
endif endif
XDIFF_OBJS = xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \
xdiff/xmerge.o xdiff/xpatience.o XDIFF_OBJS += xdiff/xdiffi.o
VCSSVN_OBJS = vcs-svn/string_pool.o vcs-svn/line_buffer.o \ XDIFF_OBJS += xdiff/xprepare.o
vcs-svn/repo_tree.o vcs-svn/fast_export.o vcs-svn/svndump.o XDIFF_OBJS += xdiff/xutils.o
VCSSVN_TEST_OBJS = test-obj-pool.o test-string-pool.o \ XDIFF_OBJS += xdiff/xemit.o
test-line-buffer.o test-treap.o XDIFF_OBJS += xdiff/xmerge.o
XDIFF_OBJS += xdiff/xpatience.o
VCSSVN_OBJS += vcs-svn/string_pool.o
VCSSVN_OBJS += vcs-svn/line_buffer.o
VCSSVN_OBJS += vcs-svn/repo_tree.o
VCSSVN_OBJS += vcs-svn/fast_export.o
VCSSVN_OBJS += vcs-svn/svndump.o
VCSSVN_TEST_OBJS += test-obj-pool.o
VCSSVN_TEST_OBJS += test-string-pool.o
VCSSVN_TEST_OBJS += test-line-buffer.o
VCSSVN_TEST_OBJS += test-treap.o
OBJECTS := $(GIT_OBJS) $(XDIFF_OBJS) $(VCSSVN_OBJS) OBJECTS := $(GIT_OBJS) $(XDIFF_OBJS) $(VCSSVN_OBJS)
dep_files := $(foreach f,$(OBJECTS),$(dir $f).depend/$(notdir $f).d) dep_files := $(foreach f,$(OBJECTS),$(dir $f).depend/$(notdir $f).d)
@ -1960,16 +1978,26 @@ connect.o transport.o http-backend.o: url.h
http-fetch.o http-walker.o remote-curl.o transport.o walker.o: walker.h http-fetch.o http-walker.o remote-curl.o transport.o walker.o: walker.h
http.o http-walker.o http-push.o http-fetch.o remote-curl.o: http.h url.h http.o http-walker.o http-push.o http-fetch.o remote-curl.o: http.h url.h
xdiff-interface.o $(XDIFF_OBJS): \ XDIFF_H += xdiff/xinclude.h
xdiff/xinclude.h xdiff/xmacros.h xdiff/xdiff.h xdiff/xtypes.h \ XDIFF_H += xdiff/xmacros.h
xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h XDIFF_H += xdiff/xdiff.h
XDIFF_H += xdiff/xtypes.h
XDIFF_H += xdiff/xutils.h
XDIFF_H += xdiff/xprepare.h
XDIFF_H += xdiff/xdiffi.h
XDIFF_H += xdiff/xemit.h
$(VCSSVN_OBJS) $(VCSSVN_TEST_OBJS): $(LIB_H) \ xdiff-interface.o $(XDIFF_OBJS): $(XDIFF_H)
vcs-svn/obj_pool.h vcs-svn/trp.h vcs-svn/string_pool.h \
vcs-svn/line_buffer.h vcs-svn/repo_tree.h vcs-svn/fast_export.h \
vcs-svn/svndump.h
test-svn-fe.o: vcs-svn/svndump.h VCSSVN_H += vcs-svn/obj_pool.h
VCSSVN_H += vcs-svn/trp.h
VCSSVN_H += vcs-svn/string_pool.h
VCSSVN_H += vcs-svn/line_buffer.h
VCSSVN_H += vcs-svn/repo_tree.h
VCSSVN_H += vcs-svn/fast_export.h
VCSSVN_H += vcs-svn/svndump.h
$(VCSSVN_OBJS) $(VCSSVN_TEST_OBJS): $(LIB_H) $(VCSSVN_H)
endif endif
exec_cmd.s exec_cmd.o: EXTRA_CPPFLAGS = \ exec_cmd.s exec_cmd.o: EXTRA_CPPFLAGS = \