include: Drop update.h

update.h is a convenience header to include headers commonly needed in
update code.  The price for the convenience is superfluous recompiles.
Include necessary headers directly, and drop update.h

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/include/update.h b/include/update.h
deleted file mode 100644 (file)
index f19dd90..0000000
--- a/include/update.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                Ken Stevens, Steve McClure, Markus Armbruster
- *
- *  Empire is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  ---
- *
- *  See files README, COPYING and CREDITS in the root of the source
- *  tree for related information and legal notices.  It is expected
- *  that future projects/authors will amend these files as needed.
- *
- *  ---
- *
- *  update.h: Include headers used for updates
- *
- *  Known contributors to this file:
- *
- */
-
-#ifndef UPDATE_H
-#define UPDATE_H
-
-#include "file.h"
-#include "nat.h"
-#include "optlist.h"
-#include "prototypes.h"
-#include "sect.h"
-
-#endif

diff --git a/src/lib/update/age.c b/src/lib/update/age.c
index 5e19418ac65d29a0af5992b294ee784b0bf3e750..aa7e29f2e23925fc35f3672b7610e67a2058ca0b 100644 (file)
--- a/src/lib/update/age.c
+++ b/src/lib/update/age.c
@@ -33,7 +33,10 @@
 #include <config.h>
 
 #include "chance.h"
-#include "update.h"
+#include "file.h"
+#include "nat.h"
+#include "optlist.h"
+#include "prototypes.h"
 
 int
 age_people(int n, int etu)

diff --git a/src/lib/update/anno.c b/src/lib/update/anno.c
index 6c5601edd5df66894478e474ae6a31c68c45f148..6c3cfb5efcdd04b581ea60957bcc2857e1693294 100644 (file)
--- a/src/lib/update/anno.c
+++ b/src/lib/update/anno.c
@@ -41,8 +41,9 @@
 #endif
 #include <stdio.h>
 #include <time.h>
+#include "optlist.h"
+#include "prototypes.h"
 #include "tel.h"
-#include "update.h"
 
 static int copy_and_expire(FILE *, FILE *, char *, time_t);
 static int copy_sink(char *, size_t, void *);

diff --git a/src/lib/update/bp.c b/src/lib/update/bp.c
index 8418031e9fc574cbdd4dfef48f6423d204dc951c..86991129f5d9b0d2a903cf0797f284bc395b052e 100644 (file)
--- a/src/lib/update/bp.c
+++ b/src/lib/update/bp.c
@@ -40,8 +40,10 @@
 
 #include <config.h>
 
+#include <stdlib.h>
 #include "budg.h"
