Mercurial > vim

comparison src/Makefile @ 7380:055a0b587a3e v7.4.995

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/36e294c00c784b9ddd05a4fdbea2e331ab2b1ca8 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Dec 29 18:55:46 2015 +0100 patch 7.4.995 Problem: gdk_pixbuf_new_from_inline() is deprecated. Solution: Generate auto/gui_gtk_gresources.c. (Kazunobu Kazunobu, closes https://github.com/vim/vim/issues/507)
author Christian Brabandt <cb@256bit.org>
date Tue, 29 Dec 2015 19:00:05 +0100
parents 6b057079a836
children 702f694c9396
comparison
equal deleted inserted replaced
7379:0463a4e8a4f0 7380:055a0b587a3e
1197 # Without a GUI install the normal way. 1197 # Without a GUI install the normal way.
1198 NONE_INSTALL = install_normal 1198 NONE_INSTALL = install_normal
1199 1199
1200 ### GTK GUI 1200 ### GTK GUI
1201 GTK_SRC = gui.c gui_gtk.c gui_gtk_x11.c pty.c gui_gtk_f.c \ 1201 GTK_SRC = gui.c gui_gtk.c gui_gtk_x11.c pty.c gui_gtk_f.c \
1202 gui_beval.c 1202 gui_beval.c $(GRESOURCE_SRC)
1203 GTK_OBJ = objects/gui.o objects/gui_gtk.o objects/gui_gtk_x11.o \ 1203 GTK_OBJ = objects/gui.o objects/gui_gtk.o objects/gui_gtk_x11.o \
1204 objects/pty.o objects/gui_gtk_f.o \ 1204 objects/pty.o objects/gui_gtk_f.o \
1205 objects/gui_beval.o 1205 objects/gui_beval.o $(GRESOURCE_OBJ)
1206 GTK_DEFS = -DFEAT_GUI_GTK $(NARROW_PROTO) 1206 GTK_DEFS = -DFEAT_GUI_GTK $(NARROW_PROTO)
1207 GTK_IPATH = $(GUI_INC_LOC) 1207 GTK_IPATH = $(GUI_INC_LOC)
1208 GTK_LIBS_DIR = $(GUI_LIB_LOC) 1208 GTK_LIBS_DIR = $(GUI_LIB_LOC)
1209 GTK_LIBS1 = 1209 GTK_LIBS1 =
1210 GTK_LIBS2 = $(GTK_LIBNAME) 1210 GTK_LIBS2 = $(GTK_LIBNAME)
1525 1525
1526 TAGS_SRC = *.c *.cpp if_perl.xs 1526 TAGS_SRC = *.c *.cpp if_perl.xs
1527 1527
1528 EXTRA_SRC = hangulin.c if_lua.c if_mzsch.c auto/if_perl.c if_perlsfio.c \ 1528 EXTRA_SRC = hangulin.c if_lua.c if_mzsch.c auto/if_perl.c if_perlsfio.c \
1529 if_python.c if_python3.c if_tcl.c if_ruby.c if_sniff.c \ 1529 if_python.c if_python3.c if_tcl.c if_ruby.c if_sniff.c \
1530 gui_beval.c workshop.c wsdebug.c integration.c netbeans.c 1530 gui_beval.c workshop.c wsdebug.c integration.c netbeans.c \
1531 $(GRESOURCE_SRC)
1531 1532
1532 # Unittest files 1533 # Unittest files
1533 MEMFILE_TEST_SRC = memfile_test.c 1534 MEMFILE_TEST_SRC = memfile_test.c
1534 MEMFILE_TEST_TARGET = memfile_test$(EXEEXT) 1535 MEMFILE_TEST_TARGET = memfile_test$(EXEEXT)
1535 1536
1867 # if_perl.pro is special: Use the generated if_perl.c for input and remove 1868 # if_perl.pro is special: Use the generated if_perl.c for input and remove
1868 # prototypes for local functions. 1869 # prototypes for local functions.
1869 if_perl.pro: auto/if_perl.c 1870 if_perl.pro: auto/if_perl.c
1870 $(CPROTO) -DFEAT_GUI auto/if_perl.c | sed "/_VI/d" > proto/$@ 1871 $(CPROTO) -DFEAT_GUI auto/if_perl.c | sed "/_VI/d" > proto/$@
1871 1872
1873 gui_gtk_gresources.pro: auto/gui_gtk_gresources.c
1874 $(CPROTO) -DFEAT_GUI $< > proto/$@
1875 echo "/* vim: set ft=c : */" >> proto/$@
1872 1876
1873 notags: 1877 notags:
1874 -rm -f tags 1878 -rm -f tags
1875 1879
1876 # Note: tags is made for the currently configured version, can't include both 1880 # Note: tags is made for the currently configured version, can't include both
2439 2443
2440 # Clean up all the files that have been produced, except configure's. 2444 # Clean up all the files that have been produced, except configure's.
2441 # We support common typing mistakes for Juergen! :-) 2445 # We support common typing mistakes for Juergen! :-)
2442 clean celan: testclean 2446 clean celan: testclean
2443 -rm -f *.o objects/* core $(VIMTARGET).core $(VIMTARGET) vim xxd/*.o 2447 -rm -f *.o objects/* core $(VIMTARGET).core $(VIMTARGET) vim xxd/*.o
2444 -rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c 2448 -rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c auto/gui_gtk_gresources.c auto/gui_gtk_gresources.h
2445 -rm -f conftest* *~ auto/link.sed 2449 -rm -f conftest* *~ auto/link.sed
2446 -rm -f $(UNITTEST_TARGETS) 2450 -rm -f $(UNITTEST_TARGETS)
2447 -rm -f runtime pixmaps 2451 -rm -f runtime pixmaps
2448 -rm -rf $(APPDIR) 2452 -rm -rf $(APPDIR)
2449 -rm -rf mzscheme_base.c 2453 -rm -rf mzscheme_base.c
2576 -@echo 'char_u *compiled_sys = (char_u *)"' | tr -d $(NL) >> $@ 2580 -@echo 'char_u *compiled_sys = (char_u *)"' | tr -d $(NL) >> $@
2577 -@if test -z "$(COMPILEDBY)"; then hostname | tr -d $(NL) >> $@; fi 2581 -@if test -z "$(COMPILEDBY)"; then hostname | tr -d $(NL) >> $@; fi
2578 -@echo '";' >> $@ 2582 -@echo '";' >> $@
2579 -@sh $(srcdir)/pathdef.sh 2583 -@sh $(srcdir)/pathdef.sh
2580 2584
2585 auto/gui_gtk_gresources.c: gui_gtk_gresources.xml
2586 $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register $<
2587 auto/gui_gtk_gresources.h: gui_gtk_gresources.xml
2588 $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register $<
2589
2581 # All the object files are put in the "objects" directory. Since not all make 2590 # All the object files are put in the "objects" directory. Since not all make
2582 # commands understand putting object files in another directory, it must be 2591 # commands understand putting object files in another directory, it must be
2583 # specified for each file separately. 2592 # specified for each file separately.
2584 2593
2585 objects: 2594 objects:
2660 objects/gui_gtk.o: gui_gtk.c 2669 objects/gui_gtk.o: gui_gtk.c
2661 $(CCC) -o $@ gui_gtk.c 2670 $(CCC) -o $@ gui_gtk.c
2662 2671
2663 objects/gui_gtk_f.o: gui_gtk_f.c 2672 objects/gui_gtk_f.o: gui_gtk_f.c
2664 $(CCC) -o $@ gui_gtk_f.c 2673 $(CCC) -o $@ gui_gtk_f.c
2674
2675 objects/gui_gtk_gresources.o: auto/gui_gtk_gresources.c
2676 $(CCC) $(PERL_CFLAGS) -o $@ auto/gui_gtk_gresources.c
2665 2677
2666 objects/gui_gtk_x11.o: gui_gtk_x11.c 2678 objects/gui_gtk_x11.o: gui_gtk_x11.c
2667 $(CCC) -o $@ gui_gtk_x11.c 2679 $(CCC) -o $@ gui_gtk_x11.c
2668 2680
2669 objects/gui_motif.o: gui_motif.c 2681 objects/gui_motif.o: gui_motif.c
3143 globals.h farsi.h arabic.h ../pixmaps/stock_icons.h 3155 globals.h farsi.h arabic.h ../pixmaps/stock_icons.h
3144 objects/gui_gtk_f.o: gui_gtk_f.c vim.h auto/config.h feature.h os_unix.h \ 3156 objects/gui_gtk_f.o: gui_gtk_f.c vim.h auto/config.h feature.h os_unix.h \
3145 auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ 3157 auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
3146 regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ 3158 regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
3147 globals.h farsi.h arabic.h gui_gtk_f.h 3159 globals.h farsi.h arabic.h gui_gtk_f.h
3160 objects/gui_gtk_gresources.o: auto/gui_gtk_gresources.c gui_gtk_gresources.xml \
3161 ../pixmaps/stock_vim_build_tags.png ../pixmaps/stock_vim_find_help.png \
3162 ../pixmaps/stock_vim_save_all.png ../pixmaps/stock_vim_session_load.png \
3163 ../pixmaps/stock_vim_session_new.png ../pixmaps/stock_vim_session_save.png \
3164 ../pixmaps/stock_vim_shell.png ../pixmaps/stock_vim_window_maximize.png \
3165 ../pixmaps/stock_vim_window_maximize_width.png \
3166 ../pixmaps/stock_vim_window_minimize.png \
3167 ../pixmaps/stock_vim_window_minimize_width.png \
3168 ../pixmaps/stock_vim_window_split.png \
3169 ../pixmaps/stock_vim_window_split_vertical.png
3148 objects/gui_motif.o: gui_motif.c vim.h auto/config.h feature.h os_unix.h \ 3170 objects/gui_motif.o: gui_motif.c vim.h auto/config.h feature.h os_unix.h \
3149 auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ 3171 auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
3150 regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ 3172 regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
3151 globals.h farsi.h arabic.h gui_xmebw.h ../pixmaps/alert.xpm \ 3173 globals.h farsi.h arabic.h gui_xmebw.h ../pixmaps/alert.xpm \
3152 ../pixmaps/error.xpm ../pixmaps/generic.xpm ../pixmaps/info.xpm \ 3174 ../pixmaps/error.xpm ../pixmaps/generic.xpm ../pixmaps/info.xpm \
3195 ../pixmaps/tb_minwidth.xpm 3217 ../pixmaps/tb_minwidth.xpm
3196 objects/gui_gtk_x11.o: gui_gtk_x11.c vim.h auto/config.h feature.h os_unix.h \ 3218 objects/gui_gtk_x11.o: gui_gtk_x11.c vim.h auto/config.h feature.h os_unix.h \
3197 auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ 3219 auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
3198 regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ 3220 regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
3199 globals.h farsi.h arabic.h gui_gtk_f.h ../runtime/vim32x32.xpm \ 3221 globals.h farsi.h arabic.h gui_gtk_f.h ../runtime/vim32x32.xpm \
3200 ../runtime/vim16x16.xpm ../runtime/vim48x48.xpm 3222 ../runtime/vim16x16.xpm ../runtime/vim48x48.xpm $(GRESOURCE_HDR)
3201 objects/gui_x11.o: gui_x11.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ 3223 objects/gui_x11.o: gui_x11.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 \ 3224 ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
3203 gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ 3225 gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \
3204 arabic.h ../runtime/vim32x32.xpm ../runtime/vim16x16.xpm \ 3226 arabic.h ../runtime/vim32x32.xpm ../runtime/vim16x16.xpm \
3205 ../runtime/vim48x48.xpm 3227 ../runtime/vim48x48.xpm