diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-10-10 13:22:54 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-10-10 13:22:54 +0200 |
| commit | 93268054428fe3a6bbe3f89d2def2fec4eabcf5f (patch) | |
| tree | d8e0be653481f2f7010d3218e1e0181801aaeefc /src/auto | |
| parent | 14c01f83487d5c53192297a710eda2b8a4ab17c9 (diff) | |
| download | vim-git-93268054428fe3a6bbe3f89d2def2fec4eabcf5f.tar.gz | |
patch 8.1.2128: renamed libvterm sources makes merging difficultv8.1.2128
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)
Diffstat (limited to 'src/auto')
| -rwxr-xr-x | src/auto/configure | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure index c9b370cc7..1c00773f2 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -7907,9 +7907,9 @@ fi if test "$enable_terminal" = "yes" -a "$enable_channel" = "yes"; then $as_echo "#define FEAT_TERMINAL 1" >>confdefs.h - 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" - 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" fi |