patch 9.2.0911: makefiles do not build hardcopy_postscript.c

Problem:  A recent commit moved the original content of hardcopy.c
          into hardcopy_postscript.c, but the makefiles were not
          updated to compile and link the new source file, causing
          build failures on Windows and other systems (after 9.2.0898).
Solution: Add hardcopy_postscript.c to the makefiles,  hardcopy_pango.c
          is only built with GTK/cairo/pango (using autoconf), so
          the Win32/Amiga/VMS makefiles do not need it (Wei Tang).

related: #20648
closes:  #20944

Signed-off-by: Wei Tang <gauchyler@uestc.edu.cn>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/Make_ami.mak b/src/Make_ami.mak
index 8f02dbbec12c5c4472a439d8dd44bef4f262df79..7bd0bcf25da8ab0236d31bfa002588aea5f7301a 100644 (file)
--- a/src/Make_ami.mak
+++ b/src/Make_ami.mak
@@ -128,6 +128,7 @@ SRC += \
        getchar.c \
        gc.c \
        hardcopy.c \
+       hardcopy_postscript.c \
        hashtab.c \
        help.c \
        highlight.c \

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 0fcfb94c2845b2baca19714bee278dbb21b9856b..4a533b2b7ca3c224e85f80308ffea277b17efb6f 100644 (file)
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -834,6 +834,7 @@ OBJ = \
        $(OUTDIR)/gc.o \
        $(OUTDIR)/gui_xim.o \
        $(OUTDIR)/hardcopy.o \
+       $(OUTDIR)/hardcopy_postscript.o \
        $(OUTDIR)/hashtab.o \
        $(OUTDIR)/help.o \
        $(OUTDIR)/highlight.o \
@@ -1324,6 +1325,8 @@ $(OUTDIR)/ex_docmd.o: ex_docmd.c $(INCL) ex_cmdidxs.h
 
 $(OUTDIR)/hardcopy.o: hardcopy.c $(INCL) version.h
 
+$(OUTDIR)/hardcopy_postscript.o: hardcopy_postscript.c $(INCL) version.h
+
 $(OUTDIR)/misc1.o: misc1.c $(INCL) version.h
 
 $(OUTDIR)/normal.o: normal.c $(INCL) nv_cmdidxs.h nv_cmds.h

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 8d3bb1861f7223c18a4a468943433c485feae3ab..92b6f4066a5529639c23c129b03b59994757728a 100644 (file)
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -729,6 +729,7 @@ OBJ = \
        $(OUTDIR)\gc.obj \
        $(OUTDIR)\gui_xim.obj \
        $(OUTDIR)\hardcopy.obj \
+       $(OUTDIR)\hardcopy_postscript.obj \
        $(OUTDIR)\hashtab.obj \
        $(OUTDIR)\help.obj \
        $(OUTDIR)\highlight.obj \
@@ -1622,6 +1623,8 @@ $(OUTDIR)/gui_xim.obj: $(OUTDIR) gui_xim.c $(INCL)
 
 $(OUTDIR)/hardcopy.obj: $(OUTDIR) hardcopy.c $(INCL) version.h
 
+$(OUTDIR)/hardcopy_postscript.obj: $(OUTDIR) hardcopy_postscript.c $(INCL) version.h
+
 $(OUTDIR)/hashtab.obj: $(OUTDIR) hashtab.c $(INCL)
 
 $(OUTDIR)/help.obj: $(OUTDIR) help.c $(INCL)

diff --git a/src/Make_vms.mms b/src/Make_vms.mms
index 446e36a289c43480ac8377663d4c47d2dd8d51e4..53ee680dbc7deb38c86ebbe481c0d0f6017e3ddb 100644 (file)
--- a/src/Make_vms.mms
+++ b/src/Make_vms.mms
@@ -536,6 +536,7 @@ SRC = \
  gc.c \
  gui_xim.c \
  hardcopy.c \
+ hardcopy_postscript.c \
  hashtab.c \
  help.c \
  highlight.c \
@@ -676,6 +677,7 @@ OBJ = \
  [.$(DEST)]gc.obj \
  [.$(DEST)]gui_xim.obj \
  [.$(DEST)]hardcopy.obj \
+ [.$(DEST)]hardcopy_postscript.obj \
  [.$(DEST)]hashtab.obj \
  [.$(DEST)]help.obj \
  [.$(DEST)]highlight.obj \
@@ -1170,6 +1172,10 @@ lua_env :
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
  gui.h beval.h option.h ex_cmds.h proto.h \
  errors.h globals.h version.h
+[.$(DEST)]hardcopy_postscript.obj : hardcopy_postscript.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
+ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
+ gui.h beval.h option.h ex_cmds.h proto.h \
+ errors.h globals.h version.h
 [.$(DEST)]hashtab.obj : hashtab.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
  gui.h beval.h option.h ex_cmds.h proto.h \

diff --git a/src/version.c b/src/version.c
index e4cc44927c83b8baec7d2932774e744e21f0887d..e65bb14ea2e8ec2effbbfcfbe1f4f8c9bfa0e29c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    911,
 /**/
     910,
 /**/