Makefile: list one vcs-svn/xdiff object or header per line
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>
Jonathan Nieder committed
Mar 27, 2011 at 13:13 UTC
3371f9b3fb13a508c447e484618b9b5e2b9e45a7
1 file changed
+44
-16
Makefile
+44
-16
@@ -341,6 +341,11 @@ BUILTIN_OBJS =
341
BUILT_INS =
342
COMPAT_CFLAGS =
343
COMPAT_OBJS =
344
+XDIFF_H =
345
+XDIFF_OBJS =
346
+VCSSVN_H =
347
+VCSSVN_OBJS =
348
+VCSSVN_TEST_OBJS =
349
EXTRA_CPPFLAGS =
350
LIB_H =
351
LIB_OBJS =
@@ -1836,12 +1841,25 @@ GIT_OBJS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \
1841
ifndef NO_CURL
1842
GIT_OBJS += http.o http-walker.o remote-curl.o
1843
endif
1839
-XDIFF_OBJS = xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \
1840
- xdiff/xmerge.o xdiff/xpatience.o
1841
-VCSSVN_OBJS = vcs-svn/string_pool.o vcs-svn/line_buffer.o \
1842
- vcs-svn/repo_tree.o vcs-svn/fast_export.o vcs-svn/svndump.o
1843
-VCSSVN_TEST_OBJS = test-obj-pool.o test-string-pool.o \
1844
- test-line-buffer.o test-treap.o
1844
+
1845
+XDIFF_OBJS += xdiff/xdiffi.o
1846
+XDIFF_OBJS += xdiff/xprepare.o
1847
+XDIFF_OBJS += xdiff/xutils.o
1848
+XDIFF_OBJS += xdiff/xemit.o
1849
+XDIFF_OBJS += xdiff/xmerge.o
1850
+XDIFF_OBJS += xdiff/xpatience.o
1851
+
1852
+VCSSVN_OBJS += vcs-svn/string_pool.o
1853
+VCSSVN_OBJS += vcs-svn/line_buffer.o
1854
+VCSSVN_OBJS += vcs-svn/repo_tree.o
1855
+VCSSVN_OBJS += vcs-svn/fast_export.o
1856
+VCSSVN_OBJS += vcs-svn/svndump.o
1857
+
1858
+VCSSVN_TEST_OBJS += test-obj-pool.o
1859
+VCSSVN_TEST_OBJS += test-string-pool.o
1860
+VCSSVN_TEST_OBJS += test-line-buffer.o
1861
+VCSSVN_TEST_OBJS += test-treap.o
1862
+
1863
OBJECTS := $(GIT_OBJS) $(XDIFF_OBJS) $(VCSSVN_OBJS)
1864
1865
dep_files := $(foreach f,$(OBJECTS),$(dir $f).depend/$(notdir $f).d)
@@ -1960,16 +1978,26 @@ connect.o transport.o http-backend.o: url.h
1978
http-fetch.o http-walker.o remote-curl.o transport.o walker.o: walker.h
1979
http.o http-walker.o http-push.o http-fetch.o remote-curl.o: http.h url.h
1980
1963
-xdiff-interface.o $(XDIFF_OBJS): \
1964
- xdiff/xinclude.h xdiff/xmacros.h xdiff/xdiff.h xdiff/xtypes.h \
1965
- xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h
1966
-
1967
-$(VCSSVN_OBJS) $(VCSSVN_TEST_OBJS): $(LIB_H) \
1968
- vcs-svn/obj_pool.h vcs-svn/trp.h vcs-svn/string_pool.h \
1969
- vcs-svn/line_buffer.h vcs-svn/repo_tree.h vcs-svn/fast_export.h \
1970
- vcs-svn/svndump.h
1971
-
1972
-test-svn-fe.o: vcs-svn/svndump.h
1981
+XDIFF_H += xdiff/xinclude.h
1982
+XDIFF_H += xdiff/xmacros.h
1983
+XDIFF_H += xdiff/xdiff.h
1984
+XDIFF_H += xdiff/xtypes.h
1985
+XDIFF_H += xdiff/xutils.h
1986
+XDIFF_H += xdiff/xprepare.h
1987
+XDIFF_H += xdiff/xdiffi.h
1988
+XDIFF_H += xdiff/xemit.h
1989
+
1990
+xdiff-interface.o $(XDIFF_OBJS): $(XDIFF_H)
1991
+
1992
+VCSSVN_H += vcs-svn/obj_pool.h
1993
+VCSSVN_H += vcs-svn/trp.h
1994
+VCSSVN_H += vcs-svn/string_pool.h
1995
+VCSSVN_H += vcs-svn/line_buffer.h
1996
+VCSSVN_H += vcs-svn/repo_tree.h
1997
+VCSSVN_H += vcs-svn/fast_export.h
1998
+VCSSVN_H += vcs-svn/svndump.h
1999
+
2000
+$(VCSSVN_OBJS) $(VCSSVN_TEST_OBJS): $(LIB_H) $(VCSSVN_H)
2001
endif
2002
2003
exec_cmd.s exec_cmd.o: EXTRA_CPPFLAGS = \