-#include "update.h"
+#include "optlist.h"
+#include "sect.h"
 
 /* Item types we want to track. */
 enum bp_item_idx {

diff --git a/src/lib/update/deliver.c b/src/lib/update/deliver.c
index 66292375a40bf864367beaa70fe3f965f970fea8..ecb06508634a451c0fa1aeed7a3ac87c7c13a3b8 100644 (file)
--- a/src/lib/update/deliver.c
+++ b/src/lib/update/deliver.c
@@ -32,10 +32,13 @@
 
 #include <config.h>
 
+#include "file.h"
 #include "item.h"
+#include "optlist.h"
 #include "path.h"
 #include "plague.h"
-#include "update.h"
+#include "sect.h"
+#include "prototypes.h"
 
 #define DELIVER_BONUS 4.0
 

diff --git a/src/lib/update/distribute.c b/src/lib/update/distribute.c
index d06beeeacd70230e27b0752f0daea81e86997fbc..803dcf7b568340e930e1443e259adccd71612fbc 100644 (file)
--- a/src/lib/update/distribute.c
+++ b/src/lib/update/distribute.c
@@ -35,11 +35,13 @@
 #include <config.h>
 
 #include "distribute.h"
+#include "file.h"
 #include "item.h"
+#include "optlist.h"
 #include "path.h"
 #include "plague.h"
 #include "prototypes.h"
-#include "update.h"
+#include "sect.h"
 
 #ifdef DISTRIBUTE_DEBUG
 #define DPRINTF(fmt, ...) ((void)printf(fmt , ## __VA_ARGS__))

diff --git a/src/lib/update/finish.c b/src/lib/update/finish.c
index 88777aa1292a9ef6c441bfb16ed616ad616bb579..a0bc18aa038af77af37cf9ee2688ab46c2c88e75 100644 (file)
--- a/src/lib/update/finish.c
+++ b/src/lib/update/finish.c
@@ -38,8 +38,12 @@
 #include <stdlib.h>
 #include <sys/resource.h>
 #include "distribute.h"
+#include "file.h"
+#include "nat.h"
+#include "optlist.h"
 #include "path.h"
-#include "update.h"
+#include "sect.h"
+#include "prototypes.h"
 
 static void assemble_dist_paths(double *);
 

diff --git a/src/lib/update/human.c b/src/lib/update/human.c
index b7b3403a5be609bfc34960d791a4b49735841b79..07b30a791919e58c479ecf9d7ac8d07202c16055 100644 (file)
--- a/src/lib/update/human.c
+++ b/src/lib/update/human.c
@@ -37,9 +37,12 @@
 #include <math.h>
 #include "chance.h"
 #include "item.h"
+#include "optlist.h"
+#include "nat.h"
 #include "news.h"
 #include "player.h"
-#include "update.h"
+#include "prototypes.h"
+#include "sect.h"
 #include "xy.h"
 
 static int new_work(struct sctstr *, int);

diff --git a/src/lib/update/land.c b/src/lib/update/land.c
index 6f48a68ef3fd3aca82b0c77994e5a63a80ae4a0b..0bb5c00ebea11630d1b9ab7b9fc9534f07ce327c 100644 (file)
--- a/src/lib/update/land.c
+++ b/src/lib/update/land.c
@@ -38,12 +38,16 @@
 #include <math.h>
 #include "budg.h"
 #include "chance.h"
+#include "file.h"
 #include "land.h"
 #include "lost.h"
+#include "nat.h"
 #include "news.h"
+#include "optlist.h"
 #include "plague.h"
 #include "player.h"
-#include "update.h"
+#include "prototypes.h"
+#include "sect.h"
 
 static void landrepair(struct lndstr *, struct natstr *, struct bp *, int);
 static void upd_land(struct lndstr *, int, struct natstr *, struct bp *, int);

diff --git a/src/lib/update/main.c b/src/lib/update/main.c
index 63524d36f2cbae5f10facad628cab82423942db0..f6ed8cd59e649e2f447337032047d4819ccd3b24 100644 (file)
--- a/src/lib/update/main.c
+++ b/src/lib/update/main.c
@@ -38,11 +38,13 @@
 #include <sys/resource.h>
 #include "budg.h"
 #include "empthread.h"
+#include "file.h"
 #include "game.h"
 #include "journal.h"
+#include "optlist.h"
+#include "prototypes.h"
 #include "server.h"
 #include "unit.h"
-#include "update.h"
 
 int money[MAXNOC];
 int pops[MAXNOC];

diff --git a/src/lib/update/material.c b/src/lib/update/material.c
index 5781719c449257a89e0f31c15cc7c3c3a922a781..5860a7e0d13abe0957c274a4d2a924e9847c54f2 100644 (file)
--- a/src/lib/update/material.c
+++ b/src/lib/update/material.c
@@ -34,7 +34,8 @@
 #include <config.h>
 
 #include "chance.h"
-#include "update.h"
+#include "sect.h"
+#include "prototypes.h"
 
 /*
  * Get build materials from sector @sp.

diff --git a/src/lib/update/mobility.c b/src/lib/update/mobility.c
index 73330f6cef9da5855468b19079b3ea495694206f..5b764187010906dd39047a600c3ad34d5803e84f 100644 (file)
--- a/src/lib/update/mobility.c
+++ b/src/lib/update/mobility.c
@@ -34,12 +34,15 @@
 
 #include <config.h>
 
+#include "file.h"
 #include "game.h"
 #include "land.h"
+#include "optlist.h"
 #include "plane.h"
+#include "prototypes.h"
+#include "sect.h"
 #include "server.h"
 #include "ship.h"
-#include "update.h"
 
 static int do_upd_checking;
 

diff --git a/src/lib/update/move_sat.c b/src/lib/update/move_sat.c
index f54f5ebeb25bd6bfd1d75977678f40ac82c8b446..95690a062d5aeae8d005ca01757ecebf157b2625 100644 (file)
--- a/src/lib/update/move_sat.c
+++ b/src/lib/update/move_sat.c
@@ -33,9 +33,13 @@
 #include <config.h>
 
 #include <math.h>
+#include "file.h"
+#include "nat.h"
 #include "nsc.h"
+#include "optlist.h"
 #include "plane.h"
-#include "update.h"
+#include "prototypes.h"
+#include "sect.h"
 
 #ifndef PI
 #define PI     3.14159265358979323846

diff --git a/src/lib/update/nat.c b/src/lib/update/nat.c
index 5e7df69646c8b7cf9560d2d92d33ab70e32c2cbc..ec31dec2eebbf1e8667b3c7d78bede952eeb91a9 100644 (file)
--- a/src/lib/update/nat.c
+++ b/src/lib/update/nat.c
@@ -36,9 +36,12 @@
 
 #include <math.h>
 #include "budg.h"
+#include "file.h"
 #include "game.h"
 #include "item.h"
-#include "update.h"
+#include "optlist.h"
+#include "prototypes.h"
+#include "nat.h"
 
 /*
  * hap and edu avg mean that the weight on current happiness is

diff --git a/src/lib/update/nxtitemp.c b/src/lib/update/nxtitemp.c
index 83dff29d92d03d9c0528c13079df62bf2c996ec1..dfd20ae7dbd1a26f56e5ce2f8a0b125cc9ee5166 100644 (file)
--- a/src/lib/update/nxtitemp.c
+++ b/src/lib/update/nxtitemp.c
@@ -33,11 +33,12 @@
 #include <config.h>
 
 #include "empobj.h"
+#include "file.h"
 #include "land.h"
 #include "nsc.h"
+#include "prototypes.h"
 #include "ship.h"
 #include "unit.h"
-#include "update.h"
 
 void *
 nxtitemp(struct nstr_item *np)

diff --git a/src/lib/update/plague.c b/src/lib/update/plague.c
index 9a272cfa9116a412e1ecbdf6ed1c63ac619fb28d..fcb79a44987b0400b3562eaeeaa486498776e81c 100644 (file)
--- a/src/lib/update/plague.c
+++ b/src/lib/update/plague.c
@@ -34,11 +34,15 @@
 #include <config.h>
 
 #include "chance.h"
+#include "file.h"
 #include "item.h"
 #include "lost.h"
+#include "optlist.h"
+#include "nat.h"
 #include "news.h"
 #include "plague.h"
-#include "update.h"
+#include "prototypes.h"
+#include "sect.h"
 
 static int infect_people(struct natstr *, struct sctstr *);
 

diff --git a/src/lib/update/plane.c b/src/lib/update/plane.c
index d8fe4512aca9a855126df5ad0d2815bb0bc9de2b..7c80e342bfa75c3955ac9a2ce5098789b60cf2dc 100644 (file)
--- a/src/lib/update/plane.c
+++ b/src/lib/update/plane.c
@@ -36,11 +36,15 @@
 
 #include "budg.h"
 #include "chance.h"
+#include "file.h"
 #include "lost.h"
+#include "nat.h"
+#include "optlist.h"
 #include "plane.h"
 #include "player.h"
+#include "prototypes.h"
+#include "sect.h"
 #include "ship.h"
-#include "update.h"
 
 static void planerepair(struct plnstr *, struct natstr *, struct bp *, int);
 static void upd_plane(struct plnstr *, int, struct natstr *, struct bp *, int);

diff --git a/src/lib/update/populace.c b/src/lib/update/populace.c
index 6c70497d1193702c36d76cf67357dbb25610f48e..89f95046d8b41d9b6f807f262d239668813dd41d 100644 (file)
--- a/src/lib/update/populace.c
+++ b/src/lib/update/populace.c
@@ -34,8 +34,12 @@
 #include <config.h>
 
 #include "chance.h"
+#include "file.h"
 #include "lost.h"
-#include "update.h"
+#include "optlist.h"
+#include "prototypes.h"
+#include "nat.h"
+#include "sect.h"
 
 void
 populace(struct sctstr *sp, int etu)

diff --git a/src/lib/update/prepare.c b/src/lib/update/prepare.c
index 7146114d3d1823615dfb1cc6741bd44e53ef0b8f..3d6b6e68c3c48c83c522da87c8a7f16a255c3072 100644 (file)
--- a/src/lib/update/prepare.c
+++ b/src/lib/update/prepare.c
@@ -37,11 +37,15 @@
 
 #include "budg.h"
 #include "chance.h"
+#include "file.h"
 #include "item.h"
 #include "land.h"
+#include "nat.h"
+#include "optlist.h"
 #include "player.h"
+#include "prototypes.h"
+#include "sect.h"
 #include "ship.h"
-#include "update.h"
 
 void
 prepare_sects(int etu)

diff --git a/src/lib/update/produce.c b/src/lib/update/produce.c
index 632668f899a47f3f3ed79f15bd19b5a0c9a952ec..a7d7bae98b53ca8c7c14f1d9d726faa7783a6b8a 100644 (file)
--- a/src/lib/update/produce.c
+++ b/src/lib/update/produce.c
@@ -34,9 +34,12 @@
 
 #include "budg.h"
 #include "chance.h"
+#include "nat.h"
+#include "optlist.h"
 #include "player.h"
 #include "product.h"
-#include "update.h"
+#include "prototypes.h"
+#include "sect.h"
 
 static void materials_charge(struct pchrstr *, short *, int);
 

diff --git a/src/lib/update/removewants.c b/src/lib/update/removewants.c
index b43581c21599cc64f15796e57f84b881ef91def2..eb04bf4775e755adc3fe79a060b3f0070dd1d298 100644 (file)
--- a/src/lib/update/removewants.c
+++ b/src/lib/update/removewants.c
@@ -32,7 +32,9 @@
 
 #include <config.h>
 
-#include "update.h"
+#include "file.h"
+#include "nat.h"
+#include "prototypes.h"
 
 int
 update_removewants(void)

diff --git a/src/lib/update/revolt.c b/src/lib/update/revolt.c
index 75c2e8247bab6d1e6c98067a425bdace1b8cae81..bedfc96e43d1d3f90b37c05191936c38b4fe444d 100644 (file)
--- a/src/lib/update/revolt.c
+++ b/src/lib/update/revolt.c
@@ -35,14 +35,17 @@
 #include <config.h>
 
 #include "chance.h"
+#include "file.h"
 #include "land.h"
 #include "lost.h"
+#include "nat.h"
 #include "news.h"
 #include "nsc.h"
 #include "nuke.h"
 #include "path.h"
 #include "plane.h"
-#include "update.h"
+#include "prototypes.h"
+#include "sect.h"
 
 static void take_casualties(struct sctstr *, int);
 static void lnd_dies_fighting_che(struct lndstr *);

diff --git a/src/lib/update/sect.c b/src/lib/update/sect.c
index 1f8b3c28e5066409ec87a9c2875cb0176a4a93b3..4412831cb8b0b5e11c71f15b939a59f08fcd4a84 100644 (file)
--- a/src/lib/update/sect.c
+++ b/src/lib/update/sect.c
@@ -36,13 +36,17 @@
 
 #include "budg.h"
 #include "chance.h"
+#include "file.h"
 #include "item.h"
 #include "land.h"
 #include "lost.h"
+#include "nat.h"
+#include "optlist.h"
 #include "path.h"
 #include "player.h"
+#include "prototypes.h"
+#include "sect.h"
 #include "ship.h"
-#include "update.h"
 
 double
 buildeff(struct sctstr *sp)

diff --git a/src/lib/update/ship.c b/src/lib/update/ship.c
index a54b0fdc5f9c8e72615290e97122595b1902131f..e2d5213b0de93c37f866a9912ec727e590ae3876 100644 (file)
--- a/src/lib/update/ship.c
+++ b/src/lib/update/ship.c
@@ -38,14 +38,18 @@
 #include <math.h>
 #include "budg.h"
 #include "chance.h"
+#include "file.h"
 #include "land.h"
 #include "lost.h"
+#include "nat.h"
 #include "news.h"
+#include "optlist.h"
 #include "plague.h"
 #include "player.h"
 #include "product.h"
+#include "prototypes.h"
+#include "sect.h"
 #include "ship.h"
-#include "update.h"
 
 static void shiprepair(struct shpstr *, struct natstr *, struct bp *, int);
 static void upd_ship(struct shpstr *, int, struct natstr *, struct bp *, int);