diff --git a/src/Makefile b/src/Makefile
index 50be340..730cf18 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -50,8 +50,8 @@ $(LIBRARY): org_pEp_jniadapter_AbstractEngine.o org_pEp_jniadapter_Engine.o org_
 	ar -r $@ *.o
 
 $(SHARED): $(LIBRARY)
-	$(CXX) $(CXXFLAGS) -shared -o $(SHARED) $(LDFLAGS) -lpEpEngine -lpEpAdapter *.o
-
+	$(CXX) $(CXXFLAGS) -shared -o $(SHARED) $(LDFLAGS) -lpEpEngine $(PEP_ADAPTER_OBJECT_LIB)/*.o *.o
+#FIXME ^ use libpEpAdapter.a instad of the bunch of *.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 e5fd198..11fb910 100644
--- a/src/Makefile.conf
+++ b/src/Makefile.conf
@@ -1,3 +1,4 @@
 CXXFLAGS=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin -I$(HOME)/include -fpermissive -DDISABLE_SYNC
 LDFLAGS=-L$(HOME)/lib
 SHARED=libpEpJNI.dylib
+PEP_ADAPTER_OBJECT_LIB=$(HOMEI)/pEp/libpEpAdapter
diff --git a/test/Testing.java b/test/Testing.java
index 913b5c8..8418af6 100644
--- a/test/Testing.java
+++ b/test/Testing.java
@@ -105,7 +105,6 @@ class Testing {
 	System.out.println("TEST DONE - FINISHED");
 
 	try {
-        e.startSync();
 		e.key_reset(null, null);
 	} 
 	catch (pEpException ex) {