aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-09-03 01:49:05 +0200
committerJunio C Hamano <gitster@pobox.com>2008-09-02 17:03:51 -0700
commitdb3a95459cb873c302051b4b2b693be5ba248c13 (patch)
tree66d33a636a4a122ca5f6515a35468ecba409d619 /Makefile
parent62e00b0a9a72337a1ae2818ff3640e07c78db636 (diff)
downloadgit-db3a95459cb873c302051b4b2b693be5ba248c13.tar.gz
git-db3a95459cb873c302051b4b2b693be5ba248c13.tar.xz
Makefile: add merge_recursive.h to LIB_H
When modifying merge-recursive.h, for example builtin-merge-recursive.c have to be recompiled which was not true till now, causing various runtime errors using an incremental build. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 00991b7c1..672ea7423 100644
--- a/Makefile
+++ b/Makefile
@@ -358,6 +358,7 @@ LIB_H += list-objects.h
LIB_H += ll-merge.h
LIB_H += log-tree.h
LIB_H += mailmap.h
+LIB_H += merge-recursive.h
LIB_H += object.h
LIB_H += pack.h
LIB_H += pack-refs.h