Browse Source

merging

sync
Volker Birk 4 years ago
parent
commit
faadeb2741
2 changed files with 4 additions and 9 deletions
  1. +0
    -5
      Adapter.cc
  2. +4
    -4
      Makefile

+ 0
- 5
Adapter.cc View File

@ -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);
}


+ 4
- 4
Makefile View File

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


Loading…
Cancel
Save