From 6d59e27c29bcc82834f3575a3c818b67af01a83d Mon Sep 17 00:00:00 2001
From: heck <heck@pep.foundation>
Date: Mon, 14 Feb 2022 15:28:09 +0100
Subject: [PATCH] Build: adds gtest prefix, clean out unused clutter

---
 Makefile.conf      | 17 ++---------------
 local.conf.example |  3 +--
 test/Makefile      |  4 ++--
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/Makefile.conf b/Makefile.conf
index 1cfa6a5..4a802af 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -10,15 +10,11 @@ TARGET=libpEpDatatypes.a
 # Defaults
 DEBUG=1
 PREFIX?=$(HOME)
-ENGINE_LIB_PATH=$(PREFIX)/lib
-ENGINE_INC_PATH=$(PREFIX)/include
+PREFIX_GTEST=/opt/local/
 LANG_VERSION=c++17
 
 CXXFLAGS+=-fPIC
 
-# Build target
-BUILD_FOR:=$(shell uname)
-
 ifneq (,$(findstring g++,$(CXX)))
     CXXFLAGS+=-fdiagnostics-color=always
 else ifneq (,$(findstring clang,$(CXX)))
@@ -37,13 +33,4 @@ else
     CXXFLAGS+=-DNDEBUG=1 -O3
 endif
 
-# Add -L Prefixes to LIB/INC paths,
-# if not already explicitly set in local.conf
-ifndef ENGINE_LIB
-    ENGINE_LIB=-L$(ENGINE_LIB_PATH)
-endif
-ifndef ENGINE_INC
-    ENGINE_INC=-I$(ENGINE_INC_PATH)
-endif
-
-CXXFLAGS += $(ENGINE_INC)
+CXXFLAGS+=-I$(PREFIX)/include
diff --git a/local.conf.example b/local.conf.example
index 1e38464..859fc34 100644
--- a/local.conf.example
+++ b/local.conf.example
@@ -12,5 +12,4 @@
 
 ############# DIRS #############
 # PREFIX=$(HOME)/local
-# ENGINE_LIB_PATH=$(PREFIX)/lib
-# ENGINE_INC_PATH=$(PREFIX)/include
+# PREFIX_GTEST=/opt/local/
\ No newline at end of file
diff --git a/test/Makefile b/test/Makefile
index c51f4c6..6aaab13 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,8 +1,8 @@
 include ../Makefile.conf
 
-LDFLAGS=-L../src $(ENGINE_LIB)
+LDFLAGS=-L../src -L$(PREFIX)/lib -L$(PREFIX_GTEST)/lib
 LDLIBS=-lstdc++ -lpEpEngine -lpEpAdapter
-CXXFLAGS:=-I../src -DENGINE_TEST=$(ENGINE_TEST) $(CXXFLAGS)
+CXXFLAGS:=-I../src $(CXXFLAGS) -I$(PREFIX_GTEST)/include
 
 TEST_SOURCE=$(wildcard *.cc)
 TEST_OBJECTS=$(subst .cc,.o,$(TEST_SOURCE))