include: Merge distribute.h into update.h

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

diff --git a/include/distribute.h b/include/distribute.h
deleted file mode 100644 (file)
index 0d80910..0000000
--- a/include/distribute.h
+++ /dev/null
@@ -1,39 +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.
- *
- *  ---
- *
- *  distribute.h: Definitions for distribution stuff
- *
- *  Known contributors to this file:
- *
- */
-
-#ifndef DISTRIBUTE_H
-#define DISTRIBUTE_H
-
-#define IMPORT 0
-#define EXPORT 1
-
-#endif

diff --git a/include/update.h b/include/update.h
index 97982430dd30986ff7b61f99cebd3533fa822d90..7ff03d9e8839b86bd5f909ac10f568dd3c3e1c03 100644 (file)
--- a/include/update.h
+++ b/include/update.h
@@ -36,6 +36,9 @@
 
 #include "sect.h"
 
+#define IMPORT 0
+#define EXPORT 1
+
 #define SCT_EFFIC (SCT_TYPE_MAX + 1)
 #define SCT_MAINT (SCT_TYPE_MAX + 2)
 #define SCT_BUDG_MAX SCT_MAINT

diff --git a/src/lib/update/distribute.c b/src/lib/update/distribute.c
index 4d659a6c3ac69cdd217c67994054607bb77023d3..6f0bfa7bc4b9e8e69fd34c592829ef98bb2a4273 100644 (file)
--- a/src/lib/update/distribute.c
+++ b/src/lib/update/distribute.c
@@ -34,7 +34,6 @@
 
 #include <config.h>
 
-#include "distribute.h"
 #include "file.h"
 #include "item.h"
 #include "optlist.h"

diff --git a/src/lib/update/finish.c b/src/lib/update/finish.c
index 668a261e720dce413bddcabed747689f12d0799f..4fca7a09fadf8f979d1c8ad40b9c990c6e0390c3 100644 (file)
--- a/src/lib/update/finish.c
+++ b/src/lib/update/finish.c
@@ -37,7 +37,6 @@
 
 #include <stdlib.h>
 #include <sys/resource.h>
-#include "distribute.h"
 #include "file.h"
 #include "nat.h"
 #include "optlist.h"