suggestion ENGINE-550
authorVolker Birk <vb@pep-project.org>
Wed, 08 May 2019 16:41:10 +0200
branchENGINE-550
changeset 3653b00047c994f6
parent 3647 1295702dbeaf
suggestion
test/Makefile
     1.1 --- a/test/Makefile	Wed May 08 11:02:18 2019 +0200
     1.2 +++ b/test/Makefile	Wed May 08 16:41:10 2019 +0200
     1.3 @@ -19,41 +19,13 @@
     1.4  DEPS:=$(OBJS:.o=.d)
     1.5  
     1.6  
     1.7 -LDFLAGS+= -L../asn.1 -L../src $(ETPAN_LIB) $(CPPUNIT_LIB)
     1.8 -
     1.9 -ifeq ($(OPENPGP),GPG)
    1.10 -    LDFLAGS+= $(GPGME_LIB)
    1.11 -else ifeq ($(OPENPGP),NETPGP)
    1.12 -    LDFLAGS+= $(NETGPG_LIB)
    1.13 -endif
    1.14 -
    1.15 -
    1.16 -LDLIBS+= -letpan -lpEpEngine -lstdc++ -lasn1 -lcpptest
    1.17 -
    1.18 -ifeq ($(BUILD_FOR),Linux)
    1.19 -    LDLIBS+= -luuid
    1.20 -endif
    1.21 -
    1.22 -ifeq ($(OPENPGP),SEQUOIA)
    1.23 -    LDFLAGS+= $(SEQUOIA_LDFLAGS)
    1.24 -    LDLIBS+= $(SEQUOIA_LIB)
    1.25 -    CXXFLAGS+= $(SEQUOIA_CFLAGS) -DUSE_SEQUOIA
    1.26 -    INC_FLAGS+= $(SEQUOIA_INC)
    1.27 -endif
    1.28 +LDFLAGS+= -L../src $(CPPUNIT_LIB)
    1.29  
    1.30  ifdef SQLITE3_FROM_OS
    1.31      LDLIBS+= -lsqlite3
    1.32  endif
    1.33  
    1.34 -ifeq ($(OPENPGP),GPG)
    1.35 -    #LDLIBS+= -lgpgme
    1.36 -else ifeq ($(OPENPGP),NETPGP)
    1.37 -    LDLIBS+= -lnetpgp
    1.38 -    ifeq ($(BUILD_FOR),Linux)
    1.39 -        LDLIBS+= -ltre
    1.40 -    endif
    1.41 -endif
    1.42 -
    1.43 +LDLIBS+= -Wl,-rpath,../src -lpEpEngine -lstdc++ -lcpptest
    1.44  
    1.45  CXXFLAGS:=$(filter-out -DNDEBUG,$(CXXFLAGS))
    1.46  
    1.47 @@ -68,15 +40,6 @@
    1.48  
    1.49  
    1.50  EXTRA_LIB_PATHS=.:../src:
    1.51 -ifdef ETPAN_LIB
    1.52 -    EXTRA_LIB_PATHS:=$(EXTRA_LIB_PATHS)$(patsubst -L%,%,$(ETPAN_LIB)):
    1.53 -endif
    1.54 -ifdef GPGME_LIB
    1.55 -    EXTRA_LIB_PATHS:=$(EXTRA_LIB_PATHS)$(patsubst -L%,%,$(GPGME_LIB)):
    1.56 -endif
    1.57 -ifdef NETPGP_LIB
    1.58 -    EXTRA_LIB_PATHS:=$(EXTRA_LIB_PATHS)$(patsubst -L%,%,$(NETPGP_LIB)):
    1.59 -endif
    1.60  ifdef CPPUNIT_LIB
    1.61      EXTRA_LIB_PATHS:=$(EXTRA_LIB_PATHS)$(patsubst -L%,%,$(CPPUNIT_LIB)):
    1.62  endif