From de787262d32b2c6c71b88ec9e2352e503d43193e Mon Sep 17 00:00:00 2001 From: Renaud Fivet Date: Sat, 1 Jun 2013 13:42:09 +0800 Subject: [PATCH] rebuild on linux and fix lock dependencies. --- Makefile | 57 ++++++++++++++++++++++++++++---------------------------- file.c | 1 + lock.c | 2 ++ lock.h | 3 ++- main.c | 1 + 5 files changed, 35 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index c404208..2b072b1 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# makefile for emacs, updated Sat, Jun 01, 2013 11:49:18 AM +# makefile for emacs, updated Sat Jun 1 12:46:04 CST 2013 SRC=ansi.c basic.c bind.c buffer.c crypt.c display.c ebind.c eval.c exec.c file.c fileio.c globals.c ibmpc.c input.c isearch.c line.c lock.c main.c names.c pklock.c posix.c random.c region.c search.c spawn.c tcap.c termio.c utf8.c vmsvt.c vt52.c window.c word.c wrapper.c OBJ=ansi.o basic.o bind.o buffer.o crypt.o display.o ebind.o eval.o exec.o file.o fileio.o globals.o ibmpc.o input.o isearch.o line.o lock.o main.o names.o pklock.o posix.o random.o region.o search.o spawn.o tcap.o termio.o utf8.o vmsvt.o vt52.o window.o word.o wrapper.o @@ -125,60 +125,61 @@ depend: ${SRC} ansi.o: ansi.c estruct.h line.h utf8.h edef.h basic.o: basic.c basic.h display.h estruct.h line.h utf8.h edef.h input.h \ - random.h word.h + random.h word.h bind.o: bind.c bind.h edef.h estruct.h line.h utf8.h buffer.h display.h \ - ebind.h exec.h file.h fileio.h input.h main.h names.h window.h + ebind.h exec.h file.h fileio.h input.h main.h names.h window.h buffer.o: buffer.c buffer.h estruct.h line.h utf8.h display.h edef.h \ - file.h input.h window.h + file.h input.h window.h crypt.o: crypt.c crypt.h display.h estruct.h line.h utf8.h edef.h input.h display.o: display.c display.h estruct.h line.h utf8.h edef.h termio.h \ - version.h wrapper.h window.h + version.h wrapper.h window.h ebind.o: ebind.c ebind.h basic.h bind.h edef.h estruct.h line.h utf8.h \ - buffer.h crypt.h eval.h exec.h file.h isearch.h main.h random.h \ - region.h search.h spawn.h window.h word.h + buffer.h crypt.h eval.h exec.h file.h isearch.h main.h random.h region.h \ + search.h spawn.h window.h word.h eval.o: eval.c eval.h estruct.h line.h utf8.h basic.h bind.h edef.h \ - buffer.h display.h exec.h fileio.h input.h random.h search.h termio.h \ - version.h window.h + buffer.h display.h exec.h fileio.h input.h random.h search.h termio.h \ + version.h window.h exec.o: exec.c exec.h estruct.h line.h utf8.h buffer.h bind.h edef.h \ - display.h eval.h file.h input.h + display.h eval.h file.h input.h file.o: file.c file.h buffer.h estruct.h line.h utf8.h crypt.h display.h \ - edef.h fileio.h input.h main.h window.h + edef.h fileio.h input.h lock.h main.h window.h fileio.o: fileio.c fileio.h crypt.h display.h estruct.h line.h utf8.h \ - edef.h + edef.h globals.o: globals.c estruct.h line.h utf8.h edef.h ibmpc.o: ibmpc.c estruct.h line.h utf8.h edef.h input.o: input.c input.h edef.h estruct.h line.h utf8.h bind.h display.h \ - exec.h main.h names.h wrapper.h + exec.h main.h names.h wrapper.h isearch.o: isearch.c isearch.h basic.h display.h estruct.h line.h utf8.h \ - edef.h input.h search.h + edef.h input.h search.h line.o: line.c line.h utf8.h basic.h display.h estruct.h edef.h main.h \ - random.h -lock.o: lock.c lock.h display.h estruct.h line.h utf8.h edef.h input.h + random.h +lock.o: lock.c lock.h estruct.h line.h utf8.h display.h edef.h input.h \ + pklock.h main.o: main.c main.h crypt.h display.h estruct.h line.h utf8.h edef.h \ - input.h termio.h version.h basic.h bind.h buffer.h eval.h file.h \ - random.h search.h + input.h termio.h version.h basic.h bind.h buffer.h eval.h file.h lock.h \ + random.h search.h names.o: names.c names.h basic.h bind.h edef.h estruct.h line.h utf8.h \ - buffer.h display.h eval.h exec.h crypt.h file.h isearch.h main.h \ - region.h random.h search.h spawn.h window.h word.h + buffer.h display.h eval.h exec.h crypt.h file.h isearch.h main.h \ + region.h random.h search.h spawn.h window.h word.h pklock.o: pklock.c pklock.h estruct.h line.h utf8.h edef.h -posix.o: posix.c termio.h +posix.o: posix.c termio.h estruct.h line.h utf8.h edef.h random.o: random.c random.h basic.h display.h estruct.h line.h utf8.h \ - edef.h input.h main.h search.h + edef.h input.h main.h search.h region.o: region.c region.h estruct.h line.h utf8.h display.h edef.h \ - main.h + main.h search.o: search.c search.h estruct.h line.h utf8.h basic.h display.h \ - edef.h input.h main.h + edef.h input.h main.h spawn.o: spawn.c spawn.h buffer.h estruct.h line.h utf8.h display.h \ - edef.h file.h input.h main.h window.h + edef.h file.h input.h main.h window.h tcap.o: tcap.c display.h estruct.h line.h utf8.h edef.h termio.h -termio.o: termio.c termio.h estruct.h line.h utf8.h edef.h +termio.o: termio.c termio.h utf8.o: utf8.c utf8.h vmsvt.o: vmsvt.c estruct.h line.h utf8.h edef.h vt52.o: vt52.c estruct.h line.h utf8.h edef.h window.o: window.c window.h estruct.h line.h utf8.h basic.h display.h \ - edef.h main.h wrapper.h + edef.h main.h wrapper.h word.o: word.c word.h basic.h display.h estruct.h line.h utf8.h edef.h \ - main.h random.h region.h + main.h random.h region.h wrapper.o: wrapper.c wrapper.h # DEPENDENCIES MUST END AT END OF FILE diff --git a/file.c b/file.c index 082df7e..37b2153 100644 --- a/file.c +++ b/file.c @@ -22,6 +22,7 @@ #include "fileio.h" #include "input.h" #include "line.h" +#include "lock.h" #include "main.h" #include "window.h" diff --git a/lock.c b/lock.c index 15d41f4..326d577 100644 --- a/lock.c +++ b/lock.c @@ -24,6 +24,8 @@ static char *lname[NLOCKS]; /* names of all locked files */ static int numlocks; /* # of current locks active */ +static void lckerror(char *errstr) ; + /* * lockchk: * check a file for locking and add it to the list diff --git a/lock.h b/lock.h index 1183a10..a5a24d0 100644 --- a/lock.h +++ b/lock.h @@ -1,13 +1,14 @@ #ifndef _LOCK_H_ #define _LOCK_H_ +#include "estruct.h" + #if BSD | SVR4 int lockchk( char *fname) ; int lockrel( void) ; int lock( char *fname) ; int unlock( char *fname) ; -void lckerror( char *errstr) ; #endif diff --git a/main.c b/main.c index 4f9e636..f09c64f 100644 --- a/main.c +++ b/main.c @@ -76,6 +76,7 @@ #include "buffer.h" #include "eval.h" #include "file.h" +#include "lock.h" #include "random.h" #include "search.h"