Mercurial > vim

comparison src/Makefile @ 20217:3e2f6ef8ab4f v8.2.0664

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0664: included undesired changes in Makefile Commit: https://github.com/vim/vim/commit/8dbafd0790eeaf8743298cccdbc2a13be52517b9 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Apr 29 23:11:32 2020 +0200 patch 8.2.0664: included undesired changes in Makefile Problem: Included undesired changes in Makefile. Solution: Revert the changes.
author Bram Moolenaar <Bram@vim.org>
date Wed, 29 Apr 2020 23:15:04 +0200
parents 3a94b984c9f9
children 57a69af99e48
comparison
equal deleted inserted replaced
20216:8e1d829b0268 20217:3e2f6ef8ab4f
402 # Uncomment one of these when you want to include the Lua interface. 402 # Uncomment one of these when you want to include the Lua interface.
403 # First one is for static linking, second one for dynamic loading. 403 # First one is for static linking, second one for dynamic loading.
404 # Use --with-luajit if you want to use LuaJIT instead of Lua. 404 # Use --with-luajit if you want to use LuaJIT instead of Lua.
405 # Set PATH environment variable to find lua or luajit executable. 405 # Set PATH environment variable to find lua or luajit executable.
406 # This requires at least "normal" features, "tiny" and "small" don't work. 406 # This requires at least "normal" features, "tiny" and "small" don't work.
407 CONF_OPT_LUA = --enable-luainterp 407 #CONF_OPT_LUA = --enable-luainterp
408 #CONF_OPT_LUA = --enable-luainterp=dynamic 408 #CONF_OPT_LUA = --enable-luainterp=dynamic
409 #CONF_OPT_LUA = --enable-luainterp --with-luajit 409 #CONF_OPT_LUA = --enable-luainterp --with-luajit
410 #CONF_OPT_LUA = --enable-luainterp=dynamic --with-luajit 410 #CONF_OPT_LUA = --enable-luainterp=dynamic --with-luajit
411 # Lua installation dir (when not set uses $LUA_PREFIX or defaults to /usr) 411 # Lua installation dir (when not set uses $LUA_PREFIX or defaults to /usr)
412 #CONF_OPT_LUA_PREFIX = --with-lua-prefix=/usr/local 412 #CONF_OPT_LUA_PREFIX = --with-lua-prefix=/usr/local
431 # auto/config.mk where they come from. If it's PERL_CFLAGS, try commenting 431 # auto/config.mk where they come from. If it's PERL_CFLAGS, try commenting
432 # the next line. 432 # the next line.
433 # When you get an error for a missing "perl.exp" file, try creating an empty 433 # When you get an error for a missing "perl.exp" file, try creating an empty
434 # one: "touch perl.exp". 434 # one: "touch perl.exp".
435 # This requires at least "normal" features, "tiny" and "small" don't work. 435 # This requires at least "normal" features, "tiny" and "small" don't work.
436 CONF_OPT_PERL = --enable-perlinterp 436 #CONF_OPT_PERL = --enable-perlinterp
437 #CONF_OPT_PERL = --enable-perlinterp=dynamic 437 #CONF_OPT_PERL = --enable-perlinterp=dynamic
438 438
439 # PYTHON 439 # PYTHON
440 # Uncomment lines here when you want to include the Python interface. 440 # Uncomment lines here when you want to include the Python interface.
441 # This requires at least "normal" features, "tiny" and "small" don't work. 441 # This requires at least "normal" features, "tiny" and "small" don't work.
445 # ln -s python3 python3.1 445 # ln -s python3 python3.1
446 # If both python2.x and python3.x are enabled then the linking will be via 446 # If both python2.x and python3.x are enabled then the linking will be via
447 # dlopen(), dlsym(), dlclose(), i.e. pythonX.Y.so must be available 447 # dlopen(), dlsym(), dlclose(), i.e. pythonX.Y.so must be available
448 # However, this may still cause problems, such as "import termios" failing. 448 # However, this may still cause problems, such as "import termios" failing.
449 # Build two separate versions of Vim in that case. 449 # Build two separate versions of Vim in that case.
450 CONF_OPT_PYTHON = --enable-pythoninterp 450 #CONF_OPT_PYTHON = --enable-pythoninterp
451 #CONF_OPT_PYTHON = --enable-pythoninterp --with-python-command=python2.7 451 #CONF_OPT_PYTHON = --enable-pythoninterp --with-python-command=python2.7
452 #CONF_OPT_PYTHON = --enable-pythoninterp=dynamic 452 #CONF_OPT_PYTHON = --enable-pythoninterp=dynamic
453 CONF_OPT_PYTHON3 = --enable-python3interp 453 #CONF_OPT_PYTHON3 = --enable-python3interp
454 #CONF_OPT_PYTHON3 = --enable-python3interp --with-python3-command=python3.6 454 #CONF_OPT_PYTHON3 = --enable-python3interp --with-python3-command=python3.6
455 #CONF_OPT_PYTHON3 = --enable-python3interp=dynamic 455 #CONF_OPT_PYTHON3 = --enable-python3interp=dynamic
456 456
457 # RUBY 457 # RUBY
458 # Uncomment this when you want to include the Ruby interface. 458 # Uncomment this when you want to include the Ruby interface.
459 # First one for static linking, second one for loading when used. 459 # First one for static linking, second one for loading when used.
460 # Note: you need the development package (e.g., ruby1.9.1-dev on Ubuntu). 460 # Note: you need the development package (e.g., ruby1.9.1-dev on Ubuntu).
461 # This requires at least "normal" features, "tiny" and "small" don't work. 461 # This requires at least "normal" features, "tiny" and "small" don't work.
462 #CONF_OPT_RUBY = --enable-rubyinterp 462 #CONF_OPT_RUBY = --enable-rubyinterp
463 CONF_OPT_RUBY = --enable-rubyinterp=dynamic 463 #CONF_OPT_RUBY = --enable-rubyinterp=dynamic
464 #CONF_OPT_RUBY = --enable-rubyinterp --with-ruby-command=ruby1.9.1 464 #CONF_OPT_RUBY = --enable-rubyinterp --with-ruby-command=ruby1.9.1
465 465
466 # TCL 466 # TCL
467 # Uncomment this when you want to include the Tcl interface. 467 # Uncomment this when you want to include the Tcl interface.
468 # First one is for static linking, second one for dynamic loading. 468 # First one is for static linking, second one for dynamic loading.
469 #CONF_OPT_TCL = --enable-tclinterp 469 #CONF_OPT_TCL = --enable-tclinterp
470 CONF_OPT_TCL = --enable-tclinterp=dynamic 470 #CONF_OPT_TCL = --enable-tclinterp=dynamic
471 #CONF_OPT_TCL = --enable-tclinterp --with-tclsh=tclsh8.4 471 #CONF_OPT_TCL = --enable-tclinterp --with-tclsh=tclsh8.4
472 472
473 # CSCOPE 473 # CSCOPE
474 # Uncomment this when you want to include the Cscope interface. 474 # Uncomment this when you want to include the Cscope interface.
475 CONF_OPT_CSCOPE = --enable-cscope 475 #CONF_OPT_CSCOPE = --enable-cscope
476 476
477 # NETBEANS - NetBeans interface. Only works with Motif, GTK, and gnome. 477 # NETBEANS - NetBeans interface. Only works with Motif, GTK, and gnome.
478 # Motif version must have XPM libraries (see |netbeans-xpm|). 478 # Motif version must have XPM libraries (see |netbeans-xpm|).
479 # Uncomment this when you do not want the netbeans interface. 479 # Uncomment this when you do not want the netbeans interface.
480 #CONF_OPT_NETBEANS = --disable-netbeans 480 #CONF_OPT_NETBEANS = --disable-netbeans
538 # The default is "huge" for most systems. 538 # The default is "huge" for most systems.
539 #CONF_OPT_FEAT = --with-features=tiny 539 #CONF_OPT_FEAT = --with-features=tiny
540 #CONF_OPT_FEAT = --with-features=small 540 #CONF_OPT_FEAT = --with-features=small
541 #CONF_OPT_FEAT = --with-features=normal 541 #CONF_OPT_FEAT = --with-features=normal
542 #CONF_OPT_FEAT = --with-features=big 542 #CONF_OPT_FEAT = --with-features=big
543 CONF_OPT_FEAT = --with-features=huge 543 #CONF_OPT_FEAT = --with-features=huge
544 544
545 # COMPILED BY - For including a specific e-mail address for ":version". 545 # COMPILED BY - For including a specific e-mail address for ":version".
546 #CONF_OPT_COMPBY = "--with-compiledby=John Doe <JohnDoe@yahoo.com>" 546 #CONF_OPT_COMPBY = "--with-compiledby=John Doe <JohnDoe@yahoo.com>"
547 547
548 # X WINDOWS DISABLE - For creating a plain Vim without any X11 related fancies 548 # X WINDOWS DISABLE - For creating a plain Vim without any X11 related fancies
612 #CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes 612 #CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes
613 613
614 # Use this with GCC to check for mistakes, unused arguments, etc. 614 # Use this with GCC to check for mistakes, unused arguments, etc.
615 # Note: If you use -Wextra and get warnings in GTK code about function 615 # Note: If you use -Wextra and get warnings in GTK code about function
616 # parameters, you can add -Wno-cast-function-type 616 # parameters, you can add -Wno-cast-function-type
617 CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -Wno-cast-function-type -Wno-deprecated-declarations -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 617 #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -Wno-cast-function-type -Wno-deprecated-declarations -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
618 # Add -Wpedantic to find // comments and other C99 constructs. 618 # Add -Wpedantic to find // comments and other C99 constructs.
619 # Better disable Perl and Python to avoid a lot of warnings. 619 # Better disable Perl and Python to avoid a lot of warnings.
620 #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wunreachable-code -Wunused-result -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 620 #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wunreachable-code -Wunused-result -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
621 #CFLAGS = -g -O2 -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wunreachable-code -Wno-cast-function-type -Wunused-result -Wno-deprecated-declarations -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 621 #CFLAGS = -g -O2 -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wunreachable-code -Wno-cast-function-type -Wunused-result -Wno-deprecated-declarations -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
622 #PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers 622 #PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
705 # MEMORY LEAK DETECTION 705 # MEMORY LEAK DETECTION
706 # Requires installing the ccmalloc library. 706 # Requires installing the ccmalloc library.
707 # Configuration is in the .ccmalloc or ~/.ccmalloc file. 707 # Configuration is in the .ccmalloc or ~/.ccmalloc file.
708 # Doesn't work very well, since memory linked to from global variables 708 # Doesn't work very well, since memory linked to from global variables
709 # (in libraries) is also marked as leaked memory. 709 # (in libraries) is also marked as leaked memory.
710 LEAK_CFLAGS = -DEXITFREE 710 #LEAK_CFLAGS = -DEXITFREE
711 #LEAK_LIBS = -lccmalloc 711 #LEAK_LIBS = -lccmalloc
712 712
713 # Uncomment this line to have Vim call abort() when an internal error is 713 # Uncomment this line to have Vim call abort() when an internal error is
714 # detected. Useful when using a tool to find errors. 714 # detected. Useful when using a tool to find errors.
715 ABORT_CFLAGS = -DABORT_ON_INTERNAL_ERROR 715 #ABORT_CFLAGS = -DABORT_ON_INTERNAL_ERROR
716 716
717 ##################################################### 717 #####################################################
718 ### Specific systems, check if yours is listed! ### {{{ 718 ### Specific systems, check if yours is listed! ### {{{
719 ##################################################### 719 #####################################################
720 720