comparison src/Makefile @ 18671:df141c730008 v8.1.2327

patch 8.1.2327: cannot build with Hangul input Commit: https://github.com/vim/vim/commit/546125869f2959480c9a0f6c448c2092d565ec15 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Nov 21 17:13:31 2019 +0100 patch 8.1.2327: cannot build with Hangul input Problem: Cannot build with Hangul input. Solution: Remove Hangul input support.
author Bram Moolenaar <Bram@vim.org>
date Thu, 21 Nov 2019 17:15:04 +0100
parents 2329061e6289
children f966b20bb74d
comparison
equal deleted inserted replaced
18670:4658aa8e09fc 18671:df141c730008
502 #CONF_OPT_NLS = --disable-nls 502 #CONF_OPT_NLS = --disable-nls
503 503
504 # XIM - X Input Method. Special character input support for X11 (Chinese, 504 # XIM - X Input Method. Special character input support for X11 (Chinese,
505 # Japanese, special symbols, etc). Also needed for dead-key support. 505 # Japanese, special symbols, etc). Also needed for dead-key support.
506 # When omitted it's automatically enabled for the X-windows GUI. 506 # When omitted it's automatically enabled for the X-windows GUI.
507 # HANGUL - Input Hangul (Korean) language using internal routines.
508 # Uncomment one of these when you want to input a multibyte language.
509 #CONF_OPT_INPUT = --enable-xim 507 #CONF_OPT_INPUT = --enable-xim
510 #CONF_OPT_INPUT = --disable-xim 508 #CONF_OPT_INPUT = --disable-xim
511 #CONF_OPT_INPUT = --enable-hangulinput
512 509
513 # FONTSET - X fontset support for output of languages with many characters. 510 # FONTSET - X fontset support for output of languages with many characters.
514 # Uncomment this when you want to output a multibyte language. 511 # Uncomment this when you want to output a multibyte language.
515 #CONF_OPT_OUTPUT = --enable-fontset 512 #CONF_OPT_OUTPUT = --enable-fontset
516 513
1486 LINT_CFLAGS = -DLINT -I. $(PRE_DEFS) $(POST_DEFS) \ 1483 LINT_CFLAGS = -DLINT -I. $(PRE_DEFS) $(POST_DEFS) \
1487 $(RUBY_CFLAGS) $(LUA_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) \ 1484 $(RUBY_CFLAGS) $(LUA_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) \
1488 $(PYTHON3_CFLAGS) $(TCL_CFLAGS) $(VTERM_CFLAGS) \ 1485 $(PYTHON3_CFLAGS) $(TCL_CFLAGS) $(VTERM_CFLAGS) \
1489 -Dinline= -D__extension__= -Dalloca=alloca 1486 -Dinline= -D__extension__= -Dalloca=alloca
1490 1487
1491 LINT_EXTRA = -DHANGUL_INPUT -D"__attribute__(x)=" 1488 LINT_EXTRA = -D"__attribute__(x)="
1492 1489
1493 DEPEND_CFLAGS = -DPROTO -DDEPEND -DFEAT_GUI $(LINT_CFLAGS) 1490 DEPEND_CFLAGS = -DPROTO -DDEPEND -DFEAT_GUI $(LINT_CFLAGS)
1494 1491
1495 # Note: MZSCHEME_LIBS must come before LIBS, because LIBS adds -lm which is 1492 # Note: MZSCHEME_LIBS must come before LIBS, because LIBS adds -lm which is
1496 # needed by racket. 1493 # needed by racket.
1674 1671
1675 SRC = $(BASIC_SRC) \ 1672 SRC = $(BASIC_SRC) \
1676 $(GUI_SRC) \ 1673 $(GUI_SRC) \
1677 $(TERM_SRC) \ 1674 $(TERM_SRC) \
1678 $(XDIFF_SRC) \ 1675 $(XDIFF_SRC) \
1679 $(HANGULIN_SRC) \
1680 $(LUA_SRC) \ 1676 $(LUA_SRC) \
1681 $(MZSCHEME_SRC) \ 1677 $(MZSCHEME_SRC) \
1682 $(PERL_SRC) \ 1678 $(PERL_SRC) \
1683 $(PYTHON_SRC) $(PYTHON3_SRC) \ 1679 $(PYTHON_SRC) $(PYTHON3_SRC) \
1684 $(TCL_SRC) \ 1680 $(TCL_SRC) \
1685 $(RUBY_SRC) 1681 $(RUBY_SRC)
1686 1682
1687 EXTRA_SRC = hangulin.c if_lua.c if_mzsch.c auto/if_perl.c if_perlsfio.c \ 1683 EXTRA_SRC = if_lua.c if_mzsch.c auto/if_perl.c if_perlsfio.c \
1688 if_python.c if_python3.c if_tcl.c if_ruby.c \ 1684 if_python.c if_python3.c if_tcl.c if_ruby.c \
1689 gui_beval.c netbeans.c channel.c \ 1685 gui_beval.c netbeans.c channel.c \
1690 $(GRESOURCE_SRC) 1686 $(GRESOURCE_SRC)
1691 1687
1692 # Unittest files 1688 # Unittest files
1708 $(EXTRA_SRC) $(TERM_SRC) $(XDIFF_SRC) 1704 $(EXTRA_SRC) $(TERM_SRC) $(XDIFF_SRC)
1709 1705
1710 # Which files to check with lint. Select one of these three lines. ALL_SRC 1706 # Which files to check with lint. Select one of these three lines. ALL_SRC
1711 # checks more, but may not work well for checking a GUI that wasn't configured. 1707 # checks more, but may not work well for checking a GUI that wasn't configured.
1712 # The perl sources also don't work well with lint. 1708 # The perl sources also don't work well with lint.
1713 LINT_SRC = $(BASIC_SRC) $(GUI_SRC) $(HANGULIN_SRC) \ 1709 LINT_SRC = $(BASIC_SRC) $(GUI_SRC) \
1714 $(PYTHON_SRC) $(PYTHON3_SRC) $(TCL_SRC) \ 1710 $(PYTHON_SRC) $(PYTHON3_SRC) $(TCL_SRC) \
1715 $(NETBEANS_SRC) $(CHANNEL_SRC) $(TERM_SRC) 1711 $(NETBEANS_SRC) $(CHANNEL_SRC) $(TERM_SRC)
1716 #LINT_SRC = $(SRC) 1712 #LINT_SRC = $(SRC)
1717 #LINT_SRC = $(ALL_SRC) 1713 #LINT_SRC = $(ALL_SRC)
1718 #LINT_SRC = $(BASIC_SRC) 1714 #LINT_SRC = $(BASIC_SRC)
1754 objects/fold.o \ 1750 objects/fold.o \
1755 objects/getchar.o \ 1751 objects/getchar.o \
1756 objects/hardcopy.o \ 1752 objects/hardcopy.o \
1757 objects/hashtab.o \ 1753 objects/hashtab.o \
1758 objects/highlight.o \ 1754 objects/highlight.o \
1759 $(HANGULIN_OBJ) \
1760 objects/if_cscope.o \ 1755 objects/if_cscope.o \
1761 objects/if_xcmdsrv.o \ 1756 objects/if_xcmdsrv.o \
1762 objects/indent.o \ 1757 objects/indent.o \
1763 objects/insexpand.o \ 1758 objects/insexpand.o \
1764 objects/list.o \ 1759 objects/list.o \
1907 findfile.pro \ 1902 findfile.pro \
1908 fold.pro \ 1903 fold.pro \
1909 getchar.pro \ 1904 getchar.pro \
1910 hardcopy.pro \ 1905 hardcopy.pro \
1911 hashtab.pro \ 1906 hashtab.pro \
1912 hangulin.pro \
1913 highlight.pro \ 1907 highlight.pro \
1914 if_cscope.pro \ 1908 if_cscope.pro \
1915 if_lua.pro \ 1909 if_lua.pro \
1916 if_mzsch.pro \ 1910 if_mzsch.pro \
1917 if_python.pro \ 1911 if_python.pro \
3218 $(CCC) -o $@ gui_photon.c 3212 $(CCC) -o $@ gui_photon.c
3219 3213
3220 objects/gui_mac.o: gui_mac.c 3214 objects/gui_mac.o: gui_mac.c
3221 $(CCC) -o $@ gui_mac.c 3215 $(CCC) -o $@ gui_mac.c
3222 3216
3223 objects/hangulin.o: hangulin.c
3224 $(CCC) -o $@ hangulin.c
3225
3226 objects/highlight.o: highlight.c 3217 objects/highlight.o: highlight.c
3227 $(CCC) -o $@ highlight.c 3218 $(CCC) -o $@ highlight.c
3228 3219
3229 objects/if_cscope.o: if_cscope.c 3220 objects/if_cscope.o: if_cscope.c
3230 $(CCC) -o $@ if_cscope.c 3221 $(CCC) -o $@ if_cscope.c
4064 ex_cmds.h spell.h proto.h globals.h memfile.c 4055 ex_cmds.h spell.h proto.h globals.h memfile.c
4065 objects/message_test.o: message_test.c main.c vim.h protodef.h auto/config.h \ 4056 objects/message_test.o: message_test.c main.c vim.h protodef.h auto/config.h \
4066 feature.h os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h \ 4057 feature.h os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h \
4067 option.h beval.h proto/gui_beval.pro structs.h regexp.h gui.h alloc.h \ 4058 option.h beval.h proto/gui_beval.pro structs.h regexp.h gui.h alloc.h \
4068 ex_cmds.h spell.h proto.h globals.h message.c 4059 ex_cmds.h spell.h proto.h globals.h message.c
4069 objects/hangulin.o: hangulin.c vim.h protodef.h auto/config.h feature.h os_unix.h \
4070 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
4071 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
4072 proto.h globals.h
4073 objects/if_lua.o: if_lua.c vim.h protodef.h auto/config.h feature.h os_unix.h \ 4060 objects/if_lua.o: if_lua.c vim.h protodef.h auto/config.h feature.h os_unix.h \
4074 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ 4061 auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
4075 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ 4062 proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
4076 proto.h globals.h 4063 proto.h globals.h
4077 objects/if_mzsch.o: if_mzsch.c vim.h protodef.h auto/config.h feature.h os_unix.h \ 4064 objects/if_mzsch.o: if_mzsch.c vim.h protodef.h auto/config.h feature.h os_unix.h \