Mercurial > vim
comparison src/Makefile @ 9403:9b048dced116 v7.4.1983
commit https://github.com/vim/vim/commit/75464dc434c43efac60e8bfd9bec2a8b736407e9
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jul 2 20:27:50 2016 +0200
patch 7.4.1983
Problem: farsi.c and arabic.c are included in a strange way.
Solution: Build them like other files.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 02 Jul 2016 20:30:06 +0200 |
parents | 43b8570abbec |
children | cbf052ccb120 |
comparison
equal
deleted
inserted
replaced
9402:165d9b2513e9 | 9403:9b048dced116 |
---|---|
1476 # ALL_SRC: source files used for make depend and make lint | 1476 # ALL_SRC: source files used for make depend and make lint |
1477 | 1477 |
1478 TAGS_INCL = *.h | 1478 TAGS_INCL = *.h |
1479 | 1479 |
1480 BASIC_SRC = \ | 1480 BASIC_SRC = \ |
1481 arabic.c \ | |
1481 blowfish.c \ | 1482 blowfish.c \ |
1482 buffer.c \ | 1483 buffer.c \ |
1483 charset.c \ | 1484 charset.c \ |
1484 crypt.c \ | 1485 crypt.c \ |
1485 crypt_zip.c \ | 1486 crypt_zip.c \ |
1490 ex_cmds.c \ | 1491 ex_cmds.c \ |
1491 ex_cmds2.c \ | 1492 ex_cmds2.c \ |
1492 ex_docmd.c \ | 1493 ex_docmd.c \ |
1493 ex_eval.c \ | 1494 ex_eval.c \ |
1494 ex_getln.c \ | 1495 ex_getln.c \ |
1496 farsi.c \ | |
1495 fileio.c \ | 1497 fileio.c \ |
1496 fold.c \ | 1498 fold.c \ |
1497 getchar.c \ | 1499 getchar.c \ |
1498 hardcopy.c \ | 1500 hardcopy.c \ |
1499 hashtab.c \ | 1501 hashtab.c \ |
1573 #LINT_SRC = $(SRC) | 1575 #LINT_SRC = $(SRC) |
1574 #LINT_SRC = $(ALL_SRC) | 1576 #LINT_SRC = $(ALL_SRC) |
1575 #LINT_SRC = $(BASIC_SRC) | 1577 #LINT_SRC = $(BASIC_SRC) |
1576 | 1578 |
1577 OBJ_COMMON = \ | 1579 OBJ_COMMON = \ |
1580 objects/arabic.o \ | |
1578 objects/buffer.o \ | 1581 objects/buffer.o \ |
1579 objects/blowfish.o \ | 1582 objects/blowfish.o \ |
1580 objects/charset.o \ | 1583 objects/charset.o \ |
1581 objects/crypt.o \ | 1584 objects/crypt.o \ |
1582 objects/crypt_zip.o \ | 1585 objects/crypt_zip.o \ |
1587 objects/ex_cmds.o \ | 1590 objects/ex_cmds.o \ |
1588 objects/ex_cmds2.o \ | 1591 objects/ex_cmds2.o \ |
1589 objects/ex_docmd.o \ | 1592 objects/ex_docmd.o \ |
1590 objects/ex_eval.o \ | 1593 objects/ex_eval.o \ |
1591 objects/ex_getln.o \ | 1594 objects/ex_getln.o \ |
1595 objects/farsi.o \ | |
1592 objects/fileio.o \ | 1596 objects/fileio.o \ |
1593 objects/fold.o \ | 1597 objects/fold.o \ |
1594 objects/getchar.o \ | 1598 objects/getchar.o \ |
1595 objects/hardcopy.o \ | 1599 objects/hardcopy.o \ |
1596 objects/hashtab.o \ | 1600 objects/hashtab.o \ |
1650 MEMFILE_TEST_OBJ = $(OBJ_COMMON) \ | 1654 MEMFILE_TEST_OBJ = $(OBJ_COMMON) \ |
1651 objects/json.o \ | 1655 objects/json.o \ |
1652 objects/memfile_test.o | 1656 objects/memfile_test.o |
1653 | 1657 |
1654 PRO_AUTO = \ | 1658 PRO_AUTO = \ |
1659 arabic.pro \ | |
1655 blowfish.pro \ | 1660 blowfish.pro \ |
1656 buffer.pro \ | 1661 buffer.pro \ |
1657 charset.pro \ | 1662 charset.pro \ |
1658 crypt.pro \ | 1663 crypt.pro \ |
1659 crypt_zip.pro \ | 1664 crypt_zip.pro \ |
1664 ex_cmds.pro \ | 1669 ex_cmds.pro \ |
1665 ex_cmds2.pro \ | 1670 ex_cmds2.pro \ |
1666 ex_docmd.pro \ | 1671 ex_docmd.pro \ |
1667 ex_eval.pro \ | 1672 ex_eval.pro \ |
1668 ex_getln.pro \ | 1673 ex_getln.pro \ |
1674 farsi.pro \ | |
1669 fileio.pro \ | 1675 fileio.pro \ |
1670 fold.pro \ | 1676 fold.pro \ |
1671 getchar.pro \ | 1677 getchar.pro \ |
1672 hardcopy.pro \ | 1678 hardcopy.pro \ |
1673 hashtab.pro \ | 1679 hashtab.pro \ |
2747 # specified for each file separately. | 2753 # specified for each file separately. |
2748 | 2754 |
2749 objects: | 2755 objects: |
2750 mkdir objects | 2756 mkdir objects |
2751 | 2757 |
2758 objects/arabic.o: arabic.c | |
2759 $(CCC) -o $@ arabic.c | |
2760 | |
2752 objects/blowfish.o: blowfish.c | 2761 objects/blowfish.o: blowfish.c |
2753 $(CCC) -o $@ blowfish.c | 2762 $(CCC) -o $@ blowfish.c |
2754 | 2763 |
2755 objects/buffer.o: buffer.c | 2764 objects/buffer.o: buffer.c |
2756 $(CCC) -o $@ buffer.c | 2765 $(CCC) -o $@ buffer.c |
2788 objects/ex_eval.o: ex_eval.c | 2797 objects/ex_eval.o: ex_eval.c |
2789 $(CCC) -o $@ ex_eval.c | 2798 $(CCC) -o $@ ex_eval.c |
2790 | 2799 |
2791 objects/ex_getln.o: ex_getln.c | 2800 objects/ex_getln.o: ex_getln.c |
2792 $(CCC) -o $@ ex_getln.c | 2801 $(CCC) -o $@ ex_getln.c |
2802 | |
2803 objects/farsi.o: farsi.c | |
2804 $(CCC) -o $@ farsi.c | |
2793 | 2805 |
2794 objects/fileio.o: fileio.c | 2806 objects/fileio.o: fileio.c |
2795 $(CCC) -o $@ fileio.c | 2807 $(CCC) -o $@ fileio.c |
2796 | 2808 |
2797 objects/fold.o: fold.c | 2809 objects/fold.o: fold.c |
3108 | 3120 |
3109 | 3121 |
3110 ############################################################################### | 3122 ############################################################################### |
3111 ### (automatically generated by 'make depend') | 3123 ### (automatically generated by 'make depend') |
3112 ### Dependencies: | 3124 ### Dependencies: |
3125 objects/arabic.o: arabic.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ | |
3126 ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ | |
3127 gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h globals.h \ | |
3128 farsi.h arabic.h | |
3113 objects/blowfish.o: blowfish.c vim.h auto/config.h feature.h os_unix.h \ | 3129 objects/blowfish.o: blowfish.c vim.h auto/config.h feature.h os_unix.h \ |
3114 auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ | 3130 auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ |
3115 regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h \ | 3131 regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h \ |
3116 globals.h farsi.h arabic.h | 3132 globals.h farsi.h arabic.h |
3117 objects/buffer.o: buffer.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ | 3133 objects/buffer.o: buffer.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ |
3164 farsi.h arabic.h | 3180 farsi.h arabic.h |
3165 objects/ex_getln.o: ex_getln.c vim.h auto/config.h feature.h os_unix.h \ | 3181 objects/ex_getln.o: ex_getln.c vim.h auto/config.h feature.h os_unix.h \ |
3166 auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ | 3182 auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ |
3167 regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h \ | 3183 regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h \ |
3168 globals.h farsi.h arabic.h | 3184 globals.h farsi.h arabic.h |
3185 objects/farsi.o: farsi.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ | |
3186 ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ | |
3187 gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h globals.h \ | |
3188 farsi.h arabic.h | |
3169 objects/fileio.o: fileio.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ | 3189 objects/fileio.o: fileio.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ |
3170 ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ | 3190 ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ |
3171 gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h globals.h \ | 3191 gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h globals.h \ |
3172 farsi.h arabic.h | 3192 farsi.h arabic.h |
3173 objects/fold.o: fold.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ | 3193 objects/fold.o: fold.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ |
3199 gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h globals.h \ | 3219 gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h globals.h \ |
3200 farsi.h arabic.h | 3220 farsi.h arabic.h |
3201 objects/main.o: main.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ | 3221 objects/main.o: main.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ |
3202 ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ | 3222 ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ |
3203 gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h globals.h \ | 3223 gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h globals.h \ |
3204 farsi.h arabic.h farsi.c arabic.c | 3224 farsi.h arabic.h |
3205 objects/mark.o: mark.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ | 3225 objects/mark.o: mark.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ |
3206 ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ | 3226 ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ |
3207 gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h globals.h \ | 3227 gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h globals.h \ |
3208 farsi.h arabic.h | 3228 farsi.h arabic.h |
3209 objects/memfile.o: memfile.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ | 3229 objects/memfile.o: memfile.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ |
3312 gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h globals.h \ | 3332 gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h globals.h \ |
3313 farsi.h arabic.h | 3333 farsi.h arabic.h |
3314 objects/gui.o: gui.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \ | 3334 objects/gui.o: gui.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \ |
3315 keymap.h term.h macros.h option.h structs.h regexp.h gui.h gui_beval.h \ | 3335 keymap.h term.h macros.h option.h structs.h regexp.h gui.h gui_beval.h \ |
3316 proto/gui_beval.pro alloc.h ex_cmds.h proto.h globals.h farsi.h arabic.h | 3336 proto/gui_beval.pro alloc.h ex_cmds.h proto.h globals.h farsi.h arabic.h |
3317 objects/gui_gtk.o: gui_gtk.c gui_gtk_f.h vim.h auto/config.h feature.h os_unix.h \ | 3337 objects/gui_gtk.o: gui_gtk.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ |
3318 auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ | 3338 ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ |
3319 regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h \ | 3339 gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h globals.h \ |
3320 globals.h farsi.h arabic.h | 3340 farsi.h arabic.h gui_gtk_f.h |
3321 objects/gui_gtk_f.o: gui_gtk_f.c vim.h auto/config.h feature.h os_unix.h \ | 3341 objects/gui_gtk_f.o: gui_gtk_f.c vim.h auto/config.h feature.h os_unix.h \ |
3322 auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ | 3342 auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ |
3323 regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h \ | 3343 regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h \ |
3324 globals.h farsi.h arabic.h gui_gtk_f.h | 3344 globals.h farsi.h arabic.h gui_gtk_f.h |
3325 objects/gui_motif.o: gui_motif.c vim.h auto/config.h feature.h os_unix.h \ | 3345 objects/gui_motif.o: gui_motif.c vim.h auto/config.h feature.h os_unix.h \ |
3392 keymap.h term.h macros.h option.h structs.h regexp.h gui.h gui_beval.h \ | 3412 keymap.h term.h macros.h option.h structs.h regexp.h gui.h gui_beval.h \ |
3393 proto/gui_beval.pro alloc.h ex_cmds.h proto.h globals.h farsi.h arabic.h | 3413 proto/gui_beval.pro alloc.h ex_cmds.h proto.h globals.h farsi.h arabic.h |
3394 objects/json_test.o: json_test.c main.c vim.h auto/config.h feature.h os_unix.h \ | 3414 objects/json_test.o: json_test.c main.c vim.h auto/config.h feature.h os_unix.h \ |
3395 auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ | 3415 auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ |
3396 regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h \ | 3416 regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h \ |
3397 globals.h farsi.h arabic.h farsi.c arabic.c json.c | 3417 globals.h farsi.h arabic.h json.c |
3398 objects/memfile_test.o: memfile_test.c main.c vim.h auto/config.h feature.h \ | 3418 objects/memfile_test.o: memfile_test.c main.c vim.h auto/config.h feature.h \ |
3399 os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h \ | 3419 os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h \ |
3400 structs.h regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h \ | 3420 structs.h regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h \ |
3401 ex_cmds.h proto.h globals.h farsi.h arabic.h farsi.c arabic.c memfile.c | 3421 ex_cmds.h proto.h globals.h farsi.h arabic.h memfile.c |
3402 objects/hangulin.o: hangulin.c vim.h auto/config.h feature.h os_unix.h \ | 3422 objects/hangulin.o: hangulin.c vim.h auto/config.h feature.h os_unix.h \ |
3403 auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ | 3423 auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ |
3404 regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h \ | 3424 regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h \ |
3405 globals.h farsi.h arabic.h | 3425 globals.h farsi.h arabic.h |
3406 objects/if_lua.o: if_lua.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ | 3426 objects/if_lua.o: if_lua.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ |