diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-01-11 19:19:44 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-01-11 19:19:44 +0100 |
commit | 46fd6bf2b6395f5850905525fa763803a14b093d (patch) | |
tree | d5345648df64e2b3c711cb23bc0fd32b4ccad0c6 | |
parent | ec50401e1e1357a1340b3c92109fd4860e38a8ac (diff) | |
download | vim-git-46fd6bf2b6395f5850905525fa763803a14b093d.tar.gz |
patch 8.1.0724: build for MinGW failsv8.1.0724
Problem: Build for MinGW fails.
Solution: Avoid specifying dependencies in included makefile.
-rw-r--r-- | src/testdir/Make_all.mak | 6 | ||||
-rw-r--r-- | src/testdir/Make_dos.mak | 2 | ||||
-rw-r--r-- | src/testdir/Make_ming.mak | 2 | ||||
-rw-r--r-- | src/testdir/Makefile | 5 | ||||
-rw-r--r-- | src/version.c | 2 |
5 files changed, 11 insertions, 6 deletions
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak index a1a344ec3..8db299572 100644 --- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -407,9 +407,3 @@ NEW_TESTS_RES = \ test_alot_latin.res \ test_alot_utf8.res \ test_alot.res - - -# Explicit dependencies. -test49.out: test49.vim - -test_options.res test_alot.res: opt_test.vim diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak index 2623fb127..5776a7946 100644 --- a/src/testdir/Make_dos.mak +++ b/src/testdir/Make_dos.mak @@ -132,5 +132,7 @@ test_gui_init.res: test_gui_init.vim $(VIMPROG) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $*.vim @del vimcmd +test_options.res test_alot.res: opt_test.vim + opt_test.vim: ../option.c gen_opt_test.vim $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../option.c diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak index 2fa3e78fa..a2e586fe6 100644 --- a/src/testdir/Make_ming.mak +++ b/src/testdir/Make_ming.mak @@ -127,5 +127,7 @@ test_gui_init.res: test_gui_init.vim $(VIMPROG) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $< @$(DEL) vimcmd +test_options.res test_alot.res: opt_test.vim + opt_test.vim: ../option.c gen_opt_test.vim $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../option.c diff --git a/src/testdir/Makefile b/src/testdir/Makefile index 311701afa..c3ba8abdc 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -33,6 +33,11 @@ SCRIPTS = $(SCRIPTS_ALL) \ $(SCRIPTS_MORE2) \ $(SCRIPTS_MORE4) +# Explicit dependencies. +test49.out: test49.vim + +test_options.res test_alot.res: opt_test.vim + SCRIPTS_BENCH = bench_re_freeze.out .SUFFIXES: .in .out .res .vim diff --git a/src/version.c b/src/version.c index aede1e671..50b3263af 100644 --- a/src/version.c +++ b/src/version.c @@ -796,6 +796,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 724, +/**/ 723, /**/ 722, |