# HG changeset patch # User Bram Moolenaar # Date 1274207660 -7200 # Node ID 40edf1be1cd840a083c44b42510301d8e19c646b # Parent 74c8bba1d9e871ccf1504beb3d2e66896bb1f56e Add blowfish and sha256 source files to more Makefiles. diff --git a/src/Make_bc3.mak b/src/Make_bc3.mak --- a/src/Make_bc3.mak +++ b/src/Make_bc3.mak @@ -51,6 +51,7 @@ SPAWNL = spawnl.lib EXE_dependencies = \ + blowfish.obj \ buffer.obj \ charset.obj \ diff.obj \ @@ -85,6 +86,7 @@ EXE_dependencies = \ regexp.obj \ screen.obj \ search.obj \ + sha256.obj \ spell.obj \ syntax.obj \ tag.obj \ diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak --- a/src/Make_cyg.mak +++ b/src/Make_cyg.mak @@ -414,6 +414,7 @@ CFLAGS = $(OPTFLAG) $(DEFINES) $(INCLUDE RCFLAGS = -O coff $(DEFINES) OBJ = \ + $(OUTDIR)/blowfish.o \ $(OUTDIR)/buffer.o \ $(OUTDIR)/charset.o \ $(OUTDIR)/diff.o \ @@ -451,6 +452,7 @@ OBJ = \ $(OUTDIR)/regexp.o \ $(OUTDIR)/screen.o \ $(OUTDIR)/search.o \ + $(OUTDIR)/sha256.o \ $(OUTDIR)/spell.o \ $(OUTDIR)/syntax.o \ $(OUTDIR)/tag.o \ diff --git a/src/Make_dice.mak b/src/Make_dice.mak --- a/src/Make_dice.mak +++ b/src/Make_dice.mak @@ -26,6 +26,7 @@ LD = dcc ${CC} ${PRE} ${CFLAGS} $< -o $@ SRC = \ + blowfish.c \ buffer.c \ charset.c \ diff.c \ @@ -61,6 +62,7 @@ SRC = \ regexp.c \ screen.c \ search.c \ + sha256.c \ spell.c \ syntax.c \ tag.c \ @@ -70,7 +72,8 @@ SRC = \ window.c \ version.c -OBJ = o/buffer.o \ +OBJ = o/blowfish.o \ + o/buffer.o \ o/charset.o \ o/diff.o \ o/digraph.o \ @@ -105,6 +108,7 @@ OBJ = o/buffer.o \ o/regexp.o \ o/screen.o \ o/search.o \ + o/sha256.o \ o/spell.o \ o/syntax.o \ o/tag.o \ @@ -133,6 +137,8 @@ clean: ########################################################################### +o/blowfish.o: blowfish.c $(SYMS) + o/buffer.o: buffer.c $(SYMS) o/charset.o: charset.c $(SYMS) @@ -208,6 +214,8 @@ o/screen.o: screen.c $(SYMS) o/search.o: search.c $(SYMS) regexp.h +o/sha256.o: sha256.c $(SYMS) + o/spell.o: spell.c $(SYMS) o/syntax.o: syntax.c $(SYMS) diff --git a/src/Make_djg.mak b/src/Make_djg.mak --- a/src/Make_djg.mak +++ b/src/Make_djg.mak @@ -19,6 +19,7 @@ INCL = vim.h globals.h option.h keymap.h CFLAGS = -O2 -DMSDOS -Iproto $(DEFINES) -Wall -Dinterrupt= -Dfar= -DMAXMEM=512 -D_NAIVE_DOS_REGS OBJ = \ + obj/blowfish.o \ obj/buffer.o \ obj/charset.o \ obj/diff.o \ @@ -54,6 +55,7 @@ OBJ = \ obj/regexp.o \ obj/screen.o \ obj/search.o \ + obj/sha256.o \ obj/spell.o \ obj/syntax.o \ obj/tag.o \ diff --git a/src/Make_manx.mak b/src/Make_manx.mak --- a/src/Make_manx.mak +++ b/src/Make_manx.mak @@ -34,7 +34,8 @@ SHELL = csh REN = $(SHELL) -c mv -f DEL = $(SHELL) -c rm -f -SRC = buffer.c \ +SRC = blowfish.c \ + buffer.c \ charset.c \ diff.c \ digraph.c \ @@ -69,6 +70,7 @@ SRC = buffer.c \ regexp.c \ screen.c \ search.c \ + sha256.c \ spell.c \ syntax.c \ tag.c \ @@ -80,7 +82,8 @@ SRC = buffer.c \ INCL = vim.h feature.h keymap.h macros.h ascii.h term.h structs.h os_amiga.h -OBJ = obj/buffer.o \ +OBJ = obj/blowfish.o \ + obj/buffer.o \ obj/charset.o \ obj/diff.o \ obj/digraph.o \ @@ -115,6 +118,7 @@ OBJ = obj/buffer.o \ obj/regexp.o \ obj/screen.o \ obj/search.o \ + obj/sha256.o \ obj/spell.o \ obj/syntax.o \ obj/tag.o \ @@ -214,6 +218,9 @@ CCNOSYM = $(CC) $(CFLAGS) -o $(OBJ): $(SYMS) +obj/blowfish.o: blowfish.c + $(CCSYM) $@ blowfish.c + obj/buffer.o: buffer.c $(CCSYM) $@ buffer.c @@ -323,6 +330,9 @@ obj/screen.o: screen.c obj/search.o: search.c $(CCSYM) $@ search.c +obj/sha256.o: sha256.c + $(CCSYM) $@ sha256.c + obj/spell.o: spell.c $(CCSYM) $@ spell.c diff --git a/src/Make_ming.mak b/src/Make_ming.mak --- a/src/Make_ming.mak +++ b/src/Make_ming.mak @@ -375,6 +375,7 @@ endif LIB = -lkernel32 -luser32 -lgdi32 -ladvapi32 -lcomdlg32 -lcomctl32 -lversion GUIOBJ = $(OUTDIR)/gui.o $(OUTDIR)/gui_w32.o $(OUTDIR)/gui_beval.o $(OUTDIR)/os_w32exe.o OBJ = \ + $(OUTDIR)/blowfish.o \ $(OUTDIR)/buffer.o \ $(OUTDIR)/charset.o \ $(OUTDIR)/diff.o \ @@ -412,6 +413,7 @@ OBJ = \ $(OUTDIR)/regexp.o \ $(OUTDIR)/screen.o \ $(OUTDIR)/search.o \ + $(OUTDIR)/sha256.o \ $(OUTDIR)/spell.o \ $(OUTDIR)/syntax.o \ $(OUTDIR)/tag.o \ diff --git a/src/Make_morph.mak b/src/Make_morph.mak --- a/src/Make_morph.mak +++ b/src/Make_morph.mak @@ -24,7 +24,8 @@ RM = rm .c.o: ${CC} ${CFLAGS} $< -o $@ -SRC = buffer.c \ +SRC = blowfish.c \ + buffer.c \ charset.c \ diff.c \ digraph.c \ @@ -59,6 +60,7 @@ SRC = buffer.c \ regexp.c \ screen.c \ search.c \ + sha256.c \ spell.c \ syntax.c \ tag.c \ diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -454,7 +454,6 @@ INCL = vim.h os_win32.h ascii.h feature. OBJ = \ $(OUTDIR)\blowfish.obj \ - $(OUTDIR)\sha256.obj \ $(OUTDIR)\buffer.obj \ $(OUTDIR)\charset.obj \ $(OUTDIR)\diff.obj \ @@ -492,6 +491,7 @@ OBJ = \ $(OUTDIR)\regexp.obj \ $(OUTDIR)\screen.obj \ $(OUTDIR)\search.obj \ + $(OUTDIR)\sha256.obj \ $(OUTDIR)\spell.obj \ $(OUTDIR)\syntax.obj \ $(OUTDIR)\tag.obj \ @@ -912,11 +912,9 @@ testclean: !ENDIF $(CC) $(CFLAGS) $< -$(OUTDIR)/buffer.obj: $(OUTDIR) buffer.c $(INCL) - $(OUTDIR)/blowfish.obj: $(OUTDIR) blowfish.c $(INCL) -$(OUTDIR)/sha256.obj: $(OUTDIR) sha256.c $(INCL) +$(OUTDIR)/buffer.obj: $(OUTDIR) buffer.c $(INCL) $(OUTDIR)/charset.obj: $(OUTDIR) charset.c $(INCL) @@ -1033,6 +1031,8 @@ mzscheme_base.c: $(OUTDIR)/search.obj: $(OUTDIR) search.c $(INCL) +$(OUTDIR)/sha256.obj: $(OUTDIR) sha256.c $(INCL) + $(OUTDIR)/spell.obj: $(OUTDIR) spell.c $(INCL) $(OUTDIR)/syntax.obj: $(OUTDIR) syntax.c $(INCL) diff --git a/src/Make_os2.mak b/src/Make_os2.mak --- a/src/Make_os2.mak +++ b/src/Make_os2.mak @@ -39,6 +39,7 @@ INCL = vim.h globals.h option.h keymap.h CFLAGS = -O2 -fno-strength-reduce -DOS2 -Wall -Iproto $(DEFINES) OBJ = \ + blowfish.o \ buffer.o \ charset.o \ diff.o \ @@ -73,6 +74,7 @@ OBJ = \ regexp.o \ screen.o \ search.o \ + sha256.o \ spell.o \ syntax.o \ tag.o \ @@ -112,6 +114,7 @@ clean: ########################################################################### os_unix.o: os_unix.c $(INCL) +blowfish.o: blowfish.c $(INCL) buffer.o: buffer.c $(INCL) charset.o: charset.c $(INCL) diff.o: diff.c $(INCL) @@ -146,6 +149,7 @@ quickfix.o: quickfix.c $(INCL) regexp.o: regexp.c $(INCL) screen.o: screen.c $(INCL) search.o: search.c $(INCL) +sha256.o: sha256.c $(INCL) spell.o: spell.c $(INCL) syntax.o: syntax.c $(INCL) tag.o: tag.c $(INCL) diff --git a/src/Make_sas.mak b/src/Make_sas.mak --- a/src/Make_sas.mak +++ b/src/Make_sas.mak @@ -89,6 +89,7 @@ CFLAGS4 = $(DEFINES) DATAMEMORY=$(MEMORY PROPT = DEF=PROTO GPROTO GPPARM MAXIMUMERRORS=999 GENPROTOSTATICS GENPROTOPARAMETERS SRC = \ + blowfish.c \ buffer.c \ charset.c \ diff.c \ @@ -124,6 +125,7 @@ SRC = \ regexp.c \ screen.c \ search.c \ + sha256.c \ spell.c \ syntax.c \ tag.c \ @@ -134,6 +136,7 @@ SRC = \ version.c OBJ = \ + blowfish.o \ buffer.o \ charset.o \ diff.o \ @@ -169,6 +172,7 @@ OBJ = \ regexp.o \ screen.o \ search.o \ + sha256.o \ spell.o \ syntax.o \ tag.o \