Header file cleanup.

diff --git a/battle.c b/battle.c
index bcfd70788b72210b4350eee8d58f4aa5d08faf6b..5389821ab5d3dd048a2867eeaaa83b9a265b1fea 100644 (file)
--- a/battle.c
+++ b/battle.c
@@ -1,6 +1,5 @@
 #include <unistd.h>
 #include "conio.h"
 #include <unistd.h>
 #include "conio.h"

-#include "sstlinux.h"

 #include "sst.h"
 
 void doshield(int i) {
 #include "sst.h"
 
 void doshield(int i) {

diff --git a/io.c b/io.c
index 8841b1aa33c86171bdc418485d8d19890038457b..e9cc3d7c102c77aa17f151ede5d81b33dbed86ce 100644 (file)
--- a/io.c
+++ b/io.c
@@ -9,7 +9,6 @@
 #include <time.h>
 
 #include "conio.h"
 #include <time.h>
 
 #include "conio.h"

-#include "sstlinux.h"

 #include "sst.h"
 
 #ifndef SERGEEV
 #include "sst.h"
 
 #ifndef SERGEEV

diff --git a/makefile b/makefile
index d047666a9ceefa1aa5307bd5e504377dd6052595..e37d4464ebfc43dc3469650d8d761847d795735e 100644 (file)
--- a/makefile
+++ b/makefile
@@ -17,6 +17,19 @@ SOURCES= $(CFILES) $(HFILES) $(DOCS) sst.doc sst.6 makehelp.py makefile sst.spec
 
 all: sst sst.doc
 
 
 all: sst sst.doc
 

+ai.o: ai.c sst.h
+battle.o: battle.c conio.h sst.h
+conio.o: conio.c conio.h
+events.o: events.c sst.h
+finish.o: finish.c sst.h
+io.o: io.c conio.h sst.h
+moving.o: moving.c sstlinux.h conio.h sst.h
+planets.o: planets.c sst.h
+reports.o: reports.c sst.h conio.h
+setup.o: setup.c conio.h sst.h
+sst.o: sst.c conio.h sstlinux.h sst.h
+sstlinux.o: sstlinux.c sstlinux.h
+

 sst:  $(OFILES)
        gcc  -o sst $(OFILES) -lm -lcurses
 
 sst:  $(OFILES)
        gcc  -o sst $(OFILES) -lm -lcurses
 

diff --git a/moving.c b/moving.c
index 174cd54b79a84fef6fe64071afb21fd468dd76e1..17f3a2282767a738921a6a98fb3b1cc1ee5dca68 100644 (file)
--- a/moving.c
+++ b/moving.c
@@ -1,6 +1,6 @@
-#include "conio.h"
-#include "sstlinux.h"

 #include <unistd.h>
 #include <unistd.h>

+#include "sstlinux.h"
+#include "conio.h"

 #include "sst.h"
 
 static void getcd(int, int);
 #include "sst.h"
 
 static void getcd(int, int);

diff --git a/reports.c b/reports.c
index 8cbf55eb6a1da6138f81538ef7b195a5a8e87476..f866a7ba1d3bd1b094859ac84b21d26e646958a6 100644 (file)
--- a/reports.c
+++ b/reports.c
@@ -3,7 +3,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include "conio.h"
 #include <stdlib.h>
 #include <string.h>
 #include "conio.h"

-#include "sstlinux.h"

 
 void attakreport(int l) {
      if (!l) {
 
 void attakreport(int l) {
      if (!l) {

diff --git a/sstlinux.c b/sstlinux.c
index 4c479a067dcfefa7e4bac680eefe0048e3c61da3..90d50ad01a460caec3bf18dcd034a1095029b9b2 100644 (file)
--- a/sstlinux.c
+++ b/sstlinux.c
@@ -2,7 +2,6 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <linux/kd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <linux/kd.h>

-

 #include "sstlinux.h"
 
 static int fd = 0;
 #include "sstlinux.h"
 
 static int fd = 0;