Merge branch 'nd/test-helpers'

diff --git a/Makefile b/Makefile
index d15bf8de9d36065865781caf5adb069c25657432..9d6c24503155471cc66882f6ba2040456a1cf470 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -832,6 +832,7 @@ LIB_OBJS += submodule-config.o
 LIB_OBJS += symlinks.o
 LIB_OBJS += tag.o
 LIB_OBJS += tempfile.o
+LIB_OBJS += tmp-objdir.o
 LIB_OBJS += trace.o
 LIB_OBJS += trailer.o
 LIB_OBJS += transport.o