Makefile: DIFF_OBJS is not special at all these days
It used to make sense back when nothing but diff-files, diff-index and friends depended on diffcore infrastructure, but pretty much everything depends on revision infrastructure which in turn depends on DIFF_OBJS. There is no reason to treat them any differently in the Makefile. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Mar 12, 2008 at 01:31 UTC
bd92cd0f74562886e101318eaa4c7a01de1faee5
1 file changed
+5
-7
Makefile
+5
-7
@@ -311,11 +311,6 @@ LIB_H = \
311
mailmap.h remote.h parse-options.h transport.h diffcore.h hash.h ll-merge.h fsck.h \
312
pack-revindex.h
313
314
-DIFF_OBJS = \
315
- diff.o diff-lib.o diffcore-break.o diffcore-order.o \
316
- diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \
317
- diffcore-delta.o log-tree.o
318
-
314
LIB_OBJS = \
315
blob.o commit.o connect.o csum-file.o cache-tree.o base85.o \
316
date.o diff-delta.o entry.o exec_cmd.o ident.o \
@@ -329,11 +324,14 @@ LIB_OBJS = \
324
tag.o tree.o usage.o config.o environment.o ctype.o copy.o \
325
revision.o pager.o tree-walk.o xdiff-interface.o \
326
write_or_die.o trace.o list-objects.o grep.o match-trees.o \
332
- alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \
327
+ alloc.o merge-file.o path-list.o help.o unpack-trees.o \
328
color.o wt-status.o archive-zip.o archive-tar.o shallow.o utf8.o \
329
convert.o attr.o decorate.o progress.o mailmap.o symlinks.o remote.o \
330
transport.o bundle.o walker.o parse-options.o ws.o archive.o branch.o \
336
- ll-merge.o alias.o fsck.o pack-revindex.o
331
+ ll-merge.o alias.o fsck.o pack-revindex.o \
332
+ diff.o diff-lib.o diffcore-break.o diffcore-order.o \
333
+ diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \
334
+ diffcore-delta.o log-tree.o
335
336
BUILTIN_OBJS = \
337
builtin-add.o \