Browse Source

cleanup build, and add test/ dir

sync
heck 2 years ago
parent
commit
bb8e9b3161
5 changed files with 24 additions and 12 deletions
  1. +7
    -10
      Makefile
  2. +2
    -2
      Makefile.conf
  3. +15
    -0
      test/Makefile
  4. +0
    -0
      test/test_adapter.cc
  5. +0
    -0
      test/test_library.cc

+ 7
- 10
Makefile View File

@ -22,23 +22,20 @@ endif
SOURCE=$(wildcard *.cc)
HEADERS=$(wildcard *.hh *.hxx)
OBJECTS=$(subst .cc,.o,$(SOURCE))
WITHOUT_TESTS=$(patsubst test%.o,,$(OBJECTS))
TARGET=libpEpAdapter.a
all: $(TARGET)
$(TARGET): $(WITHOUT_TESTS)
$(TARGET): $(OBJECTS)
$(AR) -rc $@ $^
clean:
rm -vf $(TARGET) $(OBJECTS) *.a test_adapter test_library lib
rm -rvf test_adapter.dSYM
rm -rvf test_library.dSYM
rm -rvf .gnupg/
rm -vf .pEp_management.db*
distclean: clean
rm -Rvf .gnupg .pEp_management*
rm -vf $(TARGET) $(OBJECTS)
# rm -rvf .gnupg/
# rm -vf .pEp_management.db*
# distclean: clean
# rm -Rvf .gnupg .pEp_management*
install: $(TARGET)
mkdir -p $(PREFIX)/include/pEp


+ 2
- 2
Makefile.conf View File

@ -11,8 +11,8 @@ BUILD_FOR:=$(shell uname)
PREFIX=$(HOME)
######### C and C++ #########
LDFLAGS=-L. $(ENGINE_LIB)
LDLIBS=-lstdc++ -lpEpEngine -lpEpAdapter
#LDFLAGS=-L. $(ENGINE_LIB)
#LDLIBS=-lstdc++ -lpEpEngine -lpEpAdapter
CXXFLAGS=-std=c++11
######### C++ #########


+ 15
- 0
test/Makefile View File

@ -0,0 +1,15 @@
include ../Makefile.conf
LDFLAGS=-L../ $(ENGINE_LIB)
LDLIBS=-lstdc++ -lpEpEngine -lpEpAdapter
CXXFLAGS+=-I../
all: test_adapter test_library
test_adapter: ../libpEpAdapter.a
clean:
rm -vf test_adapter
rm -rvf test_adapter.dSYM
rm -vf test_library
rm -rvf test_library.dSYM

test_adapter.cc → test/test_adapter.cc View File


test_library.cc → test/test_library.cc View File


Loading…
Cancel
Save