Browse Source

renamed the binary into pEp-mini-json-adapter, renamed unittest_pep.cc into unittest_pEp.cc

JSON-123
Roker 3 years ago
parent
commit
cc1bae3085
4 changed files with 6 additions and 5 deletions
  1. +5
    -4
      server/Makefile
  2. +1
    -1
      server/Makefile.conf
  3. +0
    -0
      server/mini-adapter-main.cc
  4. +0
    -0
      server/unittest_pEp.cc

+ 5
- 4
server/Makefile View File

@ -29,7 +29,8 @@ ifdef BUILD_CONFIG
$(info ================================================)
endif
NO_SOURCE=main.cc servertest.cc unittest_json.cc unittest_nfc.cc
# These source files shall _not_ be part of the libjson-adapter.a:
NO_SOURCE=mini-adapter-main.cc servertest.cc $(wildcard unittest_*.cc)
ALL_SOURCE=$(filter-out $(NO_SOURCE),$(wildcard json_spirit/*.cpp))
ALL_SOURCE+= prefix-config.cc
@ -84,17 +85,17 @@ endif
.PHONY: all
all: $(TARGET) $(TARGET_TEST) $(TARGET_GTEST)
$(TARGET): main.o libjson-adapter.a
$(TARGET): mini-adapter-main.o libjson-adapter.a
$(CXX) $(CPPFLAGS) $^ $(LDFLAGS) $(LDLIBS) -o $@
$(TARGET)-static: main.o libjson-adapter.a
$(TARGET)-static: mini-adapter-main.o libjson-adapter.a
$(CXX) $(CPPFLAGS) $^ $(LDFLAGS) $(LDLIBS) -static -o $@
$(TARGET_TEST): servertest.o libjson-adapter.a
$(CXX) $(CPPFLAGS) $^ $(LDFLAGS) $(LDLIBS) -o $@
$(TARGET_GTEST): unittest_json.o unittest_nfc.o unittest_decompose.o unittest_rpc.o \
unittest_logger.o unittest_pep.o \
unittest_logger.o unittest_pEp.o \
gtest-all.o gtest_main.o libjson-adapter.a
$(CXX) $(CPPFLAGS) $^ $(LDFLAGS) $(LDLIBS) -o $@


+ 1
- 1
server/Makefile.conf View File

@ -37,7 +37,7 @@ PREFIX=/usr
HTML_DIRECTORY=$(PREFIX)/share/pEp/json-adapter/html
# Filename of the pEp JSON Server Adapter binary
TARGET=pep-json-server
TARGET=pEp-mini-json-adapter
# Filename of the pEp JSON Server Adapter testing binary
TARGET_TEST=servertest


server/main.cc → server/mini-adapter-main.cc View File


server/unittest_pep.cc → server/unittest_pEp.cc View File


Loading…
Cancel
Save