merging
authorVolker Birk <vb@pep.foundation>
Wed, 24 Oct 2018 22:44:54 +0200
changeset 7497a6eaa45278
parent 73 4d07d17201d6
child 75 86d2a06ccd36
merging
Adapter.cc
Makefile
     1.1 --- a/Adapter.cc	Wed Oct 24 20:45:17 2018 +0200
     1.2 +++ b/Adapter.cc	Wed Oct 24 22:44:54 2018 +0200
     1.3 @@ -42,11 +42,6 @@
     1.4  
     1.5          int _inject_sync_event(SYNC_EVENT ev, void *management)
     1.6          {
     1.7 -            if (is_sync_thread(session())) {
     1.8 -                PEP_STATUS status = do_sync_protocol_step(session(), nullptr, ev);
     1.9 -                return status == PEP_STATUS_OK ? 0 : 1;
    1.10 -            }
    1.11 -
    1.12              try {
    1.13                  q.push_front(ev);
    1.14              }
     2.1 --- a/Makefile	Wed Oct 24 20:45:17 2018 +0200
     2.2 +++ b/Makefile	Wed Oct 24 22:44:54 2018 +0200
     2.3 @@ -7,7 +7,7 @@
     2.4  CXXFLAGS += -I$(HOME)/include -std=c++14 -O0 -g
     2.5  
     2.6  SOURCE=$(wildcard *.cc)
     2.7 -HEADERS=$(wildcard *.hh)
     2.8 +HEADERS=$(wildcard *.hh *.hxx)
     2.9  OBJECTS=$(subst .cc,.o,$(SOURCE))
    2.10  WITHOUT_TESTS=$(patsubst test%.o,,$(OBJECTS))
    2.11  
    2.12 @@ -40,9 +40,9 @@
    2.13  	$(CXX) -o $@ -L$(PEP)/lib -lpEpEngine -L. -lpEpAdapter $<
    2.14  
    2.15  install: $(TARGET)
    2.16 -	-mkdir -p $(PEP)/include
    2.17 -	cp $(HEADERS) $(PEP)/include
    2.18 -	cp $(TARGET) $(PEP)/lib
    2.19 +	-mkdir -p $(PEP)/include/pEp
    2.20 +	cp $(HEADERS) $(PEP)/include/pEp/
    2.21 +	cp $(TARGET) $(PEP)/lib/
    2.22  
    2.23  uninstall:
    2.24  	cd $(PEP)/include && rm -f $(HEADERS)