diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-03-12 01:31:01 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-03-12 01:55:46 -0700 |
commit | bd92cd0f74562886e101318eaa4c7a01de1faee5 (patch) | |
tree | 66f09223803979ff995586b4ded422093feb7d35 /Makefile | |
parent | Merge git://repo.or.cz/git-gui (diff) | |
download | tgif-bd92cd0f74562886e101318eaa4c7a01de1faee5.tar.xz |
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>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -311,11 +311,6 @@ LIB_H = \ mailmap.h remote.h parse-options.h transport.h diffcore.h hash.h ll-merge.h fsck.h \ pack-revindex.h -DIFF_OBJS = \ - diff.o diff-lib.o diffcore-break.o diffcore-order.o \ - diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \ - diffcore-delta.o log-tree.o - LIB_OBJS = \ blob.o commit.o connect.o csum-file.o cache-tree.o base85.o \ date.o diff-delta.o entry.o exec_cmd.o ident.o \ @@ -329,11 +324,14 @@ LIB_OBJS = \ tag.o tree.o usage.o config.o environment.o ctype.o copy.o \ revision.o pager.o tree-walk.o xdiff-interface.o \ write_or_die.o trace.o list-objects.o grep.o match-trees.o \ - alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \ + alloc.o merge-file.o path-list.o help.o unpack-trees.o \ color.o wt-status.o archive-zip.o archive-tar.o shallow.o utf8.o \ convert.o attr.o decorate.o progress.o mailmap.o symlinks.o remote.o \ transport.o bundle.o walker.o parse-options.o ws.o archive.o branch.o \ - ll-merge.o alias.o fsck.o pack-revindex.o + ll-merge.o alias.o fsck.o pack-revindex.o \ + diff.o diff-lib.o diffcore-break.o diffcore-order.o \ + diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \ + diffcore-delta.o log-tree.o BUILTIN_OBJS = \ builtin-add.o \ |