From 3ad820d8dd256d3c2c1a1835ef6361502cf7cdd6 Mon Sep 17 00:00:00 2001
From: Volker Birk <vb@pep-project.org>
Date: Sat, 22 Aug 2015 13:38:55 +0200
Subject: [PATCH] bugfix: renaming some functions

---
 src/Makefile                             | 7 ++++++-
 src/Makefile.conf                        | 2 ++
 src/org_pEp_jniadapter_AbstractEngine.cc | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index a6c0cb6..16a649f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,8 +1,9 @@
 LIBRARY=libpEpJNI.a
+SHARED=libpEpJNI.so
 JAR=jniadapter.jar
 include Makefile.conf
 
-all: $(JAR) $(LIBRARY)
+all: $(JAR) $(SHARED)
 
 JAVA_SOURCES=org/pEp/jniadapter/pEpException.java \
 			 org/pEp/jniadapter/AbstractEngine.java \
@@ -39,6 +40,9 @@ org_pEp_jniadapter_Engine.o org_pEp_jniadapter_Message.o: %.o: %.cc %.h
 $(LIBRARY): org_pEp_jniadapter_AbstractEngine.o org_pEp_jniadapter_Engine.o org_pEp_jniadapter_Message.o throw_pEp_exception.o jniutils.o basic_api.o
 	ar -r $@ *.o
 
+$(SHARED): $(LIBRARY)
+	g++ -shared -o $(SHARED) $(LDFLAGS) -lpEpEngine *.o
+
 org/pEp/jniadapter/pEpException.java: pEp.yml2 gen_java_exceptions.ysl2
 	yml2proc -y gen_java_exceptions.ysl2 $< -o $@
 
@@ -67,6 +71,7 @@ clean:
 	rm -f $(JAR) $(LIBRARY)
 	rm -f *.o
 	rm -f *.class
+	rm -f *.xml *.xsl
 	rm -f org_pEp_jniadapter_*.h
 	rm -f org/pEp/jniadapter/*.class
 	rm -f org/pEp/jniadapter/pEp*.java
diff --git a/src/Makefile.conf b/src/Makefile.conf
index fa335b4..4d7393f 100644
--- a/src/Makefile.conf
+++ b/src/Makefile.conf
@@ -1,2 +1,4 @@
 CXXFLAGS=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I$(HOME)/include
 CLASSPATH=.:$(HOME)/src/k-9/k9mail/src
+LDFLAGS=-L$(HOME)/lib
+SHARED=libpEpJNI.dylib
diff --git a/src/org_pEp_jniadapter_AbstractEngine.cc b/src/org_pEp_jniadapter_AbstractEngine.cc
index 98a3a5c..b480794 100644
--- a/src/org_pEp_jniadapter_AbstractEngine.cc
+++ b/src/org_pEp_jniadapter_AbstractEngine.cc
@@ -13,7 +13,7 @@ extern "C" {
     using namespace pEp::JNIAdapter;
     using namespace pEp::utility;
 
-    JNIEXPORT void JNICALL Java_org_pEp_jniadapter_Engine_init(
+    JNIEXPORT void JNICALL Java_org_pEp_jniadapter_AbstractEngine_init(
             JNIEnv *env,
             jobject me
         )
@@ -43,7 +43,7 @@ extern "C" {
         env->SetLongField(me, handle, _session);
     }
 
-    JNIEXPORT void JNICALL Java_org_pEp_jniadapter_Engine_release(
+    JNIEXPORT void JNICALL Java_org_pEp_jniadapter_AbstractEngine_release(
             JNIEnv *env,
             jobject me
         )