Makefile: fold XDIFF_H and VCSSVN_H into LIB_H
Just like MISC_H (see previous commit), there is no reason to track xdiff and vcs-svn headers separately from the rest of the headers. The only purpose of these variables is to keep track of recompilation dependencies. As a pleasant side effect, folding these into LIB_H lets us stop tracking GIT_OBJS and VCSSVN_TEST_OBJS separately from the list of all OBJECTS. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder committed
Jul 6, 2012 at 22:39 UTC
60d24dd2556f8b6020f9de37af3ec292c9f3769d
1 file changed
+25
-37
Makefile
+25
-37
@@ -392,11 +392,8 @@ BUILTIN_OBJS =
392
BUILT_INS =
393
COMPAT_CFLAGS =
394
COMPAT_OBJS =
395
-XDIFF_H =
395
XDIFF_OBJS =
397
-VCSSVN_H =
396
VCSSVN_OBJS =
399
-VCSSVN_TEST_OBJS =
397
GENERATED_H =
398
EXTRA_CPPFLAGS =
399
LIB_H =
@@ -558,21 +555,21 @@ LIB_FILE=libgit.a
555
XDIFF_LIB=xdiff/lib.a
556
VCSSVN_LIB=vcs-svn/lib.a
557
561
-XDIFF_H += xdiff/xinclude.h
562
-XDIFF_H += xdiff/xmacros.h
563
-XDIFF_H += xdiff/xdiff.h
564
-XDIFF_H += xdiff/xtypes.h
565
-XDIFF_H += xdiff/xutils.h
566
-XDIFF_H += xdiff/xprepare.h
567
-XDIFF_H += xdiff/xdiffi.h
568
-XDIFF_H += xdiff/xemit.h
569
-
570
-VCSSVN_H += vcs-svn/line_buffer.h
571
-VCSSVN_H += vcs-svn/sliding_window.h
572
-VCSSVN_H += vcs-svn/repo_tree.h
573
-VCSSVN_H += vcs-svn/fast_export.h
574
-VCSSVN_H += vcs-svn/svndiff.h
575
-VCSSVN_H += vcs-svn/svndump.h
558
+LIB_H += xdiff/xinclude.h
559
+LIB_H += xdiff/xmacros.h
560
+LIB_H += xdiff/xdiff.h
561
+LIB_H += xdiff/xtypes.h
562
+LIB_H += xdiff/xutils.h
563
+LIB_H += xdiff/xprepare.h
564
+LIB_H += xdiff/xdiffi.h
565
+LIB_H += xdiff/xemit.h
566
+
567
+LIB_H += vcs-svn/line_buffer.h
568
+LIB_H += vcs-svn/sliding_window.h
569
+LIB_H += vcs-svn/repo_tree.h
570
+LIB_H += vcs-svn/fast_export.h
571
+LIB_H += vcs-svn/svndiff.h
572
+LIB_H += vcs-svn/svndump.h
573
574
GENERATED_H += common-cmds.h
575
@@ -2110,13 +2107,6 @@ version.o git.spec \
2107
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
2108
: GIT-VERSION-FILE
2109
2113
-TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS))
2114
-GIT_OBJS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \
2115
- git.o
2116
-ifndef NO_CURL
2117
- GIT_OBJS += http.o http-walker.o remote-curl.o
2118
-endif
2119
-
2110
XDIFF_OBJS += xdiff/xdiffi.o
2111
XDIFF_OBJS += xdiff/xprepare.o
2112
XDIFF_OBJS += xdiff/xutils.o
@@ -2132,9 +2122,14 @@ VCSSVN_OBJS += vcs-svn/fast_export.o
2122
VCSSVN_OBJS += vcs-svn/svndiff.o
2123
VCSSVN_OBJS += vcs-svn/svndump.o
2124
2135
-VCSSVN_TEST_OBJS += test-line-buffer.o
2136
-
2137
-OBJECTS := $(GIT_OBJS) $(XDIFF_OBJS) $(VCSSVN_OBJS)
2125
+TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS))
2126
+OBJECTS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \
2127
+ $(XDIFF_OBJS) \
2128
+ $(VCSSVN_OBJS) \
2129
+ git.o
2130
+ifndef NO_CURL
2131
+ OBJECTS += http.o http-walker.o remote-curl.o
2132
+endif
2133
2134
dep_files := $(foreach f,$(OBJECTS),$(dir $f).depend/$(notdir $f).d)
2135
dep_dirs := $(addsuffix .depend,$(sort $(dir $(OBJECTS))))
@@ -2233,15 +2228,8 @@ else
2228
# Dependencies on automatically generated headers such as common-cmds.h
2229
# should _not_ be included here, since they are necessary even when
2230
# building an object for the first time.
2236
-#
2237
-# XXX. Please check occasionally that these include all dependencies
2238
-# gcc detects!
2239
-
2240
-$(GIT_OBJS): $(LIB_H)
2241
-
2242
-xdiff-interface.o $(XDIFF_OBJS): $(XDIFF_H)
2231
2244
-$(VCSSVN_OBJS) $(VCSSVN_TEST_OBJS): $(LIB_H) $(VCSSVN_H)
2232
+$(OBJECTS): $(LIB_H)
2233
endif
2234
2235
exec_cmd.sp exec_cmd.s exec_cmd.o: EXTRA_CPPFLAGS = \
@@ -2334,7 +2322,7 @@ XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --language=C \
2322
--keyword=_ --keyword=N_ --keyword="Q_:1,2"
2323
XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell
2324
XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --keyword=__ --language=Perl
2337
-LOCALIZED_C := $(C_OBJ:o=c) $(LIB_H) $(XDIFF_H) $(VCSSVN_H) $(GENERATED_H)
2325
+LOCALIZED_C := $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
2326
LOCALIZED_SH := $(SCRIPT_SH)
2327
LOCALIZED_PERL := $(SCRIPT_PERL)
2328