thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.0003: Build file dependencies are incomplete

Browse Source 
Problem:    Build file dependencies are incomplete.
Solution:   Fix the dependencies. (Ken Takata, closes #5356)
This commit is contained in:
Bram Moolenaar
2019-12-14 13:17:11 +01:00
parent 3b68123cd2
commit f5f4b6cb5f
5 changed files with 52 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Make_cyg_ming.mak
View File

@@ -1022,10 +1022,10 @@ all: $(MAIN_TARGET) vimrun.exe xxd/xxd.exe tee/tee.exe install.exe uninstall.exe
vimrun.exe: vimrun.c vimrun.exe: vimrun.c
$(CC) $(CFLAGS) -o vimrun.exe vimrun.c $(LIB) $(CC) $(CFLAGS) -o vimrun.exe vimrun.c $(LIB)
install.exe: dosinst.c install.exe: dosinst.c dosinst.h version.h
$(CC) $(CFLAGS) -o install.exe dosinst.c $(LIB) -lole32 -luuid $(CC) $(CFLAGS) -o install.exe dosinst.c $(LIB) -lole32 -luuid
uninstall.exe: uninstall.c uninstall.exe: uninstall.c dosinst.h version.h
$(CC) $(CFLAGS) -o uninstall.exe uninstall.c $(LIB) -lole32 $(CC) $(CFLAGS) -o uninstall.exe uninstall.c $(LIB) -lole32
ifeq ($(VIMDLL),yes) ifeq ($(VIMDLL),yes)
@@ -1136,8 +1136,28 @@ endif
$(OUTDIR): $(OUTDIR):
$(MKDIR) $(OUTDIR) $(MKDIR) $(OUTDIR)
$(OUTDIR)/buffer.o: buffer.c $(INCL) version.h
$(OUTDIR)/evalfunc.o: evalfunc.c $(INCL) version.h
$(OUTDIR)/evalvars.o: evalvars.c $(INCL) version.h
$(OUTDIR)/ex_cmds.o: ex_cmds.c $(INCL) version.h
$(OUTDIR)/ex_cmds2.o: ex_cmds2.c $(INCL) version.h
$(OUTDIR)/ex_docmd.o: ex_docmd.c $(INCL) ex_cmdidxs.h $(OUTDIR)/ex_docmd.o: ex_docmd.c $(INCL) ex_cmdidxs.h
$(OUTDIR)/hardcopy.o: hardcopy.c $(INCL) version.h
$(OUTDIR)/misc1.o: misc1.c $(INCL) version.h
$(OUTDIR)/netbeans.o: netbeans.c $(INCL) version.h
$(OUTDIR)/version.o: version.c $(INCL) version.h
$(OUTDIR)/viminfo.o: viminfo.c $(INCL) version.h
$(OUTDIR)/gui_dwrite.o: gui_dwrite.cpp gui_dwrite.h $(OUTDIR)/gui_dwrite.o: gui_dwrite.cpp gui_dwrite.h
$(CC) -c $(CFLAGS) $(CXXFLAGS) gui_dwrite.cpp -o $@ $(CC) -c $(CFLAGS) $(CXXFLAGS) gui_dwrite.cpp -o $@
@@ -1150,7 +1170,7 @@ $(OUTDIR)/beval.o: beval.c $(INCL) $(GUI_INCL)
$(OUTDIR)/gui_beval.o: gui_beval.c $(INCL) $(GUI_INCL) $(OUTDIR)/gui_beval.o: gui_beval.c $(INCL) $(GUI_INCL)
$(CC) -c $(CFLAGS) gui_beval.c -o $@ $(CC) -c $(CFLAGS) gui_beval.c -o $@
$(OUTDIR)/gui_w32.o: gui_w32.c $(INCL) $(GUI_INCL) $(OUTDIR)/gui_w32.o: gui_w32.c $(INCL) $(GUI_INCL) version.h
$(CC) -c $(CFLAGS) gui_w32.c -o $@ $(CC) -c $(CFLAGS) gui_w32.c -o $@
$(OUTDIR)/if_cscope.o: if_cscope.c $(INCL) if_cscope.h $(OUTDIR)/if_cscope.o: if_cscope.c $(INCL) if_cscope.h
@@ -1174,7 +1194,7 @@ $(OUTDIR)/if_perl.o: auto/if_perl.c $(INCL)
$(CC) -c $(CFLAGS) auto/if_perl.c -o $@ $(CC) -c $(CFLAGS) auto/if_perl.c -o $@
$(OUTDIR)/if_ruby.o: if_ruby.c $(INCL) $(OUTDIR)/if_ruby.o: if_ruby.c $(INCL) version.h
ifeq (16, $(RUBY)) ifeq (16, $(RUBY))
$(CC) $(CFLAGS) -U_WIN32 -c -o $@ if_ruby.c $(CC) $(CFLAGS) -U_WIN32 -c -o $@ if_ruby.c
endif endif

28
src/Make_mvc.mak
View File

@@ -1339,14 +1339,14 @@ $(VIM): $(VIM).exe
$(OUTDIR): $(OUTDIR):
if not exist $(OUTDIR)/nul mkdir $(OUTDIR) if not exist $(OUTDIR)/nul mkdir $(OUTDIR)
install.exe: dosinst.c install.exe: dosinst.c dosinst.h version.h
$(CC) /nologo -DNDEBUG -DWIN32 dosinst.c kernel32.lib shell32.lib \ $(CC) /nologo -DNDEBUG -DWIN32 dosinst.c kernel32.lib shell32.lib \
user32.lib ole32.lib advapi32.lib uuid.lib \ user32.lib ole32.lib advapi32.lib uuid.lib \
-link -subsystem:$(SUBSYSTEM_TOOLS) -link -subsystem:$(SUBSYSTEM_TOOLS)
- if exist install.exe del install.exe - if exist install.exe del install.exe
ren dosinst.exe install.exe ren dosinst.exe install.exe
uninstall.exe: uninstall.c uninstall.exe: uninstall.c dosinst.h version.h
$(CC) /nologo -DNDEBUG -DWIN32 uninstall.c shell32.lib advapi32.lib \ $(CC) /nologo -DNDEBUG -DWIN32 uninstall.c shell32.lib advapi32.lib \
-link -subsystem:$(SUBSYSTEM_TOOLS) -link -subsystem:$(SUBSYSTEM_TOOLS)
@@ -1479,7 +1479,7 @@ $(OUTDIR)/blob.obj: $(OUTDIR) blob.c $(INCL)
$(OUTDIR)/blowfish.obj: $(OUTDIR) blowfish.c $(INCL) $(OUTDIR)/blowfish.obj: $(OUTDIR) blowfish.c $(INCL)
$(OUTDIR)/buffer.obj: $(OUTDIR) buffer.c $(INCL) $(OUTDIR)/buffer.obj: $(OUTDIR) buffer.c $(INCL) version.h
$(OUTDIR)/bufwrite.obj: $(OUTDIR) bufwrite.c $(INCL) $(OUTDIR)/bufwrite.obj: $(OUTDIR) bufwrite.c $(INCL)
@@ -1527,15 +1527,15 @@ $(OUTDIR)/eval.obj: $(OUTDIR) eval.c $(INCL)
$(OUTDIR)/evalbuffer.obj: $(OUTDIR) evalbuffer.c $(INCL) $(OUTDIR)/evalbuffer.obj: $(OUTDIR) evalbuffer.c $(INCL)
$(OUTDIR)/evalfunc.obj: $(OUTDIR) evalfunc.c $(INCL) $(OUTDIR)/evalfunc.obj: $(OUTDIR) evalfunc.c $(INCL) version.h
$(OUTDIR)/evalvars.obj: $(OUTDIR) evalvars.c $(INCL) $(OUTDIR)/evalvars.obj: $(OUTDIR) evalvars.c $(INCL) version.h
$(OUTDIR)/evalwindow.obj: $(OUTDIR) evalwindow.c $(INCL) $(OUTDIR)/evalwindow.obj: $(OUTDIR) evalwindow.c $(INCL)
$(OUTDIR)/ex_cmds.obj: $(OUTDIR) ex_cmds.c $(INCL) $(OUTDIR)/ex_cmds.obj: $(OUTDIR) ex_cmds.c $(INCL) version.h
$(OUTDIR)/ex_cmds2.obj: $(OUTDIR) ex_cmds2.c $(INCL) $(OUTDIR)/ex_cmds2.obj: $(OUTDIR) ex_cmds2.c $(INCL) version.h
$(OUTDIR)/ex_docmd.obj: $(OUTDIR) ex_docmd.c $(INCL) ex_cmdidxs.h $(OUTDIR)/ex_docmd.obj: $(OUTDIR) ex_docmd.c $(INCL) ex_cmdidxs.h
@@ -1553,7 +1553,7 @@ $(OUTDIR)/fold.obj: $(OUTDIR) fold.c $(INCL)
$(OUTDIR)/getchar.obj: $(OUTDIR) getchar.c $(INCL) $(OUTDIR)/getchar.obj: $(OUTDIR) getchar.c $(INCL)
$(OUTDIR)/hardcopy.obj: $(OUTDIR) hardcopy.c $(INCL) $(OUTDIR)/hardcopy.obj: $(OUTDIR) hardcopy.c $(INCL) version.h
$(OUTDIR)/hashtab.obj: $(OUTDIR) hashtab.c $(INCL) $(OUTDIR)/hashtab.obj: $(OUTDIR) hashtab.c $(INCL)
@@ -1567,7 +1567,7 @@ $(OUTDIR)/gui.obj: $(OUTDIR) gui.c $(INCL) $(GUI_INCL)
$(OUTDIR)/gui_beval.obj: $(OUTDIR) gui_beval.c $(INCL) $(GUI_INCL) $(OUTDIR)/gui_beval.obj: $(OUTDIR) gui_beval.c $(INCL) $(GUI_INCL)
$(OUTDIR)/gui_w32.obj: $(OUTDIR) gui_w32.c $(INCL) $(GUI_INCL) $(OUTDIR)/gui_w32.obj: $(OUTDIR) gui_w32.c $(INCL) $(GUI_INCL) version.h
$(OUTDIR)/gui_dwrite.obj: $(OUTDIR) gui_dwrite.cpp gui_dwrite.h $(OUTDIR)/gui_dwrite.obj: $(OUTDIR) gui_dwrite.cpp gui_dwrite.h
@@ -1602,7 +1602,7 @@ $(OUTDIR)/if_python3.obj: $(OUTDIR) if_python3.c if_py_both.h $(INCL)
$(OUTDIR)/if_ole.obj: $(OUTDIR) if_ole.cpp $(INCL) if_ole.h $(OUTDIR)/if_ole.obj: $(OUTDIR) if_ole.cpp $(INCL) if_ole.h
$(OUTDIR)/if_ruby.obj: $(OUTDIR) if_ruby.c $(INCL) $(OUTDIR)/if_ruby.obj: $(OUTDIR) if_ruby.c $(INCL) version.h
$(CC) $(CFLAGS_OUTDIR) $(RUBY_INC) if_ruby.c $(CC) $(CFLAGS_OUTDIR) $(RUBY_INC) if_ruby.c
$(OUTDIR)/if_tcl.obj: $(OUTDIR) if_tcl.c $(INCL) $(OUTDIR)/if_tcl.obj: $(OUTDIR) if_tcl.c $(INCL)
@@ -1629,7 +1629,7 @@ $(OUTDIR)/menu.obj: $(OUTDIR) menu.c $(INCL)
$(OUTDIR)/message.obj: $(OUTDIR) message.c $(INCL) $(OUTDIR)/message.obj: $(OUTDIR) message.c $(INCL)
$(OUTDIR)/misc1.obj: $(OUTDIR) misc1.c $(INCL) $(OUTDIR)/misc1.obj: $(OUTDIR) misc1.c $(INCL) version.h
$(OUTDIR)/misc2.obj: $(OUTDIR) misc2.c $(INCL) $(OUTDIR)/misc2.obj: $(OUTDIR) misc2.c $(INCL)
@@ -1639,7 +1639,7 @@ $(OUTDIR)/move.obj: $(OUTDIR) move.c $(INCL)
$(OUTDIR)/mbyte.obj: $(OUTDIR) mbyte.c $(INCL) $(OUTDIR)/mbyte.obj: $(OUTDIR) mbyte.c $(INCL)
$(OUTDIR)/netbeans.obj: $(OUTDIR) netbeans.c $(NBDEBUG_SRC) $(INCL) $(OUTDIR)/netbeans.obj: $(OUTDIR) netbeans.c $(NBDEBUG_SRC) $(INCL) version.h
$(OUTDIR)/channel.obj: $(OUTDIR) channel.c $(INCL) $(OUTDIR)/channel.obj: $(OUTDIR) channel.c $(INCL)
@@ -1720,7 +1720,9 @@ $(OUTDIR)/usercmd.obj: $(OUTDIR) usercmd.c $(INCL)
$(OUTDIR)/userfunc.obj: $(OUTDIR) userfunc.c $(INCL) $(OUTDIR)/userfunc.obj: $(OUTDIR) userfunc.c $(INCL)
$(OUTDIR)/viminfo.obj: $(OUTDIR) viminfo.c $(INCL) $(OUTDIR)/version.obj: $(OUTDIR) version.c $(INCL) version.h
$(OUTDIR)/viminfo.obj: $(OUTDIR) viminfo.c $(INCL) version.h
$(OUTDIR)/window.obj: $(OUTDIR) window.c $(INCL) $(OUTDIR)/window.obj: $(OUTDIR) window.c $(INCL)

27
src/Make_vms.mms
View File

@@ -679,11 +679,11 @@ buffer.obj : buffer.c vim.h [.auto]config.h feature.h os_unix.h \
bufwrite.obj : bufwrite.c vim.h [.auto]config.h feature.h os_unix.h \ bufwrite.obj : bufwrite.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h structs.h regexp.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \
gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
globals.h version.h globals.h
change.obj : change.c vim.h [.auto]config.h feature.h os_unix.h \ change.obj : change.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h structs.h regexp.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \
gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
globals.h version.h globals.h
charset.obj : charset.c vim.h [.auto]config.h feature.h os_unix.h \ charset.obj : charset.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h structs.h regexp.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \
gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
@@ -736,12 +736,11 @@ edit.obj : edit.c vim.h [.auto]config.h feature.h os_unix.h \
[.proto]gui_beval.pro option.h ex_cmds.h proto.h globals.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h globals.h
eval.obj : eval.c vim.h [.auto]config.h feature.h os_unix.h \ eval.obj : eval.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h beval.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h beval.h \
[.proto]gui_beval.pro option.h ex_cmds.h proto.h globals.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h globals.h
version.h
evalbuffer.obj : evalbuffer.c vim.h [.auto]config.h feature.h os_unix.h \ evalbuffer.obj : evalbuffer.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h option.h structs.h \ ascii.h keymap.h term.h macros.h option.h structs.h \
regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \ regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \
proto.h globals.h version.h proto.h globals.h
evalfunc.obj : evalfunc.c vim.h [.auto]config.h feature.h os_unix.h \ evalfunc.obj : evalfunc.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h option.h structs.h \ ascii.h keymap.h term.h macros.h option.h structs.h \
regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \ regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \
@@ -753,7 +752,7 @@ evalvars.obj : evalvars.c vim.h [.auto]config.h feature.h os_unix.h \
evalwindow.obj : evalwindow.c vim.h [.auto]config.h feature.h os_unix.h \ evalwindow.obj : evalwindow.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h option.h structs.h \ ascii.h keymap.h term.h macros.h option.h structs.h \
regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \ regexp.h gui.h beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \
proto.h globals.h version.h proto.h globals.h
ex_cmds.obj : ex_cmds.c vim.h [.auto]config.h feature.h os_unix.h \ ex_cmds.obj : ex_cmds.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h structs.h regexp.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \
gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
@@ -796,7 +795,7 @@ getchar.obj : getchar.c vim.h [.auto]config.h feature.h os_unix.h \
hardcopy.obj : hardcopy.c vim.h [.auto]config.h feature.h os_unix.h \ hardcopy.obj : hardcopy.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h structs.h regexp.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \
gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
globals.h globals.h version.h
hashtab.obj : hashtab.c vim.h [.auto]config.h feature.h os_unix.h \ hashtab.obj : hashtab.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h structs.h regexp.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \
gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
@@ -821,8 +820,7 @@ indent.obj : indent.c vim.h [.auto]config.h feature.h os_unix.h
insexpand.obj : insexpand.c vim.h [.auto]config.h feature.h os_unix.h insexpand.obj : insexpand.c vim.h [.auto]config.h feature.h os_unix.h
json.obj : json.c vim.h [.auto]config.h feature.h os_unix.h \ json.obj : json.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h beval.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h beval.h \
[.proto]gui_beval.pro option.h ex_cmds.h proto.h globals.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h globals.h
version.h
list.obj : list.c vim.h [.auto]config.h feature.h os_unix.h \ list.obj : list.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \ beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \
@@ -1024,7 +1022,7 @@ gui_gtk_x11.obj : gui_gtk_x11.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h structs.h regexp.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \
gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
globals.h gui_gtk_f.h [-.runtime]vim32x32.xpm \ globals.h gui_gtk_f.h [-.runtime]vim32x32.xpm \
[-.runtime]vim16x16.xpm [-.runtime]vim48x48.xpm [-.runtime]vim16x16.xpm [-.runtime]vim48x48.xpm version.h
gui_x11.obj : gui_x11.c vim.h [.auto]config.h feature.h os_unix.h \ gui_x11.obj : gui_x11.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h structs.h regexp.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \
gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
@@ -1084,15 +1082,6 @@ gui_beval.obj : gui_beval.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h structs.h regexp.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \
gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
globals.h globals.h
workshop.obj : workshop.c [.auto]config.h integration.h vim.h feature.h \
os_unix.h ascii.h keymap.h term.h macros.h structs.h \
regexp.h gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h \
proto.h globals.h version.h workshop.h
wsdebug.obj : wsdebug.c
integration.obj : integration.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h structs.h regexp.h \
gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
globals.h integration.h
netbeans.obj : netbeans.c vim.h [.auto]config.h feature.h os_unix.h \ netbeans.obj : netbeans.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h structs.h regexp.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \
gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \

3
src/Makefile
View File

@@ -3590,6 +3590,9 @@ $(APPDIR)/Contents:
$(MKDIR_P) $(RESDIR)/English.lproj $(MKDIR_P) $(RESDIR)/English.lproj
# Dependencies that "make depend" doesn't find
objects/gui_gtk_x11.o: version.h
############################################################################### ###############################################################################
### (automatically generated by 'make depend') ### (automatically generated by 'make depend')
### Dependencies: ### Dependencies:

2
src/version.c
View File

@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3,
/**/ /**/
2, 2,
/**/ /**/