Mercurial > vim
comparison src/Makefile @ 14740:485487e34784 v8.1.0382
patch 8.1.0382: some make programs can't handle "xdiff/../"
commit https://github.com/vim/vim/commit/0f7683f9739087f3c7a4678c5182ed0517523b4a
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Sep 13 18:01:31 2018 +0200
patch 8.1.0382: some make programs can't handle "xdiff/../"
Problem: Some make programs can't handle dependency on "xdiff/../".
Solution: Strip it out.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 13 Sep 2018 18:15:05 +0200 |
| parents | 2c72fa16aa70 |
| children | 084e7e74846b |
comparison
equal
deleted
inserted
replaced
| 14739:bcc7ce3d8882 | 14740:485487e34784 |
|---|---|
| 2843 -@rm -f Makefile~ | 2843 -@rm -f Makefile~ |
| 2844 cp Makefile Makefile~ | 2844 cp Makefile Makefile~ |
| 2845 sed -e '/\#\#\# Dependencies/q' < Makefile > tmp_make | 2845 sed -e '/\#\#\# Dependencies/q' < Makefile > tmp_make |
| 2846 -for i in $(ALL_SRC); do echo $$i; \ | 2846 -for i in $(ALL_SRC); do echo $$i; \ |
| 2847 $(CPP_DEPEND) $$i | \ | 2847 $(CPP_DEPEND) $$i | \ |
| 2848 sed -e 's+^\([^ ]*\.o\)+objects/\1+' >> tmp_make; done | 2848 sed -e 's+^\([^ ]*\.o\)+objects/\1+' -e 's+xdiff/\.\./++g' >> tmp_make; done |
| 2849 mv tmp_make Makefile | 2849 mv tmp_make Makefile |
| 2850 | 2850 |
| 2851 # Run lint. Clean up the *.ln files that are sometimes left behind. | 2851 # Run lint. Clean up the *.ln files that are sometimes left behind. |
| 2852 lint: | 2852 lint: |
| 2853 $(LINT) $(LINT_OPTIONS) $(LINT_CFLAGS) $(LINT_EXTRA) $(LINT_SRC) | 2853 $(LINT) $(LINT_OPTIONS) $(LINT_CFLAGS) $(LINT_EXTRA) $(LINT_SRC) |
| 3402 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ | 3402 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ |
| 3403 proto.h globals.h farsi.h arabic.h | 3403 proto.h globals.h farsi.h arabic.h |
| 3404 objects/diff.o: diff.c vim.h protodef.h auto/config.h feature.h os_unix.h \ | 3404 objects/diff.o: diff.c vim.h protodef.h auto/config.h feature.h os_unix.h \ |
| 3405 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ | 3405 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ |
| 3406 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ | 3406 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ |
| 3407 proto.h globals.h farsi.h arabic.h xdiff/xdiff.h xdiff/../vim.h | 3407 proto.h globals.h farsi.h arabic.h xdiff/xdiff.h vim.h |
| 3408 objects/digraph.o: digraph.c vim.h protodef.h auto/config.h feature.h os_unix.h \ | 3408 objects/digraph.o: digraph.c vim.h protodef.h auto/config.h feature.h os_unix.h \ |
| 3409 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ | 3409 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ |
| 3410 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ | 3410 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ |
| 3411 proto.h globals.h farsi.h arabic.h | 3411 proto.h globals.h farsi.h arabic.h |
| 3412 objects/edit.o: edit.c vim.h protodef.h auto/config.h feature.h os_unix.h \ | 3412 objects/edit.o: edit.c vim.h protodef.h auto/config.h feature.h os_unix.h \ |
| 3789 objects/unicode.o: libvterm/src/unicode.c libvterm/src/vterm_internal.h \ | 3789 objects/unicode.o: libvterm/src/unicode.c libvterm/src/vterm_internal.h \ |
| 3790 libvterm/include/vterm.h libvterm/include/vterm_keycodes.h | 3790 libvterm/include/vterm.h libvterm/include/vterm_keycodes.h |
| 3791 objects/vterm.o: libvterm/src/vterm.c libvterm/src/vterm_internal.h \ | 3791 objects/vterm.o: libvterm/src/vterm.c libvterm/src/vterm_internal.h \ |
| 3792 libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \ | 3792 libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \ |
| 3793 libvterm/src/utf8.h | 3793 libvterm/src/utf8.h |
| 3794 objects/xdiffi.o: xdiff/xdiffi.c xdiff/xinclude.h xdiff/../auto/config.h \ | 3794 objects/xdiffi.o: xdiff/xdiffi.c xdiff/xinclude.h auto/config.h \ |
| 3795 xdiff/xmacros.h xdiff/xdiff.h xdiff/../vim.h xdiff/../protodef.h \ | 3795 xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ |
| 3796 xdiff/../auto/config.h xdiff/../feature.h xdiff/../os_unix.h \ | 3796 auto/config.h feature.h os_unix.h \ |
| 3797 xdiff/../auto/osdef.h xdiff/../ascii.h xdiff/../keymap.h xdiff/../term.h \ | 3797 auto/osdef.h ascii.h keymap.h term.h \ |
| 3798 xdiff/../macros.h xdiff/../option.h xdiff/../beval.h proto/gui_beval.pro \ | 3798 macros.h option.h beval.h proto/gui_beval.pro \ |
| 3799 xdiff/../structs.h xdiff/../regexp.h xdiff/../gui.h xdiff/../alloc.h \ | 3799 structs.h regexp.h gui.h alloc.h \ |
| 3800 xdiff/../ex_cmds.h xdiff/../spell.h xdiff/../proto.h xdiff/../globals.h \ | 3800 ex_cmds.h spell.h proto.h globals.h \ |
| 3801 xdiff/../farsi.h xdiff/../arabic.h xdiff/xtypes.h xdiff/xutils.h \ | 3801 farsi.h arabic.h xdiff/xtypes.h xdiff/xutils.h \ |
| 3802 xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h | 3802 xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h |
| 3803 objects/xemit.o: xdiff/xemit.c xdiff/xinclude.h xdiff/../auto/config.h \ | 3803 objects/xemit.o: xdiff/xemit.c xdiff/xinclude.h auto/config.h \ |
| 3804 xdiff/xmacros.h xdiff/xdiff.h xdiff/../vim.h xdiff/../protodef.h \ | 3804 xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ |
| 3805 xdiff/../auto/config.h xdiff/../feature.h xdiff/../os_unix.h \ | 3805 auto/config.h feature.h os_unix.h \ |
| 3806 xdiff/../auto/osdef.h xdiff/../ascii.h xdiff/../keymap.h xdiff/../term.h \ | 3806 auto/osdef.h ascii.h keymap.h term.h \ |
| 3807 xdiff/../macros.h xdiff/../option.h xdiff/../beval.h proto/gui_beval.pro \ | 3807 macros.h option.h beval.h proto/gui_beval.pro \ |
| 3808 xdiff/../structs.h xdiff/../regexp.h xdiff/../gui.h xdiff/../alloc.h \ | 3808 structs.h regexp.h gui.h alloc.h \ |
| 3809 xdiff/../ex_cmds.h xdiff/../spell.h xdiff/../proto.h xdiff/../globals.h \ | 3809 ex_cmds.h spell.h proto.h globals.h \ |
| 3810 xdiff/../farsi.h xdiff/../arabic.h xdiff/xtypes.h xdiff/xutils.h \ | 3810 farsi.h arabic.h xdiff/xtypes.h xdiff/xutils.h \ |
| 3811 xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h | 3811 xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h |
| 3812 objects/xprepare.o: xdiff/xprepare.c xdiff/xinclude.h xdiff/../auto/config.h \ | 3812 objects/xprepare.o: xdiff/xprepare.c xdiff/xinclude.h auto/config.h \ |
| 3813 xdiff/xmacros.h xdiff/xdiff.h xdiff/../vim.h xdiff/../protodef.h \ | 3813 xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ |
| 3814 xdiff/../auto/config.h xdiff/../feature.h xdiff/../os_unix.h \ | 3814 auto/config.h feature.h os_unix.h \ |
| 3815 xdiff/../auto/osdef.h xdiff/../ascii.h xdiff/../keymap.h xdiff/../term.h \ | 3815 auto/osdef.h ascii.h keymap.h term.h \ |
| 3816 xdiff/../macros.h xdiff/../option.h xdiff/../beval.h proto/gui_beval.pro \ | 3816 macros.h option.h beval.h proto/gui_beval.pro \ |
| 3817 xdiff/../structs.h xdiff/../regexp.h xdiff/../gui.h xdiff/../alloc.h \ | 3817 structs.h regexp.h gui.h alloc.h \ |
| 3818 xdiff/../ex_cmds.h xdiff/../spell.h xdiff/../proto.h xdiff/../globals.h \ | 3818 ex_cmds.h spell.h proto.h globals.h \ |
| 3819 xdiff/../farsi.h xdiff/../arabic.h xdiff/xtypes.h xdiff/xutils.h \ | 3819 farsi.h arabic.h xdiff/xtypes.h xdiff/xutils.h \ |
| 3820 xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h | 3820 xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h |
| 3821 objects/xutils.o: xdiff/xutils.c xdiff/xinclude.h xdiff/../auto/config.h \ | 3821 objects/xutils.o: xdiff/xutils.c xdiff/xinclude.h auto/config.h \ |
| 3822 xdiff/xmacros.h xdiff/xdiff.h xdiff/../vim.h xdiff/../protodef.h \ | 3822 xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ |
| 3823 xdiff/../auto/config.h xdiff/../feature.h xdiff/../os_unix.h \ | 3823 auto/config.h feature.h os_unix.h \ |
| 3824 xdiff/../auto/osdef.h xdiff/../ascii.h xdiff/../keymap.h xdiff/../term.h \ | 3824 auto/osdef.h ascii.h keymap.h term.h \ |
| 3825 xdiff/../macros.h xdiff/../option.h xdiff/../beval.h proto/gui_beval.pro \ | 3825 macros.h option.h beval.h proto/gui_beval.pro \ |
| 3826 xdiff/../structs.h xdiff/../regexp.h xdiff/../gui.h xdiff/../alloc.h \ | 3826 structs.h regexp.h gui.h alloc.h \ |
| 3827 xdiff/../ex_cmds.h xdiff/../spell.h xdiff/../proto.h xdiff/../globals.h \ | 3827 ex_cmds.h spell.h proto.h globals.h \ |
| 3828 xdiff/../farsi.h xdiff/../arabic.h xdiff/xtypes.h xdiff/xutils.h \ | 3828 farsi.h arabic.h xdiff/xtypes.h xdiff/xutils.h \ |
| 3829 xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h | 3829 xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h |
| 3830 objects/xhistogram.o: xdiff/xhistogram.c xdiff/xinclude.h xdiff/../auto/config.h \ | 3830 objects/xhistogram.o: xdiff/xhistogram.c xdiff/xinclude.h auto/config.h \ |
| 3831 xdiff/xmacros.h xdiff/xdiff.h xdiff/../vim.h xdiff/../protodef.h \ | 3831 xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ |
| 3832 xdiff/../auto/config.h xdiff/../feature.h xdiff/../os_unix.h \ | 3832 auto/config.h feature.h os_unix.h \ |
| 3833 xdiff/../auto/osdef.h xdiff/../ascii.h xdiff/../keymap.h xdiff/../term.h \ | 3833 auto/osdef.h ascii.h keymap.h term.h \ |
| 3834 xdiff/../macros.h xdiff/../option.h xdiff/../beval.h proto/gui_beval.pro \ | 3834 macros.h option.h beval.h proto/gui_beval.pro \ |
| 3835 xdiff/../structs.h xdiff/../regexp.h xdiff/../gui.h xdiff/../alloc.h \ | 3835 structs.h regexp.h gui.h alloc.h \ |
| 3836 xdiff/../ex_cmds.h xdiff/../spell.h xdiff/../proto.h xdiff/../globals.h \ | 3836 ex_cmds.h spell.h proto.h globals.h \ |
| 3837 xdiff/../farsi.h xdiff/../arabic.h xdiff/xtypes.h xdiff/xutils.h \ | 3837 farsi.h arabic.h xdiff/xtypes.h xdiff/xutils.h \ |
| 3838 xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h | 3838 xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h |
| 3839 objects/xpatience.o: xdiff/xpatience.c xdiff/xinclude.h xdiff/../auto/config.h \ | 3839 objects/xpatience.o: xdiff/xpatience.c xdiff/xinclude.h auto/config.h \ |
| 3840 xdiff/xmacros.h xdiff/xdiff.h xdiff/../vim.h xdiff/../protodef.h \ | 3840 xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ |
| 3841 xdiff/../auto/config.h xdiff/../feature.h xdiff/../os_unix.h \ | 3841 auto/config.h feature.h os_unix.h \ |
| 3842 xdiff/../auto/osdef.h xdiff/../ascii.h xdiff/../keymap.h xdiff/../term.h \ | 3842 auto/osdef.h ascii.h keymap.h term.h \ |
| 3843 xdiff/../macros.h xdiff/../option.h xdiff/../beval.h proto/gui_beval.pro \ | 3843 macros.h option.h beval.h proto/gui_beval.pro \ |
| 3844 xdiff/../structs.h xdiff/../regexp.h xdiff/../gui.h xdiff/../alloc.h \ | 3844 structs.h regexp.h gui.h alloc.h \ |
| 3845 xdiff/../ex_cmds.h xdiff/../spell.h xdiff/../proto.h xdiff/../globals.h \ | 3845 ex_cmds.h spell.h proto.h globals.h \ |
| 3846 xdiff/../farsi.h xdiff/../arabic.h xdiff/xtypes.h xdiff/xutils.h \ | 3846 farsi.h arabic.h xdiff/xtypes.h xdiff/xutils.h \ |
| 3847 xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h | 3847 xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h |