adding "pEp/" to include paths

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 $@

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

src/basic_api.cc

@@ -1,6 +1,6 @@
-#include <keymanagement.h>
+#include <pEp/keymanagement.h>
-#include <blacklist.h>
+#include <pEp/blacklist.h>
-#include <sync.h>
+#include <pEp/sync.h>
 
 #ifndef ANDROID
 #include <string.h>

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 <pEp/message_api.h>
-        #include <blacklist.h>
+        #include <pEp/blacklist.h>
-        #include <openpgp_compat.h>
+        #include <pEp/openpgp_compat.h>
         #include "org_pEp_jniadapter_«@name».h"
         #include "throw_pEp_exception.hh"
         #include "jniutils.hh"

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"

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 {

src/jniutils.hh

@@ -4,9 +4,9 @@
 #include <pthread.h>
 #include <errno.h>
 #include <jni.h>
-#include <stringpair.h>
+#include <pEp/stringpair.h>
-#include <identity_list.h>
+#include <pEp/identity_list.h>
-#include <bloblist.h>
+#include <pEp/bloblist.h>
 
 #if 0 // Enable if log needed
 #include <android/log.h>

src/org_pEp_jniadapter_AbstractEngine.cc

@@ -4,9 +4,9 @@
 #include <unistd.h>
 #include <assert.h>
 #include <pthread.h>
-#include <keymanagement.h>
+#include <pEp/keymanagement.h>
-#include <message_api.h>
+#include <pEp/message_api.h>
-#include <sync.h>
+#include <pEp/sync.h>
 
 #include "throw_pEp_exception.hh"
 #include "jniutils.hh"