Makefile fixes sync
authorKrista Bennett <krista@pep.foundation>
Thu, 29 Aug 2019 19:36:13 +0200
branchsync
changeset 402907fffddd4354
parent 4028 5d9532df8f5c
child 4030 ba2eed4caacf
child 4053 a1b219054c9b
Makefile fixes
test/Makefile
     1.1 --- a/test/Makefile	Thu Aug 29 01:01:46 2019 +0200
     1.2 +++ b/test/Makefile	Thu Aug 29 19:36:13 2019 +0200
     1.3 @@ -8,6 +8,7 @@
     1.4  # Presumably can be changed in local.conf by putting this here?
     1.5  GTEST_DIR:=googletest/googletest
     1.6  GTEST_PL_DIR:=googletest/gtest-parallel
     1.7 +GTEST_INC_DIR:=$(GTEST_DIR)/include
     1.8  
     1.9  include ../Makefile.conf
    1.10  
    1.11 @@ -54,7 +55,7 @@
    1.12  CXXFLAGS:=$(filter-out -DNDEBUG,$(CXXFLAGS))
    1.13  
    1.14  # FIXME Possibly missing incdirs: ASN1C_INC
    1.15 -CXXFLAGS+= -I./include -I../sync $(CPPUNIT_INC) $(INC_FLAGS) -Wno-deprecated
    1.16 +CXXFLAGS+= -I./src -I../sync $(CPPUNIT_INC) $(INC_FLAGS) -I$(GTEST_INC_DIR) -Wno-deprecated
    1.17  
    1.18  ifeq ($(OPENPGP),GPG)
    1.19      CXXFLAGS+= -DUSE_GPG $(GPGME_INC)