fix serial.h inclusion

4 files changed, 24 insertions, 6 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a72d2e9..504536f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,14 @@
 Tue Sep 14 12:21:49 1993  K. Richard Pixley  (rich@sendai.cygnus.com)
 
+	* Makefile.in (remote_utils_h): add serial.h and target.h.
+	  (main.o, remote-es.o, remote-nindy.o, remote.o): remove target.h
+	  (already in remote_utils_h).
+	  (remote-utils.o): new rule.
+
+	* remote-utils.h: include serial.h.
+
+	* serial.h: ifdef protect from multiple inclusion.
+
 	* remote.c, remote-nindy.c, remote-mon.c, remote-es.c: include
 	  remote-utils.h.
 
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 5db3b65..5825936 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -323,7 +323,7 @@ SFILES_KGDB  = $(SFILES) stuff.c kdb-start.c
 #dis-asm_h =	$(INCLUDE_DIR)/dis-asm.h 
 
 dcache_h = dcache.h
-remote_utils_h = $(dcache_h) remote-utils.h
+remote_utils_h = $(dcache_h) serial.h target.h remote-utils.h
 
 readline_headers = \
 	$(READLINE_SRC)/chardefs.h \
@@ -1136,7 +1136,7 @@ m88k-tdep.o: m88k-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h)
 
 main.o: main.c $(bfd_h) $(getopt_h) $(readline_headers) call-cmds.h \
 	$(defs_h) $(gdbcmd_h) $(inferior_h) language.h signals.h \
-	target.h $(remote_utils_h)
+	$(remote_utils_h)
 	$(CC) -c $(INTERNAL_CFLAGS) $(READLINE_CFLAGS) $(srcdir)/main.c
 
 maint.o: maint.c $(defs_h) $(gdbcmd_h) $(gdbtypes_h) $(symtab_h) 
@@ -1212,7 +1212,7 @@ remote-eb.o: remote-eb.c $(wait_h) $(srcdir)/config/a29k/tm-a29k.h \
 	$(defs_h) $(gdbcore_h) $(inferior_h) symfile.h target.h terminal.h
 
 remote-es.o: remote-es.c $(bfd_h) $(wait_h) $(command_h) $(defs_h) \
-	$(inferior_h) target.h terminal.h
+	$(inferior_h) $(remote_utils_h) terminal.h
 
 remote-hms.o: remote-hms.c $(wait_h) $(defs_h) $(gdbcore_h) \
 	$(inferior_h) serial.h target.h terminal.h
@@ -1228,8 +1228,8 @@ remote-mon.o: remote-mon.c $(wait_h) $(command_h) $(defs_h) \
 
 remote-nindy.o: remote-nindy.c $(ieee-float_h) $(wait_h) $(command_h) \
 	$(defs_h) $(gdbcore_h) $(inferior_h) \
-	nindy-share/env.h nindy-share/stop.h \
-	symfile.h target.h
+	nindy-share/env.h nindy-share/stop.h $(remote_utils_h) \
+	symfile.h
 
 remote-sim.o: remote-sim.c $(wait_h) $(defs_h) $(gdbcore_h) \
 	$(inferior_h) target.h terminal.h
@@ -1248,8 +1248,11 @@ remote-vx.o: remote-vx.c $(wait_h) complaints.h $(defs_h) $(gdbcmd_h) \
 remote-z8k.o: remote-z8k.c $(wait_h) $(srcdir)/../sim/z8k/sim.h \
 	$(defs_h) $(gdbcore_h) $(inferior_h) target.h terminal.h
 
+remote-utils.o: remote-utils.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
+	$(inferior_h) $(remote_utils_h) 
+
 remote.o: remote.c $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
-	$(inferior_h) serial.h symfile.h target.h terminal.h
+	$(inferior_h) $(remote_utils_h) symfile.h terminal.h
 
 rs6000-nat.o: rs6000-nat.c $(bfd_h) $(defs_h) $(inferior_h) target.h
 
diff --git a/gdb/remote-utils.h b/gdb/remote-utils.h
index f3f4989..758ce3d 100644
--- a/gdb/remote-utils.h
+++ b/gdb/remote-utils.h
@@ -21,6 +21,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #ifndef REMOTE_UTILS_H
 #define REMOTE_UTILS_H
 
+#include "serial.h"
 #include "target.h"
 #include "dcache.h"
 
diff --git a/gdb/serial.h b/gdb/serial.h
index 84916d3..dfe15bc 100644
--- a/gdb/serial.h
+++ b/gdb/serial.h
@@ -17,6 +17,9 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#ifndef SERIAL_H
+#define SERIAL_H
+
 /* Terminal state pointer.  This is specific to each type of interface. */
 
 typedef PTR serial_ttystate;
@@ -161,3 +164,5 @@ extern int job_control;
 /* Set the process group of the caller to its own pid, or do nothing if
    we lack job control.  */
 extern int gdb_setpgid PARAMS ((void));
+
+#endif /* SERIAL_H */