Skip to content

Commit

Permalink
Add cmdidxs targets to Windows makefiles
Browse files Browse the repository at this point in the history
`Makefile` has the `cmdidxs` target, but Windows makefiles don't have it.
Add the `cmdidxs` target.
Also add `ex_cmdidxs.h` as a dependency of ex_docmd.obj. (Also for VMS.)
  • Loading branch information
k-takata committed Dec 9, 2019
1 parent 0ff822d commit 5a3e6bc
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 2 deletions.
9 changes: 9 additions & 0 deletions src/Make_cyg_ming.mak
Original file line number Diff line number Diff line change
Expand Up @@ -1082,6 +1082,13 @@ endif
$(MAKE) -C xxd -f Make_ming.mak clean
$(MAKE) -C tee clean

# Run vim script to generate the Ex command lookup table.
# This only needs to be run when a command name has been added or changed.
# If this fails because you don't have Vim yet, first build and install Vim
# without changes.
cmdidxs: ex_cmds.h
vim --clean -X -u create_cmdidxs.vim

###########################################################################
INCL = vim.h alloc.h ascii.h ex_cmds.h feature.h globals.h \
keymap.h macros.h option.h os_dos.h os_win32.h proto.h regexp.h \
Expand Down Expand Up @@ -1128,6 +1135,8 @@ endif
$(OUTDIR):
$(MKDIR) $(OUTDIR)

$(OUTDIR)/ex_docmd.o: ex_docmd.c $(INCL) ex_cmdidxs.h

$(OUTDIR)/gui_dwrite.o: gui_dwrite.cpp gui_dwrite.h
$(CC) -c $(CFLAGS) $(CXXFLAGS) gui_dwrite.cpp -o $@

Expand Down
9 changes: 8 additions & 1 deletion src/Make_mvc.mak
Original file line number Diff line number Diff line change
Expand Up @@ -1411,6 +1411,13 @@ clean: testclean
$(MAKE) /NOLOGO -f Makefile clean
cd ..

# Run vim script to generate the Ex command lookup table.
# This only needs to be run when a command name has been added or changed.
# If this fails because you don't have Vim yet, first build and install Vim
# without changes.
cmdidxs: ex_cmds.h
vim --clean -X -u create_cmdidxs.vim

test:
cd testdir
$(MAKE) /NOLOGO -f Make_dos.mak win32
Expand Down Expand Up @@ -1530,7 +1537,7 @@ $(OUTDIR)/ex_cmds.obj: $(OUTDIR) ex_cmds.c $(INCL)

$(OUTDIR)/ex_cmds2.obj: $(OUTDIR) ex_cmds2.c $(INCL)

$(OUTDIR)/ex_docmd.obj: $(OUTDIR) ex_docmd.c $(INCL)
$(OUTDIR)/ex_docmd.obj: $(OUTDIR) ex_docmd.c $(INCL) ex_cmdidxs.h

$(OUTDIR)/ex_eval.obj: $(OUTDIR) ex_eval.c $(INCL)

Expand Down
2 changes: 1 addition & 1 deletion src/Make_vms.mms
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ ex_cmds2.obj : ex_cmds2.c vim.h [.auto]config.h feature.h os_unix.h \
ex_docmd.obj : ex_docmd.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
globals.h ex_cmdidxs.h
ex_eval.obj : ex_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 [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
Expand Down

0 comments on commit 5a3e6bc

Please sign in to comment.