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

patch 7.4.2059

Browse Source 
Problem:    Non-Unix builds fail.
Solution:   Update Makefiles for new files.
This commit is contained in:
Bram Moolenaar
2016-07-17 18:41:47 +02:00
parent a9b579f3d7
commit 6583c44857
9 changed files with 86 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Make_bc5.mak
View File

@@ -543,6 +543,7 @@ vimobj = \
$(OBJDIR)\charset.obj \
$(OBJDIR)\crypt.obj \
$(OBJDIR)\crypt_zip.obj \
$(OBJDIR)\dict.obj \
$(OBJDIR)\diff.obj \
$(OBJDIR)\digraph.obj \
$(OBJDIR)\edit.obj \
@@ -559,6 +560,7 @@ vimobj = \
$(OBJDIR)\hardcopy.obj \
$(OBJDIR)\hashtab.obj \
$(OBJDIR)\json.obj \
$(OBJDIR)\list.obj \
$(OBJDIR)\main.obj \
$(OBJDIR)\mark.obj \
$(OBJDIR)\memfile.obj \
@@ -584,6 +586,7 @@ vimobj = \
$(OBJDIR)\term.obj \
$(OBJDIR)\ui.obj \
$(OBJDIR)\undo.obj \
$(OBJDIR)\userfunc.obj \
$(OBJDIR)\version.obj \
$(OBJDIR)\window.obj \
$(OBJDIR)\pathdef.obj

3
src/Make_cyg_ming.mak
View File

@@ -610,6 +610,7 @@ OBJ = \
$(OUTDIR)/charset.o \
$(OUTDIR)/crypt.o \
$(OUTDIR)/crypt_zip.o \
$(OUTDIR)/dict.o \
$(OUTDIR)/diff.o \
$(OUTDIR)/digraph.o \
$(OUTDIR)/edit.o \
@@ -626,6 +627,7 @@ OBJ = \
$(OUTDIR)/hardcopy.o \
$(OUTDIR)/hashtab.o \
$(OUTDIR)/json.o \
$(OUTDIR)/list.o \
$(OUTDIR)/main.o \
$(OUTDIR)/mark.o \
$(OUTDIR)/memfile.o \
@@ -655,6 +657,7 @@ OBJ = \
$(OUTDIR)/term.o \
$(OUTDIR)/ui.o \
$(OUTDIR)/undo.o \
$(OUTDIR)/userfunc.o \
$(OUTDIR)/version.o \
$(OUTDIR)/vimrc.o \
$(OUTDIR)/window.o

12
src/Make_dice.mak
View File

@@ -32,6 +32,7 @@ SRC = \
charset.c \
crypt.c \
crypt_zip.c \
dict.c \
diff.c \
digraph.c \
edit.c \
@@ -48,6 +49,7 @@ SRC = \
hardcopy.c \
hashtab.c \
json.c \
list.c \
main.c \
mark.c \
memfile.c \
@@ -74,6 +76,7 @@ SRC = \
term.c \
ui.c \
undo.c \
userfunc.c \
window.c \
version.c
@@ -83,6 +86,7 @@ OBJ = o/arabic.o \
o/charset.o \
o/crypt.o \
o/crypt_zip.o \
o/dict.o \
o/diff.o \
o/digraph.o \
o/edit.o \
@@ -99,6 +103,7 @@ OBJ = o/arabic.o \
o/hardcopy.o \
o/hashtab.o \
o/json.o \
o/list.o \
o/main.o \
o/mark.o \
o/memfile.o \
@@ -125,6 +130,7 @@ OBJ = o/arabic.o \
o/term.o \
o/ui.o \
o/undo.o \
o/userfunc.o \
o/window.o \
$(TERMLIB)
@@ -159,6 +165,8 @@ o/crypt.o: crypt.c $(SYMS)
o/crypt_zip.o: crypt_zip.c $(SYMS)
o/dict.o: dict.c $(SYMS)
o/diff.o: diff.c $(SYMS)
o/digraph.o: digraph.c $(SYMS)
@@ -191,6 +199,8 @@ o/hashtab.o: hashtab.c $(SYMS)
o/json.o: json.c $(SYMS)
o/list.o: list.c $(SYMS)
o/main.o: main.c $(SYMS)
o/mark.o: mark.c $(SYMS)
@@ -250,4 +260,6 @@ o/ui.o: ui.c $(SYMS)
o/undo.o: undo.c $(SYMS)
o/userfunc.o: userfunc.c $(SYMS)
o/window.o: window.c $(SYMS)

