From bf69057e72914dfcdecd68bfa0c484e8d1fab514 Mon Sep 17 00:00:00 2001
From: heck <heck@pep.foundation>
Date: Tue, 25 Jan 2022 17:06:24 +0100
Subject: [PATCH] Build: Change build config to adhere to standard for all
 adapters

The idea is to avoid depending to n locations for n dependencies. Install everything into a $PREFIX, and depend to $PREFIX only. simple.
---
 Makefile.conf                                 | 13 ++---------
 local.conf.example                            | 10 ---------
 src/Makefile                                  |  4 ----
 .../pEp/jniadapter/test/Makefile.conf         | 22 +++++++++----------
 .../jniadapter/test/speedtest/speedtest.sh    |  6 ++---
 5 files changed, 16 insertions(+), 39 deletions(-)

diff --git a/Makefile.conf b/Makefile.conf
index adf9ca8..19833a4 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -16,10 +16,6 @@ PREFIX=$(HOME)
 YML2_PATH=$(PREFIX)/src/yml2
 YML2_PROC=$(YML2_PATH)/yml2proc $(YML2_OPTS)
 YML2_OPTS=--encoding=utf8
-ENGINE_LIB_PATH=$(PREFIX)/lib
-ENGINE_INC_PATH=$(PREFIX)/include
-AD_LIB_PATH=$(PREFIX)/lib
-AD_INC_PATH=$(PREFIX)/include
 
 
 ### Guessing JAVA_HOME
@@ -38,11 +34,6 @@ else
 endif
 
 ### Apply config
-ENGINE_LIB=-L$(ENGINE_LIB_PATH)
-ENGINE_INC=-I$(ENGINE_INC_PATH)
-AD_LIB=-L$(AD_LIB_PATH)
-AD_INC=-I$(AD_INC_PATH)
-
 ifndef JAVA_HOME
     $(error JAVA_HOME is not set!)
 endif
@@ -61,8 +52,8 @@ endif
 JAVA_BIN_DIR=$(JAVA_HOME)/bin
 
 ######### C and C++ #########
-CXXFLAGS+=-O0 -std=c++11 -fpermissive -fPIC -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(PLATFORM) $(AD_INC) $(ENGINE_INC)
-LDFLAGS+=-shared $(ENGINE_LIB) $(AD_LIB)
+CXXFLAGS+=-O0 -std=c++11 -fpermissive -fPIC -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(PLATFORM) -I$(PREFIX)/include -I$(PREFIX)/include/pEp
+LDFLAGS+=-shared -L$(PREFIX)/lib
 LDLIBS=-lstdc++ -lpEpEngine -lpEpAdapter
 ifneq (,$(findstring g++,$(CXX)))
     CXXFLAGS+=-fdiagnostics-color=always
diff --git a/local.conf.example b/local.conf.example
index 6cc3be8..160d5d3 100644
--- a/local.conf.example
+++ b/local.conf.example
@@ -18,13 +18,3 @@
 
 ############ YML2 ##############
 # YML2_PATH=$(HOME)/src/yml2
-
-########### Engine #############
-# ENGINE_LIB_PATH=$(PREFIX)/lib
-# ENGINE_INC_PATH=$(PREFIX)/include
-
-########## libAdapter ##########
-# AD_LIB_PATH=$(PREFIX)/lib
-# AD_INC_PATH=$(PREFIX)/include
-
-
diff --git a/src/Makefile b/src/Makefile
index e651e5f..ee68c4d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -34,10 +34,6 @@ $(info DEBUG:           $(DEBUG))
 $(info CXX:             $(CXX))
 $(info JAVA_HOME:       $(JAVA_HOME))
 $(info USE_JAVAH:       $(USE_JAVAH))
-$(info ENGINE_LIB_PATH: $(ENGINE_LIB_PATH))
-$(info ENGINE_INC_PATH: $(ENGINE_INC_PATH))
-$(info AD_LIB_PATH:     $(AD_LIB_PATH))
-$(info AD_INC_PATH:     $(AD_INC_PATH))
 $(info YML2_PATH:       $(YML2_PATH))
 $(info CXXFLAGS:        $(CXXFLAGS))
 $(info LDFLAGS:         $(LDFLAGS))
diff --git a/test/java/foundation/pEp/jniadapter/test/Makefile.conf b/test/java/foundation/pEp/jniadapter/test/Makefile.conf
index 4fadee3..2eb7f3b 100644
--- a/test/java/foundation/pEp/jniadapter/test/Makefile.conf
+++ b/test/java/foundation/pEp/jniadapter/test/Makefile.conf
@@ -34,15 +34,15 @@ JAVA_CLASSES+=$(UTIL_CLASSES)
 
 PITYTEST_DIR=../../../pitytest
 
-ifdef ENGINE_LIB_PATH
-	ifeq ($(PLATFORM),linux)
-	  ifndef LD_LIBRARY_PATH
-	    export LD_LIBRARY_PATH=$(ENGINE_LIB_PATH)
-	  endif
-	else ifeq ($(PLATFORM),darwin)
-	  ifndef DYLD_LIBRARY_PATH
-	    export DYLD_LIBRARY_PATH=$(ENGINE_LIB_PATH)
-	  endif
-	endif
-endif
+# ifdef ENGINE_LIB_PATH
+# 	ifeq ($(PLATFORM),linux)
+# 	  ifndef LD_LIBRARY_PATH
+# 	    export LD_LIBRARY_PATH=$(ENGINE_LIB_PATH)
+# 	  endif
+# 	else ifeq ($(PLATFORM),darwin)
+# 	  ifndef DYLD_LIBRARY_PATH
+# 	    export DYLD_LIBRARY_PATH=$(ENGINE_LIB_PATH)
+# 	  endif
+# 	endif
+# endif
 
diff --git a/test/java/foundation/pEp/jniadapter/test/speedtest/speedtest.sh b/test/java/foundation/pEp/jniadapter/test/speedtest/speedtest.sh
index 4f4fd65..9eef6cf 100755
--- a/test/java/foundation/pEp/jniadapter/test/speedtest/speedtest.sh
+++ b/test/java/foundation/pEp/jniadapter/test/speedtest/speedtest.sh
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-ENGINE_LIB_PATH=$HOME/local-default/lib
+PREFIX=$HOME/local
 
 export HOME=../resources/per-user-dirs/alice
-export LD_LIBRARY_PATH=$ENGINE_LIB_PATH
-export DYLD_LIBRARY_PATH=$ENGINE_LIB_PATH
+export LD_LIBRARY_PATH=$PREFIX/lib
+export DYLD_LIBRARY_PATH=$PREFIX/lib
 
 cd ../../../../../
 java -enableassertions -Xcheck:jni -cp .:../../src -Djava.library.path=.:../../src foundation.pEp.jniadapter.test.speedtest.SpeedTest $@