From 7e533c6869a8ce8263f1f6eb6808d323472bb4b4 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Mon, 9 Mar 2015 12:52:51 +0100
Subject: [PATCH] Further changes to the build system / file paths/names.

---
 build/build_template                        | 13 -------------
 roguelike-client.do                         | 13 +++++++++----
 libplomrogue.c => src/server/libplomrogue.c |  0
 test_python_variant.sh => test_server.sh    |  0
 4 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 build/build_template
 rename libplomrogue.c => src/server/libplomrogue.c (100%)
 rename test_python_variant.sh => test_server.sh (100%)

diff --git a/build/build_template b/build/build_template
deleted file mode 100644
index 2f50556..0000000
--- a/build/build_template
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3
-# or any later version. For details on its copyright, license, and warranties,
-# see the file NOTICE in the root directory of the PlomRogue source package.
-
-redo-ifchange build/compiler_flags
-. ./build/compiler_flags
-mkdir -p build/$TARGET
-mkdir -p build/common
-for file in src/${TARGET}/*.c src/common/*.c; do
-  file=build/${file#src/}
-  redo-ifchange ${file%.*}.o
-done
-gcc $CFLAGS -o $3 -g build/${TARGET}/*.o build/common/*.o $LIBRARY_LINKS
diff --git a/roguelike-client.do b/roguelike-client.do
index 761fdfa..af1234b 100644
--- a/roguelike-client.do
+++ b/roguelike-client.do
@@ -4,7 +4,12 @@
 # or any later version. For details on its copyright, license, and warranties,
 # see the file NOTICE in the root directory of the PlomRogue source package.
 
-redo-ifchange build/build_template
-TARGET=client
-LIBRARY_LINKS=-lncurses
-. ./build/build_template
+redo-ifchange build/compiler_flags
+. ./build/compiler_flags
+mkdir -p build/client
+mkdir -p build/common
+for file in src/client/*.c src/common/*.c; do
+  file=build/${file#src/}
+  redo-ifchange ${file%.*}.o
+done
+gcc $CFLAGS -o $3 -g build/client/*.o build/common/*.o -lncurses
diff --git a/libplomrogue.c b/src/server/libplomrogue.c
similarity index 100%
rename from libplomrogue.c
rename to src/server/libplomrogue.c
diff --git a/test_python_variant.sh b/test_server.sh
similarity index 100%
rename from test_python_variant.sh
rename to test_server.sh
-- 
2.30.2