From 23a96591dd1160c4a2bc6539ea7852035a6c8479 Mon Sep 17 00:00:00 2001
From: Matthew Ellison <m_ellison@ymail.com>
Date: Mon, 30 Apr 2018 00:56:51 -0400
Subject: [PATCH] Updated for Vigenere and having the libraries in another
 directory

---
 makefile | 67 ++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 46 insertions(+), 21 deletions(-)

diff --git a/makefile b/makefile
index fe93fcd..88edc52 100644
--- a/makefile
+++ b/makefile
@@ -1,41 +1,66 @@
 #For Linux
-LinuxAll: libCaesar.a libPlayfair.a Ciphers
-LinuxTest: libCaesar.a libPlayfair.a CiphersTest
+LinuxAll: libCaesar.a libPlayfair.a libVigenere.a Ciphers
+LinuxTest: libCaesar.a libPlayfair.a libVigenere.a CiphersTest
 LinuxDebug: CiphersDBG
 
 #For Windows
-WindowsAll: libCaesar.lib libPlayfair.lib Ciphers.exe
-WindowsTest: libCaesar.lib libPlayfair.lib CiphersTest.exe
+WindowsAll: libCaesar.lib libPlayfair.lib libVigenere.lib Ciphers.exe
+WindowsTest: libCaesar.lib libPlayfair.lib libVigenere.lib CiphersTest.exe
 WindowsDebug: CipherDBG.exe
 
-libCaesar.a: SourceFiles/Caesar.cpp
-	$(CXX) -shared -std=c++11 -O3 -fPIC -o $@ $<
 
-libPlayfair.a: SourceFiles/Playfair.cpp
-	$(CXX) -shared -std=c++11 -O3 -fPIC -o $@ $<
+directory:
+	mkdir -p lib
 
-Ciphers: main.cpp
-	$(CXX) -O3 -std=c++11 -o $@ $< -L ./ -lCaesar -lPlayfair
+#Linux
+libCaesar.a: SourceFiles/Caesar.cpp directory
+	$(CXX) -shared -std=c++11 -O3 -fPIC -o lib/$@ SourceFiles/Caesar.cpp
+
+libPlayfair.a: SourceFiles/Playfair.cpp directory
+	$(CXX) -shared -std=c++11 -O3 -fPIC -o lib/$@ SourceFiles/Playfair.cpp
+
+libVigenere.a: SourceFiles/Vigenere.cpp directory
+	$(CXX) -shared -std=c++11 -O3 -fPIC -o lib/$@ SourceFiles/Vigenere.cpp
+
+Ciphers: main.cpp helperFunctions.hpp
+	$(CXX) -O3 -std=c++11 -o $@ main.cpp -L ./lib -lCaesar -lPlayfair -lVigenere
 
 CiphersTest: main.cpp
-	$(CXX) -O3 -std=c++11 -DTEST_VERSION -o Ciphers $< -L ./ -lCaesar -lPlayfair
+	$(CXX) -O3 -std=c++11 -DTEST_VERSION -o Ciphers $< -L ./lib -lCaesar -lPlayfair -lVigenere
 
 CiphersDBG: main.cpp SourceFiles/Caesar.cpp SourceFiles/Playfair.cpp
 	$(CXX) -O3 -std=c++11 -g -DTEST_VERSION -o $@ $<
 
 
-#Linux
-libCaesar.lib: SourceFiles/Caesar.cpp
-	g++ -shared -std=c++11 -O3 -fPIC -o $@ $<
+#Windows
 
-libPlayfair.lib: SourceFiles/Caesar.cpp
-	g++ -shared -std=c++11 -O3 -fPIC -o $@ $<
+libCaesar.lib: SourceFiles/Caesar.cpp directory
+	g++ -shared -std=c++11 -O3 -fPIC -o lib/$@ SourceFiles/Caesar.cpp
 
-Ciphers.exe: main.cpp
-	g++ -std=c++11 -O3 -o $@ $< -L ./ -llibCaesar -llibPlayfair
+libPlayfair.lib: SourceFiles/Playfair.cpp directory
+	g++ -shared -std=c++11 -O3 -fPIC -o lib/$@ SourceFiles/Playfair.cpp
+
+libVigenere.lib: SourceFiles/Vigenere.cpp directory
+	$(CXX) -shared -std=c++11 -O3 -fPIC -o lib/$@ SourceFiles/Vigenere.cpp
+
+Ciphers.exe: main.cpp helperFunctions.hpp
+	g++ -std=c++11 -O3 -o $@ main.cpp -L ./lib -llibCaesar -llibPlayfair -llibVigenere
 
 CiphersTest.exe: main.cpp
-	g++ -std=c++11 -O3 -DTEST_VERSION -o Ciphers.exe $< -L ./ -llibCaesar -llibPlayfair
+	g++ -std=c++11 -O3 -DTEST_VERSION -o Ciphers.exe $< -L ./lib -llibCaesar -llibPlayfair -llibVigenere
 
-CiphersDBG.exe: main.cpp
-	g++ -std=c++11 -O3 -g -DTEST_VERSION -o $@ $< SourceFiles/Caesar.cpp SourceFiles/Playfair.cpp
+CiphersDBG.exe: main.cpp SourceFiles/Caesar.cpp SourceFiles/Playfair.cpp SourceFiles/Vigenere.cpp
+	g++ -std=c++11 -O3 -g -DTEST_VERSION -o $@ main.cpp SourceFiles/Caesar.cpp SourceFiles/Playfair.cpp SourceFiles/Vigenere.cpp
+
+
+#Cleaning Shop
+.PHONY: cleanLinux
+.PHONY: cleanWindows
+
+#Linux Remove
+cleanLinux:
+	rm -f lib/*.a Ciphers CiphersDBG
+
+#Windows Remove
+cleanWindows:
+	rm -f lib/*.lib Ciphers.exe CiphersDBG.exe