Mercurial > vim
changeset 16383:1edd94a2252a v8.1.1196
patch 8.1.1196: parallel build may fail
commit https://github.com/vim/vim/commit/7bde95a461fafaa15cc45a006eaa4d0f3c2dfe92
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Apr 21 15:22:39 2019 +0200
patch 8.1.1196: parallel build may fail
Problem: Parallel build may fail.
Solution: Update dependencies.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 21 Apr 2019 15:30:04 +0200 |
parents | 7bbbeba71d9e |
children | 051dc2ab1745 |
files | src/Makefile src/version.c |
diffstat | 2 files changed, 35 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile +++ b/src/Makefile @@ -3432,8 +3432,9 @@ objects/crypt_zip.o: crypt_zip.c vim.h p proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h objects/debugger.o: debugger.c vim.h protodef.h auto/config.h feature.h os_unix.h \ - os_mac.h ascii.h keymap.h term.h macros.h option.h beval.h structs.h \ - regexp.h gui.h alloc.h ex_cmds.h spell.h proto.h globals.h + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ + proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ + proto.h globals.h objects/dict.o: dict.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ @@ -3482,11 +3483,10 @@ objects/fileio.o: fileio.c vim.h protode auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ proto.h globals.h -objects/findfile.o: findfile.c vim.h protodef.h auto/config.h feature.h \ - os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ +objects/findfile.o: findfile.c vim.h protodef.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h libvterm/include/vterm.h \ - libvterm/include/vterm_keycodes.h + proto.h globals.h objects/fold.o: fold.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ @@ -3684,16 +3684,15 @@ objects/gui_gtk_f.o: gui_gtk_f.c vim.h p objects/gui_motif.o: gui_motif.c vim.h protodef.h auto/config.h feature.h \ os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h gui_xmebw.h ../pixmaps/alert.xpm \ - ../pixmaps/error.xpm ../pixmaps/generic.xpm ../pixmaps/info.xpm \ - ../pixmaps/quest.xpm gui_x11_pm.h ../pixmaps/tb_new.xpm \ - ../pixmaps/tb_open.xpm ../pixmaps/tb_close.xpm ../pixmaps/tb_save.xpm \ - ../pixmaps/tb_print.xpm ../pixmaps/tb_cut.xpm ../pixmaps/tb_copy.xpm \ - ../pixmaps/tb_paste.xpm ../pixmaps/tb_find.xpm \ - ../pixmaps/tb_find_next.xpm ../pixmaps/tb_find_prev.xpm \ - ../pixmaps/tb_find_help.xpm ../pixmaps/tb_exit.xpm \ - ../pixmaps/tb_undo.xpm ../pixmaps/tb_redo.xpm ../pixmaps/tb_help.xpm \ - ../pixmaps/tb_macro.xpm ../pixmaps/tb_make.xpm \ + proto.h globals.h gui_xmebw.h ../pixmaps/alert.xpm ../pixmaps/error.xpm \ + ../pixmaps/generic.xpm ../pixmaps/info.xpm ../pixmaps/quest.xpm \ + gui_x11_pm.h ../pixmaps/tb_new.xpm ../pixmaps/tb_open.xpm \ + ../pixmaps/tb_close.xpm ../pixmaps/tb_save.xpm ../pixmaps/tb_print.xpm \ + ../pixmaps/tb_cut.xpm ../pixmaps/tb_copy.xpm ../pixmaps/tb_paste.xpm \ + ../pixmaps/tb_find.xpm ../pixmaps/tb_find_next.xpm \ + ../pixmaps/tb_find_prev.xpm ../pixmaps/tb_find_help.xpm \ + ../pixmaps/tb_exit.xpm ../pixmaps/tb_undo.xpm ../pixmaps/tb_redo.xpm \ + ../pixmaps/tb_help.xpm ../pixmaps/tb_macro.xpm ../pixmaps/tb_make.xpm \ ../pixmaps/tb_save_all.xpm ../pixmaps/tb_jump.xpm \ ../pixmaps/tb_ctags.xpm ../pixmaps/tb_load_session.xpm \ ../pixmaps/tb_save_session.xpm ../pixmaps/tb_new_session.xpm \ @@ -3713,10 +3712,10 @@ objects/gui_xmebw.o: gui_xmebw.c vim.h p objects/gui_athena.o: gui_athena.c vim.h protodef.h auto/config.h feature.h \ os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h gui_at_sb.h gui_x11_pm.h \ - ../pixmaps/tb_new.xpm ../pixmaps/tb_open.xpm ../pixmaps/tb_close.xpm \ - ../pixmaps/tb_save.xpm ../pixmaps/tb_print.xpm ../pixmaps/tb_cut.xpm \ - ../pixmaps/tb_copy.xpm ../pixmaps/tb_paste.xpm ../pixmaps/tb_find.xpm \ + proto.h globals.h gui_at_sb.h gui_x11_pm.h ../pixmaps/tb_new.xpm \ + ../pixmaps/tb_open.xpm ../pixmaps/tb_close.xpm ../pixmaps/tb_save.xpm \ + ../pixmaps/tb_print.xpm ../pixmaps/tb_cut.xpm ../pixmaps/tb_copy.xpm \ + ../pixmaps/tb_paste.xpm ../pixmaps/tb_find.xpm \ ../pixmaps/tb_find_next.xpm ../pixmaps/tb_find_prev.xpm \ ../pixmaps/tb_find_help.xpm ../pixmaps/tb_exit.xpm \ ../pixmaps/tb_undo.xpm ../pixmaps/tb_redo.xpm ../pixmaps/tb_help.xpm \ @@ -3737,8 +3736,8 @@ objects/gui_gtk_x11.o: gui_gtk_x11.c vim objects/gui_x11.o: gui_x11.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h ../runtime/vim32x32.xpm \ - ../runtime/vim16x16.xpm ../runtime/vim48x48.xpm + proto.h globals.h ../runtime/vim32x32.xpm ../runtime/vim16x16.xpm \ + ../runtime/vim48x48.xpm objects/gui_at_sb.o: gui_at_sb.c vim.h protodef.h auto/config.h feature.h \ os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ @@ -3842,8 +3841,8 @@ objects/xdiffi.o: xdiff/xdiffi.c xdiff/x macros.h option.h beval.h proto/gui_beval.pro \ structs.h regexp.h gui.h alloc.h \ ex_cmds.h spell.h proto.h globals.h \ - xdiff/xtypes.h xdiff/xutils.h \ - xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h + xdiff/xtypes.h xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h \ + xdiff/xemit.h objects/xemit.o: xdiff/xemit.c xdiff/xinclude.h auto/config.h \ xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ auto/config.h feature.h os_unix.h \ @@ -3851,8 +3850,8 @@ objects/xemit.o: xdiff/xemit.c xdiff/xin macros.h option.h beval.h proto/gui_beval.pro \ structs.h regexp.h gui.h alloc.h \ ex_cmds.h spell.h proto.h globals.h \ - xdiff/xtypes.h xdiff/xutils.h \ - xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h + xdiff/xtypes.h xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h \ + xdiff/xemit.h objects/xprepare.o: xdiff/xprepare.c xdiff/xinclude.h auto/config.h \ xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ auto/config.h feature.h os_unix.h \ @@ -3860,8 +3859,8 @@ objects/xprepare.o: xdiff/xprepare.c xdi macros.h option.h beval.h proto/gui_beval.pro \ structs.h regexp.h gui.h alloc.h \ ex_cmds.h spell.h proto.h globals.h \ - xdiff/xtypes.h xdiff/xutils.h \ - xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h + xdiff/xtypes.h xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h \ + xdiff/xemit.h objects/xutils.o: xdiff/xutils.c xdiff/xinclude.h auto/config.h \ xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ auto/config.h feature.h os_unix.h \ @@ -3869,8 +3868,8 @@ objects/xutils.o: xdiff/xutils.c xdiff/x macros.h option.h beval.h proto/gui_beval.pro \ structs.h regexp.h gui.h alloc.h \ ex_cmds.h spell.h proto.h globals.h \ - xdiff/xtypes.h xdiff/xutils.h \ - xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h + xdiff/xtypes.h xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h \ + xdiff/xemit.h objects/xhistogram.o: xdiff/xhistogram.c xdiff/xinclude.h auto/config.h \ xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ auto/config.h feature.h os_unix.h \ @@ -3878,8 +3877,8 @@ objects/xhistogram.o: xdiff/xhistogram.c macros.h option.h beval.h proto/gui_beval.pro \ structs.h regexp.h gui.h alloc.h \ ex_cmds.h spell.h proto.h globals.h \ - xdiff/xtypes.h xdiff/xutils.h \ - xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h + xdiff/xtypes.h xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h \ + xdiff/xemit.h objects/xpatience.o: xdiff/xpatience.c xdiff/xinclude.h auto/config.h \ xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ auto/config.h feature.h os_unix.h \ @@ -3887,5 +3886,5 @@ objects/xpatience.o: xdiff/xpatience.c x macros.h option.h beval.h proto/gui_beval.pro \ structs.h regexp.h gui.h alloc.h \ ex_cmds.h spell.h proto.h globals.h \ - xdiff/xtypes.h xdiff/xutils.h \ - xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h + xdiff/xtypes.h xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h \ + xdiff/xemit.h