From 93268054428fe3a6bbe3f89d2def2fec4eabcf5f Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 10 Oct 2019 13:22:54 +0200 Subject: patch 8.1.2128: renamed libvterm sources makes merging difficult Problem: Renamed libvterm sources makes merging difficult. Solution: Rename back to the original name and only rename the .o files. Also clean the libvterm build artifacts. (James McCoy, closes #5027) --- src/configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/configure.ac') diff --git a/src/configure.ac b/src/configure.ac index 97753a6552..3ad223b398 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -2104,9 +2104,9 @@ else fi if test "$enable_terminal" = "yes" -a "$enable_channel" = "yes"; then AC_DEFINE(FEAT_TERMINAL) - TERM_SRC="libvterm/src/encoding.c libvterm/src/keyboard.c libvterm/src/mouse.c libvterm/src/parser.c libvterm/src/pen.c libvterm/src/termscreen.c libvterm/src/state.c libvterm/src/unicode.c libvterm/src/vterm.c" + TERM_SRC="libvterm/src/encoding.c libvterm/src/keyboard.c libvterm/src/mouse.c libvterm/src/parser.c libvterm/src/pen.c libvterm/src/creen.c libvterm/src/state.c libvterm/src/unicode.c libvterm/src/vterm.c" AC_SUBST(TERM_SRC) - TERM_OBJ="objects/encoding.o objects/keyboard.o objects/termmouse.o objects/parser.o objects/pen.o objects/termscreen.o objects/state.o objects/unicode.o objects/vterm.o" + TERM_OBJ="objects/vterm_encoding.o objects/vterm_keyboard.o objects/vterm_mouse.o objects/vterm_parser.o objects/vterm_pen.o objects/vterm_screen.o objects/vterm_state.o objects/vterm_unicode.o objects/vterm_vterm.o" AC_SUBST(TERM_OBJ) fi -- cgit v1.2.3