From 110598780b96829a9ee26de26cbca4dd66395b3e Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Tue, 16 May 2017 21:02:52 +0200
Subject: [PATCH] Makefile update (input cleaned) + global makefile

---
 Makefile       | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 plane/Makefile |  4 ++--
 sgca/Makefile  |  8 ++++----
 3 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..7eeb330
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,47 @@
+
+default:
+	@echo "install - will compile and create executables";
+	@echo "clean   - will remove executables and clean";
+
+
+
+install-sgca:
+	@echo "(1) Compiling SGCA";
+	@make --directory=./sgca > /dev/null;
+
+install-plane:
+	@echo "(2) Compiling PLANE";
+	@make --directory=./plane > /dev/null;
+
+link-sgca:
+	@echo "(3) Linking SGCA executable";
+	@ln -fs ./sgca/boot x-sgca;
+
+link-plane:
+	@echo "(4) Linking PLANE executable";
+	@ln -fs ./plane/boot x-plane;
+
+link-viewTerm:
+	@echo "(4) Linking VIEW TERMINAL executable";
+	@echo -e "#!/bin/bash\n\njava -jar ./viewTerm/viewTerm.jar;\n" > ./x-viewTerm;
+	@chmod ug+x ./x-viewTerm;
+
+link-ctrlTerm:
+	@echo "(5) Linking CTRL TERMINAL executable";
+	@echo -e "#!/bin/bash\n\njava -jar ./ctrlTerm/commandTerm.jar;\n" > ./x-ctrlTerm;
+	@chmod ug+x ./x-ctrlTerm;
+
+
+install: install-sgca install-plane link-sgca link-plane link-viewTerm link-ctrlTerm
+	@echo;
+	@echo "*** Executables created:";
+	@ls -a . | grep -P "^x-*" | sed 's/^x-/  (*) x-/';
+
+
+clean:
+	@find ./x-sgca     > /dev/null 2>&1 && rm ./x-sgca     || return 0;
+	@find ./x-plane    > /dev/null 2>&1 && rm ./x-plane    || return 0;
+	@find ./x-viewTerm > /dev/null 2>&1 && rm ./x-viewTerm || return 0;
+	@find ./x-ctrlTerm > /dev/null 2>&1 && rm ./x-ctrlTerm || return 0;
+	@make clean --directory=./sgca  > /dev/null;
+	@make clean --directory=./plane > /dev/null;
\ No newline at end of file
diff --git a/plane/Makefile b/plane/Makefile
index de56c35..566baf4 100644
--- a/plane/Makefile
+++ b/plane/Makefile
@@ -23,5 +23,5 @@ all: clean boot
 
 # cleans the compiled files
 clean:
-	find ./lib/network/**/*.o && rm ./lib/network/**/*.o || return 0;
-	find boot && rm boot || return 0;
+	@find ./lib/network/**/*.o >/dev/null 2>&1 && rm ./lib/network/**/*.o || return 0;
+	@find ./boot               >/dev/null 2>&1 && rm ./boot               || return 0;
diff --git a/sgca/Makefile b/sgca/Makefile
index 544119e..284be0c 100644
--- a/sgca/Makefile
+++ b/sgca/Makefile
@@ -35,7 +35,7 @@ all: clean boot
 
 # cleans the compiled files
 clean:
-	find lib/network/*.o && rm lib/network/*.o || return 0;
-	find lib/network/**/*.o && rm lib/network/**/*.o || return 0;
-	find lib/local/*.o && rm lib/local/*.o || return 0;
-	find boot && rm boot || return 0;
+	@find lib/network/*.o    >/dev/null 2>&1 && rm lib/network/*.o    || return 0;
+	@find lib/network/**/*.o >/dev/null 2>&1 && rm lib/network/**/*.o || return 0;
+	@find lib/local/*.o      >/dev/null 2>&1 && rm lib/local/*.o      || return 0;
+	@find boot               >/dev/null 2>&1 && rm boot               || return 0;