15
src/Make_ivc.mak
View File

@@ -216,6 +216,7 @@ LINK32_OBJS= \
"$(INTDIR)/charset.obj" \
"$(INTDIR)/crypt.obj" \
"$(INTDIR)/crypt_zip.obj" \
"$(INTDIR)/dict.obj" \
"$(INTDIR)/diff.obj" \
"$(INTDIR)/digraph.obj" \
"$(INTDIR)/edit.obj" \
@@ -232,6 +233,7 @@ LINK32_OBJS= \
"$(INTDIR)/hardcopy.obj" \
"$(INTDIR)/hashtab.obj" \
"$(INTDIR)/json.obj" \
"$(INTDIR)/list.obj" \
"$(INTDIR)/main.obj" \
"$(INTDIR)/mark.obj" \
"$(INTDIR)/mbyte.obj" \
@@ -260,6 +262,7 @@ LINK32_OBJS= \
"$(INTDIR)/term.obj" \
"$(INTDIR)/ui.obj" \
"$(INTDIR)/undo.obj" \
"$(INTDIR)/userfunc.obj" \
"$(INTDIR)/version.obj" \
"$(INTDIR)/window.obj"
@@ -356,6 +359,10 @@ SOURCE=.\crypt_zip.c
# End Source File
# Begin Source File
SOURCE=.\dict.c
# End Source File
# Begin Source File
SOURCE=.\diff.c
# End Source File
# Begin Source File
@@ -570,6 +577,10 @@ SOURCE=.\json.c
# End Source File
# Begin Source File
SOURCE=.\list.c
# End Source File
# Begin Source File
SOURCE=.\main.c
# End Source File
# Begin Source File
@@ -682,6 +693,10 @@ SOURCE=.\undo.c
# End Source File
# Begin Source File
SOURCE=.\userfunc.c
# End Source File
# Begin Source File
SOURCE=.\version.c
# End Source File
# Begin Source File

18
src/Make_manx.mak
View File

@@ -42,6 +42,7 @@ SRC = arabic.c \
charset.c \
crypt.c \
crypt_zip.c \
dict.c \
diff.c \
digraph.c \
edit.c \
@@ -58,6 +59,7 @@ SRC = arabic.c \
hardcopy.c \
hashtab.c \
json.c \
list.c \
main.c \
mark.c \
memfile.c \
@@ -84,6 +86,7 @@ SRC = arabic.c \
term.c \
ui.c \
undo.c \
userfunc.c \
window.c \
version.c
@@ -95,6 +98,7 @@ OBJ = obj/arabic.o \
obj/charset.o \
obj/crypt.o \
obj/crypt_zip.o \
obj/dict.o \
obj/diff.o \
obj/digraph.o \
obj/edit.o \
@@ -111,6 +115,7 @@ OBJ = obj/arabic.o \
obj/hardcopy.o \
obj/hashtab.o \
obj/json.o \
obj/list.o \
obj/main.o \
obj/mark.o \
obj/memfile.o \
@@ -137,6 +142,7 @@ OBJ = obj/arabic.o \
obj/term.o \
obj/ui.o \
obj/undo.o \
obj/userfunc.o \
obj/window.o \
$(TERMLIB)
@@ -146,6 +152,7 @@ PRO = proto/arabic.pro \
proto/charset.pro \
proto/crypt.pro \
proto/crypt_zip.pro \
proto/dict.pro \
proto/diff.pro \
proto/digraph.pro \
proto/edit.pro \
@@ -162,6 +169,7 @@ PRO = proto/arabic.pro \
proto/hardcopy.pro \
proto/hashtab.pro \
proto/json.pro \
proto/list.pro \
proto/main.pro \
proto/mark.pro \
proto/memfile.pro \
@@ -189,6 +197,7 @@ PRO = proto/arabic.pro \
proto/termlib.pro \
proto/ui.pro \
proto/undo.pro \
proto/userfunc.pro \
proto/window.pro
all: Vim xxd/Xxd
@@ -253,6 +262,9 @@ obj/crypt.o: crypt.c
obj/crypt_zip.o: crypt_zip.c
$(CCSYM) $@ crypt_zip.c
obj/dict.o: dict.c
$(CCSYM) $@ dict.c
obj/diff.o: diff.c
$(CCSYM) $@ diff.c
@@ -302,6 +314,9 @@ obj/hashtab.o: hashtab.c
obj/json.o: json.c
$(CCSYM) $@ json.c
obj/list.o: list.c
$(CCSYM) $@ list.c
# Don't use $(SYMS) here, because main.c defines EXTERN
obj/main.o: main.c option.h globals.h
$(CCNOSYM) $@ main.c
@@ -386,5 +401,8 @@ obj/ui.o: ui.c
obj/undo.o: undo.c
$(CCSYM) $@ undo.c
obj/userfunc.o: userfunc.c
$(CCSYM) $@ userfunc.c
obj/window.o: window.c
$(CCSYM) $@ window.c

