Mercurial > vim
comparison src/Makefile @ 10627:fb9c28aca006 v8.0.0203
patch 8.0.0203: order of complication flags is sometimes wrong
commit https://github.com/vim/vim/commit/6e78e27b8aace2e4c2412bfc4de6567509258d28
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jan 17 19:20:15 2017 +0100
patch 8.0.0203: order of complication flags is sometimes wrong
Problem: Order of complication flags is sometimes wrong.
Solution: Put interface-specific flags before ALL_CFLAGS. (idea by Yousong
Zhou, closes #1100)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 17 Jan 2017 19:30:04 +0100 |
parents | 2748b23db6bb |
children | 91444fa276eb |
comparison
equal
deleted
inserted
replaced
10626:37b1197fdd6f | 10627:fb9c28aca006 |
---|---|
1875 myself: | 1875 myself: |
1876 $(MAKE) -f Makefile all | 1876 $(MAKE) -f Makefile all |
1877 | 1877 |
1878 | 1878 |
1879 # The normal command to compile a .c file to its .o file. | 1879 # The normal command to compile a .c file to its .o file. |
1880 CCC = $(CC) -c -I$(srcdir) $(ALL_CFLAGS) | 1880 # Without or with ALL_CFLAGS. |
1881 CCC_NF = $(CC) -c -I$(srcdir) | |
1882 CCC = $(CCC_NF) $(ALL_CFLAGS) | |
1881 | 1883 |
1882 | 1884 |
1883 # Link the target for normal use or debugging. | 1885 # Link the target for normal use or debugging. |
1884 # A shell script is used to try linking without unnecessary libraries. | 1886 # A shell script is used to try linking without unnecessary libraries. |
1885 $(VIMTARGET): auto/config.mk objects $(OBJ) version.c version.h | 1887 $(VIMTARGET): auto/config.mk objects $(OBJ) version.c version.h |
2974 | 2976 |
2975 objects/gui_gtk_f.o: gui_gtk_f.c | 2977 objects/gui_gtk_f.o: gui_gtk_f.c |
2976 $(CCC) -o $@ gui_gtk_f.c | 2978 $(CCC) -o $@ gui_gtk_f.c |
2977 | 2979 |
2978 objects/gui_gtk_gresources.o: auto/gui_gtk_gresources.c | 2980 objects/gui_gtk_gresources.o: auto/gui_gtk_gresources.c |
2979 $(CCC) $(PERL_CFLAGS) -o $@ auto/gui_gtk_gresources.c | 2981 $(CCC_NF) $(PERL_CFLAGS) $(ALL_CFLAGS) -o $@ auto/gui_gtk_gresources.c |
2980 | 2982 |
2981 objects/gui_gtk_x11.o: gui_gtk_x11.c | 2983 objects/gui_gtk_x11.o: gui_gtk_x11.c |
2982 $(CCC) -o $@ gui_gtk_x11.c | 2984 $(CCC) -o $@ gui_gtk_x11.c |
2983 | 2985 |
2984 objects/gui_motif.o: gui_motif.c | 2986 objects/gui_motif.o: gui_motif.c |
3007 | 3009 |
3008 objects/if_xcmdsrv.o: if_xcmdsrv.c | 3010 objects/if_xcmdsrv.o: if_xcmdsrv.c |
3009 $(CCC) -o $@ if_xcmdsrv.c | 3011 $(CCC) -o $@ if_xcmdsrv.c |
3010 | 3012 |
3011 objects/if_lua.o: if_lua.c | 3013 objects/if_lua.o: if_lua.c |
3012 $(CCC) $(LUA_CFLAGS) -o $@ if_lua.c | 3014 $(CCC_NF) $(LUA_CFLAGS) $(ALL_CFLAGS) -o $@ if_lua.c |
3013 | 3015 |
3014 objects/if_mzsch.o: if_mzsch.c $(MZSCHEME_EXTRA) | 3016 objects/if_mzsch.o: if_mzsch.c $(MZSCHEME_EXTRA) |
3015 $(CCC) -o $@ $(MZSCHEME_CFLAGS_EXTRA) if_mzsch.c | 3017 $(CCC) -o $@ $(MZSCHEME_CFLAGS_EXTRA) if_mzsch.c |
3016 | 3018 |
3017 mzscheme_base.c: | 3019 mzscheme_base.c: |
3018 $(MZSCHEME_MZC) --c-mods mzscheme_base.c ++lib scheme/base | 3020 $(MZSCHEME_MZC) --c-mods mzscheme_base.c ++lib scheme/base |
3019 | 3021 |
3020 objects/if_perl.o: auto/if_perl.c | 3022 objects/if_perl.o: auto/if_perl.c |
3021 $(CCC) $(PERL_CFLAGS) -o $@ auto/if_perl.c | 3023 $(CCC_NF) $(PERL_CFLAGS) $(ALL_CFLAGS) -o $@ auto/if_perl.c |
3022 | 3024 |
3023 objects/if_perlsfio.o: if_perlsfio.c | 3025 objects/if_perlsfio.o: if_perlsfio.c |
3024 $(CCC) $(PERL_CFLAGS) -o $@ if_perlsfio.c | 3026 $(CCC_NF) $(PERL_CFLAGS) $(ALL_CFLAGS) -o $@ if_perlsfio.c |
3025 | 3027 |
3026 objects/py_getpath.o: $(PYTHON_CONFDIR)/getpath.c | 3028 objects/py_getpath.o: $(PYTHON_CONFDIR)/getpath.c |
3027 $(CCC) $(PYTHON_CFLAGS) -o $@ $(PYTHON_CONFDIR)/getpath.c \ | 3029 $(CCC_NF) $(PYTHON_CFLAGS) $(ALL_CFLAGS) -o $@ \ |
3030 $(PYTHON_CONFDIR)/getpath.c \ | |
3028 -I$(PYTHON_CONFDIR) -DHAVE_CONFIG_H -DNO_MAIN \ | 3031 -I$(PYTHON_CONFDIR) -DHAVE_CONFIG_H -DNO_MAIN \ |
3029 $(PYTHON_GETPATH_CFLAGS) | 3032 $(PYTHON_GETPATH_CFLAGS) |
3030 | 3033 |
3031 objects/if_python.o: if_python.c if_py_both.h | 3034 objects/if_python.o: if_python.c if_py_both.h |
3032 $(CCC) $(PYTHON_CFLAGS) $(PYTHON_CFLAGS_EXTRA) -o $@ if_python.c | 3035 $(CCC_NF) $(PYTHON_CFLAGS) $(PYTHON_CFLAGS_EXTRA) $(ALL_CFLAGS) -o $@ if_python.c |
3033 | 3036 |
3034 objects/if_python3.o: if_python3.c if_py_both.h | 3037 objects/if_python3.o: if_python3.c if_py_both.h |
3035 $(CCC) $(PYTHON3_CFLAGS) $(PYTHON3_CFLAGS_EXTRA) -o $@ if_python3.c | 3038 $(CCC_NF) $(PYTHON3_CFLAGS) $(PYTHON3_CFLAGS_EXTRA) $(ALL_CFLAGS) -o $@ if_python3.c |
3036 | 3039 |
3037 objects/if_ruby.o: if_ruby.c | 3040 objects/if_ruby.o: if_ruby.c |
3038 $(CCC) $(RUBY_CFLAGS) -o $@ if_ruby.c | 3041 $(CCC_NF) $(RUBY_CFLAGS) $(ALL_CFLAGS) -o $@ if_ruby.c |
3039 | 3042 |
3040 objects/if_tcl.o: if_tcl.c | 3043 objects/if_tcl.o: if_tcl.c |
3041 $(CCC) $(TCL_CFLAGS) -o $@ if_tcl.c | 3044 $(CCC_NF) $(TCL_CFLAGS) $(ALL_CFLAGS) -o $@ if_tcl.c |
3042 | 3045 |
3043 objects/integration.o: integration.c | 3046 objects/integration.o: integration.c |
3044 $(CCC) -o $@ integration.c | 3047 $(CCC) -o $@ integration.c |
3045 | 3048 |
3046 objects/json.o: json.c | 3049 objects/json.o: json.c |
3093 | 3096 |
3094 objects/ops.o: ops.c | 3097 objects/ops.o: ops.c |
3095 $(CCC) -o $@ ops.c | 3098 $(CCC) -o $@ ops.c |
3096 | 3099 |
3097 objects/option.o: option.c | 3100 objects/option.o: option.c |
3098 $(CCC) $(LUA_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) $(PYTHON3_CFLAGS) $(RUBY_CFLAGS) $(TCL_CFLAGS) -o $@ option.c | 3101 $(CCC_NF) $(LUA_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) $(PYTHON3_CFLAGS) $(RUBY_CFLAGS) $(TCL_CFLAGS) $(ALL_CFLAGS) -o $@ option.c |
3099 | 3102 |
3100 objects/os_beos.o: os_beos.c | 3103 objects/os_beos.o: os_beos.c |
3101 $(CCC) -o $@ os_beos.c | 3104 $(CCC) -o $@ os_beos.c |
3102 | 3105 |
3103 objects/os_qnx.o: os_qnx.c | 3106 objects/os_qnx.o: os_qnx.c |