From: Bram Moolenaar Date: Fri, 11 Jan 2019 18:19:44 +0000 (+0100) Subject: patch 8.1.0724: build for MinGW fails X-Git-Tag: v8.1.0724 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=46fd6bf2b6395f5850905525fa763803a14b093d;p=thirdparty%2Fvim.git patch 8.1.0724: build for MinGW fails Problem: Build for MinGW fails. Solution: Avoid specifying dependencies in included makefile. --- diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak index a1a344ec3b..8db2995721 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 2623fb1279..5776a7946d 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 2fa3e78fa2..a2e586fe69 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 311701afa2..c3ba8abdcf 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 aede1e671f..50b3263af8 100644 --- a/src/version.c +++ b/src/version.c @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 724, /**/ 723, /**/