From faadeb2741998a9119f2e7a68d72f95421f855fa Mon Sep 17 00:00:00 2001
From: Volker Birk <vb@pep.foundation>
Date: Wed, 24 Oct 2018 22:44:54 +0200
Subject: [PATCH] merging

---
 Adapter.cc | 5 -----
 Makefile   | 8 ++++----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Adapter.cc b/Adapter.cc
index 022b33e..4d61c08 100644
--- a/Adapter.cc
+++ b/Adapter.cc
@@ -42,11 +42,6 @@ namespace pEp {
 
         int _inject_sync_event(SYNC_EVENT ev, void *management)
         {
-            if (is_sync_thread(session())) {
-                PEP_STATUS status = do_sync_protocol_step(session(), nullptr, ev);
-                return status == PEP_STATUS_OK ? 0 : 1;
-            }
-
             try {
                 q.push_front(ev);
             }
diff --git a/Makefile b/Makefile
index 22568ce..e99669d 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ include Makefile.conf
 CXXFLAGS += -I$(HOME)/include -std=c++14 -O0 -g
 
 SOURCE=$(wildcard *.cc)
-HEADERS=$(wildcard *.hh)
+HEADERS=$(wildcard *.hh *.hxx)
 OBJECTS=$(subst .cc,.o,$(SOURCE))
 WITHOUT_TESTS=$(patsubst test%.o,,$(OBJECTS))
 
@@ -40,9 +40,9 @@ test_library: test_library.o $(TARGET)
 	$(CXX) -o $@ -L$(PEP)/lib -lpEpEngine -L. -lpEpAdapter $<
 
 install: $(TARGET)
-	-mkdir -p $(PEP)/include
-	cp $(HEADERS) $(PEP)/include
-	cp $(TARGET) $(PEP)/lib
+	-mkdir -p $(PEP)/include/pEp
+	cp $(HEADERS) $(PEP)/include/pEp/
+	cp $(TARGET) $(PEP)/lib/
 
 uninstall:
 	cd $(PEP)/include && rm -f $(HEADERS)