Mercurial > vim

comparison src/Makefile @ 18267:da6a7491e148 v8.1.2128

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.2128: renamed libvterm sources makes merging difficult Commit: https://github.com/vim/vim/commit/93268054428fe3a6bbe3f89d2def2fec4eabcf5f Author: Bram Moolenaar <Bram@vim.org> Date: Thu Oct 10 13:22:54 2019 +0200 patch 8.1.2128: renamed libvterm sources makes merging difficult Problem: Renamed libvterm sources makes merging difficult. Solution: Rename back to the original name and only rename the .o files. Also clean the libvterm build artifacts. (James McCoy, closes #5027)
author Bram Moolenaar <Bram@vim.org>
date Thu, 10 Oct 2019 13:30:04 +0200
parents fe5afdc03bd2
children 2329061e6289
comparison
equal deleted inserted replaced
18266:4af19863e264 18267:da6a7491e148
2858 -rm -f testdir/opt_test.vim 2858 -rm -f testdir/opt_test.vim
2859 -rm -f $(UNITTEST_TARGETS) 2859 -rm -f $(UNITTEST_TARGETS)
2860 -rm -f runtime pixmaps 2860 -rm -f runtime pixmaps
2861 -rm -rf $(APPDIR) 2861 -rm -rf $(APPDIR)
2862 -rm -rf mzscheme_base.c 2862 -rm -rf mzscheme_base.c
2863 -rm -rf libvterm/.libs libterm/t/.libs libvterm/src/*.o libvterm/src/*.lo libvterm/t/*.o libvterm/t/*.lo libvterm/t/harness libvterm/libvterm.la
2863 if test -d $(PODIR); then \ 2864 if test -d $(PODIR); then \
2864 cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) clean; \ 2865 cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) clean; \
2865 fi 2866 fi
2866 2867
2867 # Make a shadow directory for compilation on another system or with different 2868 # Make a shadow directory for compilation on another system or with different
3451 $(CCC) -o $@ channel.c 3452 $(CCC) -o $@ channel.c
3452 3453
3453 Makefile: 3454 Makefile:
3454 @echo The name of the makefile MUST be "Makefile" (with capital M)!!!! 3455 @echo The name of the makefile MUST be "Makefile" (with capital M)!!!!
3455 3456
3457 # Build rules for libvterm. Putting them here allows for adding compilation
3458 # options specific for Vim. Since the .o files go into objects/ we do need to
3459 # prefix vterm_ to avoid name clashes.
3456 CCCTERM = $(CCC_NF) $(VTERM_CFLAGS) $(ALL_CFLAGS) -DINLINE="" \ 3460 CCCTERM = $(CCC_NF) $(VTERM_CFLAGS) $(ALL_CFLAGS) -DINLINE="" \
3457 -DVSNPRINTF=vim_vsnprintf \ 3461 -DVSNPRINTF=vim_vsnprintf \
3458 -DIS_COMBINING_FUNCTION=utf_iscomposing_uint \ 3462 -DIS_COMBINING_FUNCTION=utf_iscomposing_uint \
3459 -DWCWIDTH_FUNCTION=utf_uint2cells 3463 -DWCWIDTH_FUNCTION=utf_uint2cells
3460 3464
3461 objects/encoding.o: libvterm/src/encoding.c $(TERM_DEPS) 3465 objects/vterm_encoding.o: libvterm/src/encoding.c $(TERM_DEPS)
3462 $(CCCTERM) -o $@ libvterm/src/encoding.c 3466 $(CCCTERM) -o $@ libvterm/src/encoding.c
3463 3467
3464 objects/keyboard.o: libvterm/src/keyboard.c $(TERM_DEPS) 3468 objects/vterm_keyboard.o: libvterm/src/keyboard.c $(TERM_DEPS)
3465 $(CCCTERM) -o $@ libvterm/src/keyboard.c 3469 $(CCCTERM) -o $@ libvterm/src/keyboard.c
3466 3470
3467 objects/termmouse.o: libvterm/src/termmouse.c $(TERM_DEPS) 3471 objects/vterm_mouse.o: libvterm/src/mouse.c $(TERM_DEPS)
3468 $(CCCTERM) -o $@ libvterm/src/termmouse.c 3472 $(CCCTERM) -o $@ libvterm/src/mouse.c
3469 3473
3470 objects/parser.o: libvterm/src/parser.c $(TERM_DEPS) 3474 objects/vterm_parser.o: libvterm/src/parser.c $(TERM_DEPS)
3471 $(CCCTERM) -o $@ libvterm/src/parser.c 3475 $(CCCTERM) -o $@ libvterm/src/parser.c
3472 3476
3473 objects/pen.o: libvterm/src/pen.c $(TERM_DEPS) 3477 objects/vterm_pen.o: libvterm/src/pen.c $(TERM_DEPS)
3474 $(CCCTERM) -o $@ libvterm/src/pen.c 3478 $(CCCTERM) -o $@ libvterm/src/pen.c
3475 3479
3476 objects/termscreen.o: libvterm/src/termscreen.c $(TERM_DEPS) 3480 objects/vterm_screen.o: libvterm/src/screen.c $(TERM_DEPS)
3477 $(CCCTERM) -o $@ libvterm/src/termscreen.c 3481 $(CCCTERM) -o $@ libvterm/src/screen.c
3478 3482
3479 objects/state.o: libvterm/src/state.c $(TERM_DEPS) 3483 objects/vterm_state.o: libvterm/src/state.c $(TERM_DEPS)
3480 $(CCCTERM) -o $@ libvterm/src/state.c 3484 $(CCCTERM) -o $@ libvterm/src/state.c
3481 3485
3482 objects/unicode.o: libvterm/src/unicode.c $(TERM_DEPS) 3486 objects/vterm_unicode.o: libvterm/src/unicode.c $(TERM_DEPS)
3483 $(CCCTERM) -o $@ libvterm/src/unicode.c 3487 $(CCCTERM) -o $@ libvterm/src/unicode.c
3484 3488
3485 objects/vterm.o: libvterm/src/vterm.c $(TERM_DEPS) 3489 objects/vterm_vterm.o: libvterm/src/vterm.c $(TERM_DEPS)
3486 $(CCCTERM) -o $@ libvterm/src/vterm.c 3490 $(CCCTERM) -o $@ libvterm/src/vterm.c
3487 3491
3488 CCCDIFF = $(CCC_NF) $(ALL_CFLAGS) 3492 CCCDIFF = $(CCC_NF) $(ALL_CFLAGS)
3489 3493
3490 objects/xdiffi.o: xdiff/xdiffi.c $(XDIFF_INCL) 3494 objects/xdiffi.o: xdiff/xdiffi.c $(XDIFF_INCL)
4109 objects/channel.o: channel.c vim.h protodef.h auto/config.h feature.h os_unix.h \ 4113 objects/channel.o: channel.c vim.h protodef.h auto/config.h feature.h os_unix.h \
4110 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ 4114 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
4111 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ 4115 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
4112 proto.h globals.h 4116 proto.h globals.h
4113 objects/gui_gtk_gresources.o: auto/gui_gtk_gresources.c 4117 objects/gui_gtk_gresources.o: auto/gui_gtk_gresources.c
4114 objects/encoding.o: libvterm/src/encoding.c libvterm/src/vterm_internal.h \ 4118 objects/vterm_encoding.o: libvterm/src/encoding.c libvterm/src/vterm_internal.h \
4115 libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \ 4119 libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \
4116 libvterm/src/encoding/DECdrawing.inc libvterm/src/encoding/uk.inc 4120 libvterm/src/encoding/DECdrawing.inc libvterm/src/encoding/uk.inc
4117 objects/keyboard.o: libvterm/src/keyboard.c libvterm/src/vterm_internal.h \ 4121 objects/vterm_keyboard.o: libvterm/src/keyboard.c libvterm/src/vterm_internal.h \
4118 libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \ 4122 libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \
4119 libvterm/src/utf8.h 4123 libvterm/src/utf8.h
4120 objects/termmouse.o: libvterm/src/termmouse.c libvterm/src/vterm_internal.h \ 4124 objects/vterm_mouse.o: libvterm/src/mouse.c libvterm/src/vterm_internal.h \
4121 libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \ 4125 libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \
4122 libvterm/src/utf8.h 4126 libvterm/src/utf8.h
4123 objects/parser.o: libvterm/src/parser.c libvterm/src/vterm_internal.h \ 4127 objects/vterm_parser.o: libvterm/src/parser.c libvterm/src/vterm_internal.h \
4124 libvterm/include/vterm.h libvterm/include/vterm_keycodes.h 4128 libvterm/include/vterm.h libvterm/include/vterm_keycodes.h
4125 objects/pen.o: libvterm/src/pen.c libvterm/src/vterm_internal.h \ 4129 objects/vterm_pen.o: libvterm/src/pen.c libvterm/src/vterm_internal.h \
4126 libvterm/include/vterm.h libvterm/include/vterm_keycodes.h 4130 libvterm/include/vterm.h libvterm/include/vterm_keycodes.h
4127 objects/state.o: libvterm/src/state.c libvterm/src/vterm_internal.h \ 4131 objects/vterm_state.o: libvterm/src/state.c libvterm/src/vterm_internal.h \
4128 libvterm/include/vterm.h libvterm/include/vterm_keycodes.h 4132 libvterm/include/vterm.h libvterm/include/vterm_keycodes.h
4129 objects/termscreen.o: libvterm/src/termscreen.c libvterm/src/vterm_internal.h \ 4133 objects/vterm_screen.o: libvterm/src/screen.c libvterm/src/vterm_internal.h \
4130 libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \ 4134 libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \
4131 libvterm/src/rect.h libvterm/src/utf8.h 4135 libvterm/src/rect.h libvterm/src/utf8.h
4132 objects/unicode.o: libvterm/src/unicode.c libvterm/src/vterm_internal.h \ 4136 objects/vterm_unicode.o: libvterm/src/unicode.c libvterm/src/vterm_internal.h \
4133 libvterm/include/vterm.h libvterm/include/vterm_keycodes.h 4137 libvterm/include/vterm.h libvterm/include/vterm_keycodes.h
4134 objects/vterm.o: libvterm/src/vterm.c libvterm/src/vterm_internal.h \ 4138 objects/vterm_vterm.o: libvterm/src/vterm.c libvterm/src/vterm_internal.h \
4135 libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \ 4139 libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \
4136 libvterm/src/utf8.h 4140 libvterm/src/utf8.h
4137 objects/xdiffi.o: xdiff/xdiffi.c xdiff/xinclude.h auto/config.h \ 4141 objects/xdiffi.o: xdiff/xdiffi.c xdiff/xinclude.h auto/config.h \
4138 xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \ 4142 xdiff/xmacros.h xdiff/xdiff.h vim.h protodef.h \
4139 auto/config.h feature.h os_unix.h \ 4143 auto/config.h feature.h os_unix.h \