diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-01 17:20:27 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-01 17:20:27 +0100 |
| commit | 39373819fd5fad825df416f1e2b96a6f43758e23 (patch) | |
| tree | b4da9226333c6933c185593655de8defcba176e9 | |
| parent | af2dff8fbc0e0c1dd7cb5ae058c3b896c28f7d24 (diff) | |
| download | vim-git-39373819fd5fad825df416f1e2b96a6f43758e23.tar.gz | |
patch 7.4.1019v7.4.1019
Problem: Directory listing of "src" is too long.
Solution: Rename the resources file to make it shorter.
| -rw-r--r-- | Filelist | 2 | ||||
| -rw-r--r-- | src/Makefile | 8 | ||||
| -rw-r--r-- | src/gui_gtk_res.xml (renamed from src/gui_gtk_gresources.xml) | 0 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 7 insertions, 5 deletions
@@ -191,7 +191,7 @@ SRC_UNIX = \ src/gui_gtk_f.c \ src/gui_gtk_f.h \ src/gui_gtk_x11.c \ - src/gui_gtk_gresources.xml \ + src/gui_gtk_res.xml \ src/gui_motif.c \ src/gui_xmdlg.c \ src/gui_xmebw.c \ diff --git a/src/Makefile b/src/Makefile index f0bfbb578..500287f84 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2474,7 +2474,7 @@ SHADOWDIR = shadow shadow: runtime pixmaps mkdir $(SHADOWDIR) - cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_gresources.xml ../toolcheck ../proto ../vimtutor ../gvimtutor ../mkinstalldirs . + cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_res.xml ../toolcheck ../proto ../vimtutor ../gvimtutor ../mkinstalldirs . mkdir $(SHADOWDIR)/auto cd $(SHADOWDIR)/auto; ln -s ../../auto/configure . mkdir $(SHADOWDIR)/po @@ -2595,9 +2595,9 @@ auto/pathdef.c: Makefile auto/config.mk -@echo '";' >> $@ -@sh $(srcdir)/pathdef.sh -auto/gui_gtk_gresources.c: gui_gtk_gresources.xml +auto/gui_gtk_gresources.c: gui_gtk_res.xml $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register $< -auto/gui_gtk_gresources.h: gui_gtk_gresources.xml +auto/gui_gtk_gresources.h: gui_gtk_res.xml $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register $< # All the object files are put in the "objects" directory. Since not all make @@ -3170,7 +3170,7 @@ objects/gui_gtk_f.o: gui_gtk_f.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ globals.h farsi.h arabic.h gui_gtk_f.h -objects/gui_gtk_gresources.o: auto/gui_gtk_gresources.c gui_gtk_gresources.xml \ +objects/gui_gtk_gresources.o: auto/gui_gtk_gresources.c gui_gtk_res.xml \ ../pixmaps/stock_vim_build_tags.png ../pixmaps/stock_vim_find_help.png \ ../pixmaps/stock_vim_save_all.png ../pixmaps/stock_vim_session_load.png \ ../pixmaps/stock_vim_session_new.png ../pixmaps/stock_vim_session_save.png \ diff --git a/src/gui_gtk_gresources.xml b/src/gui_gtk_res.xml index d6c7a592b..d6c7a592b 100644 --- a/src/gui_gtk_gresources.xml +++ b/src/gui_gtk_res.xml diff --git a/src/version.c b/src/version.c index 98066f8ff..70c54aa47 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1019, +/**/ 1018, /**/ 1017, |