From 76adb8c6c1e3f56b1c21b85d0cf78b3032312317 Mon Sep 17 00:00:00 2001
From: Volker Birk <vb@pep.foundation>
Date: Tue, 12 Dec 2017 13:16:54 +0100
Subject: [PATCH] adding "pEp/" to include paths

---
 src/Makefile                             | 2 +-
 src/Makefile.conf                        | 2 +-
 src/basic_api.cc                         | 6 +++---
 src/gen_cpp_Engine.ysl2                  | 6 +++---
 src/gen_cpp_Message.ysl2                 | 2 +-
 src/gen_throw_pEp_exception.ysl2         | 2 +-
 src/jniutils.hh                          | 6 +++---
 src/org_pEp_jniadapter_AbstractEngine.cc | 6 +++---
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index c250520..2226b74 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -46,7 +46,7 @@ $(LIBRARY): org_pEp_jniadapter_AbstractEngine.o org_pEp_jniadapter_Engine.o org_
 	ar -r $@ *.o
 
 $(SHARED): $(LIBRARY)
-	c++ -shared -o $(SHARED) $(LDFLAGS) -lpEpEngine *.o
+	$(CXX) $(CXXFLAGS) -shared -o $(SHARED) $(LDFLAGS) -lpEpEngine *.o
 
 org/pEp/jniadapter/pEpException.java: pEp.yml2 gen_java_exceptions.ysl2
 	yml2proc -y gen_java_exceptions.ysl2 $< -o $@
diff --git a/src/Makefile.conf b/src/Makefile.conf
index f8ecae4..567b8ad 100644
--- a/src/Makefile.conf
+++ b/src/Makefile.conf
@@ -1,3 +1,3 @@
-CXXFLAGS=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I$(HOME)/include -fpermissive
+CXXFLAGS=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin -I$(HOME)/include -fpermissive
 LDFLAGS=-L$(HOME)/lib
 SHARED=libpEpJNI.dylib
diff --git a/src/basic_api.cc b/src/basic_api.cc
index 7b055e2..620973c 100644
--- a/src/basic_api.cc
+++ b/src/basic_api.cc
@@ -1,6 +1,6 @@
-#include <keymanagement.h>
-#include <blacklist.h>
-#include <sync.h>
+#include <pEp/keymanagement.h>
+#include <pEp/blacklist.h>
+#include <pEp/sync.h>
 
 #ifndef ANDROID
 #include <string.h>
diff --git a/src/gen_cpp_Engine.ysl2 b/src/gen_cpp_Engine.ysl2
index 1024f54..dbee5d2 100644
--- a/src/gen_cpp_Engine.ysl2
+++ b/src/gen_cpp_Engine.ysl2
@@ -10,9 +10,9 @@ tstylesheet {
     template "interface" document("org_pEp_jniadapter_{@name}.cc", "text")
         ||
         #include <assert.h>
-        #include <message_api.h>
-        #include <blacklist.h>
-        #include <openpgp_compat.h>
+        #include <pEp/message_api.h>
+        #include <pEp/blacklist.h>
+        #include <pEp/openpgp_compat.h>
         #include "org_pEp_jniadapter_«@name».h"
         #include "throw_pEp_exception.hh"
         #include "jniutils.hh"
diff --git a/src/gen_cpp_Message.ysl2 b/src/gen_cpp_Message.ysl2
index 19fd93b..38b651e 100644
--- a/src/gen_cpp_Message.ysl2
+++ b/src/gen_cpp_Message.ysl2
@@ -16,7 +16,7 @@ tstylesheet {
             #include <stdint.h>
             #include <stdlib.h>
             #include <assert.h>
-            #include <«@name».h>
+            #include <pEp/«@name».h>
 
             #include "jniutils.hh"
             #include "org_pEp_jniadapter_«$jname».h"
diff --git a/src/gen_throw_pEp_exception.ysl2 b/src/gen_throw_pEp_exception.ysl2
index 4efb7d3..1ad6d7e 100644
--- a/src/gen_throw_pEp_exception.ysl2
+++ b/src/gen_throw_pEp_exception.ysl2
@@ -24,7 +24,7 @@ tstylesheet {
     template "namespace"
         ||
         #include <assert.h>
-        #include <pEpEngine.h>
+        #include <pEp/pEpEngine.h>
         #include "throw_pEp_exception.hh"
 
         namespace pEp {
diff --git a/src/jniutils.hh b/src/jniutils.hh
index 6ef4825..f1cd50d 100644
--- a/src/jniutils.hh
+++ b/src/jniutils.hh
@@ -4,9 +4,9 @@
 #include <pthread.h>
 #include <errno.h>
 #include <jni.h>
-#include <stringpair.h>
-#include <identity_list.h>
-#include <bloblist.h>
+#include <pEp/stringpair.h>
+#include <pEp/identity_list.h>
+#include <pEp/bloblist.h>
 
 #if 0 // Enable if log needed
 #include <android/log.h>
diff --git a/src/org_pEp_jniadapter_AbstractEngine.cc b/src/org_pEp_jniadapter_AbstractEngine.cc
index 85ffcf1..08efe9f 100644
--- a/src/org_pEp_jniadapter_AbstractEngine.cc
+++ b/src/org_pEp_jniadapter_AbstractEngine.cc
@@ -4,9 +4,9 @@
 #include <unistd.h>
 #include <assert.h>
 #include <pthread.h>
-#include <keymanagement.h>
-#include <message_api.h>
-#include <sync.h>
+#include <pEp/keymanagement.h>
+#include <pEp/message_api.h>
+#include <pEp/sync.h>
 
 #include "throw_pEp_exception.hh"
 #include "jniutils.hh"