3
src/Make_morph.mak
View File

@@ -30,6 +30,7 @@ SRC = arabic.c \
charset.c \
crypt.c \
crypt_zip.c \
dict.c \
diff.c \
digraph.c \
edit.c \
@@ -46,6 +47,7 @@ SRC = arabic.c \
hardcopy.c \
hashtab.c \
json.c \
list.c \
main.c \
mark.c \
mbyte.c \
@@ -72,6 +74,7 @@ SRC = arabic.c \
term.c \
ui.c \
undo.c \
userfunc.c \
version.c \
window.c \

12
src/Make_mvc.mak
View File

@@ -554,6 +554,7 @@ OBJ = \
$(OUTDIR)\charset.obj \
$(OUTDIR)\crypt.obj \
$(OUTDIR)\crypt_zip.obj \
$(OUTDIR)\dict.obj \
$(OUTDIR)\diff.obj \
$(OUTDIR)\digraph.obj \
$(OUTDIR)\edit.obj \
@@ -570,6 +571,7 @@ OBJ = \
$(OUTDIR)\hardcopy.obj \
$(OUTDIR)\hashtab.obj \
$(OUTDIR)\json.obj \
$(OUTDIR)\list.obj \
$(OUTDIR)\main.obj \
$(OUTDIR)\mark.obj \
$(OUTDIR)\mbyte.obj \
@@ -599,6 +601,7 @@ OBJ = \
$(OUTDIR)\term.obj \
$(OUTDIR)\ui.obj \
$(OUTDIR)\undo.obj \
$(OUTDIR)\userfunc.obj \
$(OUTDIR)\window.obj \
$(OUTDIR)\vim.res
@@ -1162,6 +1165,8 @@ $(OUTDIR)/crypt.obj: $(OUTDIR) crypt.c $(INCL)
$(OUTDIR)/crypt_zip.obj: $(OUTDIR) crypt_zip.c $(INCL)
$(OUTDIR)/dict.obj: $(OUTDIR) dictf.c $(INCL)
$(OUTDIR)/diff.obj: $(OUTDIR) diff.c $(INCL)
$(OUTDIR)/digraph.obj: $(OUTDIR) digraph.c $(INCL)
@@ -1241,6 +1246,8 @@ $(OUTDIR)/iscygpty.obj: $(OUTDIR) iscygpty.c $(CUI_INCL)
$(OUTDIR)/json.obj: $(OUTDIR) json.c $(INCL)
$(OUTDIR)/list.obj: $(OUTDIR) list.c $(INCL)
$(OUTDIR)/main.obj: $(OUTDIR) main.c $(INCL) $(CUI_INCL)
$(OUTDIR)/mark.obj: $(OUTDIR) mark.c $(INCL)
@@ -1306,6 +1313,8 @@ $(OUTDIR)/ui.obj: $(OUTDIR) ui.c $(INCL)
$(OUTDIR)/undo.obj: $(OUTDIR) undo.c $(INCL)
$(OUTDIR)/userfunc.obj: $(OUTDIR) userfunc.c $(INCL)
$(OUTDIR)/window.obj: $(OUTDIR) window.c $(INCL)
$(OUTDIR)/xpm_w32.obj: $(OUTDIR) xpm_w32.c
@@ -1358,6 +1367,7 @@ proto.h: \
proto/charset.pro \
proto/crypt.pro \
proto/crypt_zip.pro \
proto/dict.pro \
proto/diff.pro \
proto/digraph.pro \
proto/edit.pro \
@@ -1373,6 +1383,7 @@ proto.h: \
proto/hardcopy.pro \
proto/hashtab.pro \
proto/json.pro \
proto/list.pro \
proto/main.pro \
proto/mark.pro \
proto/memfile.pro \
@@ -1401,6 +1412,7 @@ proto.h: \
proto/term.pro \
proto/ui.pro \
proto/undo.pro \
proto/userfunc.pro \
proto/window.pro \
$(NETBEANS_PRO) \
$(CHANNEL_PRO)

