From f210ed610b417d04c733b1c4227b69d0bdfeeda8 Mon Sep 17 00:00:00 2001
From: Renaud Fivet <renaud.fivet@gmail.com>
Date: Fri, 31 May 2013 14:27:49 +0800
Subject: [PATCH] cleanup bind & ebind dependencies to estruct & edef.

---
 Makefile | 9 +++++----
 bind.c   | 2 --
 ebind.c  | 1 -
 input.c  | 2 --
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 79f64b4..1aad22b 100644
--- a/Makefile
+++ b/Makefile
@@ -28,9 +28,9 @@ OBJ=basic.o bind.o buffer.o crypt.o display.o ebind.o eval.o exec.o \
 	termio.o window.o word.o names.o globals.o \
 	wrapper.o utf8.o
 
-HDR=basic.h bind.h buffer.h crypt.h display.h edef.h efunc.h \
+HDR=basic.h bind.h buffer.h crypt.h display.h ebind.h edef.h efunc.h \
 	estruct.h eval.h exec.h file.h fileio.h input.h isearch.h line.h \
-	lock.h main.h pklock.h random.h region.h search.h spawn.h \
+	lock.h main.h names.h pklock.h random.h region.h search.h spawn.h \
 	termio.h utf8.h version.h window.h word.h wrapper.h
 
 # DO NOT ADD OR MODIFY ANY LINES ABOVE THIS -- make source creates them
@@ -135,10 +135,11 @@ depend: ${SRC}
 
 ansi.o: ansi.c estruct.h edef.h
 basic.o: basic.c basic.h estruct.h edef.h
-bind.o: bind.c bind.h estruct.h edef.h fileio.h
+bind.o: bind.c bind.h ebind.h fileio.h names.h
 buffer.o: buffer.c buffer.h estruct.h edef.h
 crypt.o: crypt.c crypt.h display.h estruct.h edef.h input.h
 display.o: display.c display.h estruct.h edef.h utf8.h version.h window.h
+ebind.c: ebind.h
 eval.o: eval.c eval.h estruct.h edef.h version.h fileio.h
 exec.o: exec.c exec.h estruct.h edef.h
 file.o: file.c file.h crypt.h estruct.h edef.h fileio.h
@@ -149,7 +150,7 @@ isearch.o: isearch.c isearch.h estruct.h edef.h
 line.o: line.c line.h estruct.h edef.h
 lock.o: lock.c lock.h estruct.h edef.h
 main.o: main.c main.h estruct.h crypt.h edef.h version.h
-names.o: names.c estruct.h crypt.h edef.h line.h
+names.o: names.c names.h crypt.h line.h
 pklock.o: pklock.c pklock.h estruct.h
 posix.o: posix.c termio.h estruct.h utf8.h
 random.o: random.c random.h estruct.h edef.h
diff --git a/bind.c b/bind.c
index 534132b..075f582 100644
--- a/bind.c
+++ b/bind.c
@@ -15,8 +15,6 @@
 #include "buffer.h"
 #include "display.h"
 #include "ebind.h"
-#include "estruct.h"
-#include "edef.h"
 #include "exec.h"
 #include "file.h"
 #include "fileio.h"
diff --git a/ebind.c b/ebind.c
index 560b36d..2f2b33b 100644
--- a/ebind.c
+++ b/ebind.c
@@ -12,7 +12,6 @@
 #include "bind.h"
 #include "buffer.h"
 #include "crypt.h"
-#include "estruct.h"
 #include "eval.h"
 #include "exec.h"
 #include "file.h"
diff --git a/input.c b/input.c
index 43291c4..c0cd844 100644
--- a/input.c
+++ b/input.c
@@ -15,8 +15,6 @@
 
 #include "bind.h"
 #include "display.h"
-#include "estruct.h"
-#include "edef.h"
 #include "exec.h"
 #include "main.h"
 #include "names.h"