Mercurial > vim
changeset 7854:b512d9cce151 v7.4.1224
commit https://github.com/vim/vim/commit/bbb3339dbfa2067fab616698739097df06aa5e6c
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 31 16:37:33 2016 +0100
patch 7.4.1224
Problem: Build problems with GTK on BSD. (Mike Williams)
Solution: Don't use "$<". Skip building gui_gtk_gresources.h when it doesn't
work. (Kazunobu Kuriyama)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 31 Jan 2016 16:45:04 +0100 |
| parents | 94a5e76a2c68 |
| children | c0eda90fbcda |
| files | src/Makefile src/version.c |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile +++ b/src/Makefile @@ -2646,9 +2646,11 @@ GUI_GTK_RES_INPUTS = \ ../pixmaps/stock_vim_window_split_vertical.png auto/gui_gtk_gresources.c: gui_gtk_res.xml $(GUI_GTK_RES_INPUTS) - $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register $< + $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register gui_gtk_res.xml auto/gui_gtk_gresources.h: gui_gtk_res.xml $(GUI_GTK_RES_INPUTS) - $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register $< + if test -z "$(GLIB_COMPILE_RESOURCES)"; then touch $@; else \ + $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register gui_gtk_res.xml; \ + fi # All the object files are put in the "objects" directory. Since not all make # commands understand putting object files in another directory, it must be