15
src/Make_sas.mak
View File

@@ -95,6 +95,7 @@ SRC = \
charset.c \
crypt.c \
crypt_zip.c \
dict.c \
diff.c \
digraph.c \
edit.c \
@@ -111,6 +112,7 @@ SRC = \
hardcopy.c \
hashtab.c \
json.c \
list.c \
main.c \
mark.c \
memfile.c \
@@ -137,6 +139,7 @@ SRC = \
term.c \
ui.c \
undo.c \
userfunc.c \
window.c \
version.c
@@ -147,6 +150,7 @@ OBJ = \
charset.o \
crypt.o \
crypt_zip.o \
dict.o \
diff.o \
digraph.o \
edit.o \
@@ -163,6 +167,7 @@ OBJ = \
hardcopy.o \
hashtab.o \
json.o \
list.o \
main.o \
mark.o \
memfile.o \
@@ -189,6 +194,7 @@ OBJ = \
term.o \
ui.o \
undo.o \
userfunc.o \
window.o \
$(TERMLIB)
@@ -199,6 +205,7 @@ PRO = \
proto/charset.pro \
proto/crypt.pro \
proto/crypt_zip.pro \
proto/dict.pro \
proto/diff.pro \
proto/digraph.pro \
proto/edit.pro \
@@ -215,6 +222,7 @@ PRO = \
proto/hardcopy.pro \
proto/hashtab.pro \
proto/json.pro \
proto/list.pro \
proto/main.pro \
proto/mark.pro \
proto/memfile.pro \
@@ -242,6 +250,7 @@ PRO = \
proto/termlib.pro \
proto/ui.pro \
proto/undo.pro \
proto/userfunc.pro \
proto/window.pro
all: proto Vim
@@ -311,6 +320,8 @@ crypt.o: crypt.c
proto/crypt.pro: crypt.c
crypt_zip.o: crypt_zip.c
proto/crypt_zip.pro: crypt_zip.c
dict.o: dict.c
proto/dict.pro: dict.c
diff.o: diff.c
proto/diff.pro: diff.c
digraph.o: digraph.c
@@ -343,6 +354,8 @@ hashtab.o: hashtab.c
proto/hashtab.pro: hashtab.c
json.o: json.c
proto/json.pro: json.c
list.o: list.c
proto/list.pro: list.c
main.o: main.c
proto/main.pro: main.c
mark.o: mark.c
@@ -397,4 +410,6 @@ ui.o: ui.c
proto/ui.pro: ui.c
undo.o: undo.c
proto/undo.pro: undo.c
userfunc.o: userfunc.c
proto/userfunc.pro: userfunc.c
window.o: window.c

2
src/version.c
View File

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