Assign sequoia vars make-cleanup
authorKrista 'DarthMama' Bennett <krista@pep.foundation>
Mon, 01 Apr 2019 22:29:08 +0200
branchmake-cleanup
changeset 3428ca6dc81d3f7f
parent 3427 be87288f5391
child 3429 dd27a08888aa
Assign sequoia vars
Makefile.conf
     1.1 --- a/Makefile.conf	Mon Apr 01 21:16:34 2019 +0200
     1.2 +++ b/Makefile.conf	Mon Apr 01 22:29:08 2019 +0200
     1.3 @@ -213,12 +213,10 @@
     1.4  OPENPGP=GPG
     1.5  
     1.6  # Sequoia-specific variables
     1.7 -ifeq ($(OPENPGP),SEQUOIA)
     1.8 -    SEQUOIA_CFLAGS:=$(shell pkg-config --cflags-only-other sequoia)
     1.9 -    SEQUOIA_LDFLAGS:=$(shell pkg-config --libs-only-L --libs-only-other sequoia)
    1.10 -    SEQUOIA_LIB:=$(shell pkg-config --libs-only-l sequoia)
    1.11 -    SEQUOIA_INC:=$(shell pkg-config --cflags-only-I sequoia)
    1.12 -endif
    1.13 +SEQUOIA_CFLAGS=
    1.14 +SEQUOIA_LDFLAGS=
    1.15 +SEQUOIA_LIB=
    1.16 +SEQUOIA_INC=
    1.17  
    1.18  # libGPGME filename
    1.19  ifeq ($(BUILD_FOR),Linux)
    1.20 @@ -244,6 +242,7 @@
    1.21  #NETPGP_INC=-I$(HOME)/include
    1.22  
    1.23  
    1.24 +
    1.25  ######### CppUnit #########
    1.26  # CppUnit library search flag
    1.27  CPPUNIT_LIB=
    1.28 @@ -278,5 +277,15 @@
    1.29      include $(BUILD_CONFIG)
    1.30  endif
    1.31  
    1.32 +######### Post processing assignments ########
    1.33 +ifeq ($(OPENPGP),SEQUOIA)
    1.34 +    SEQUOIA_CFLAGS=$(shell pkg-config --cflags-only-other sequoia-openpgp)
    1.35 +    SEQUOIA_LDFLAGS=$(shell pkg-config --libs-only-l --libs-only-other sequoia-openpgp)
    1.36 +    SEQUOIA_LIB=$(shell pkg-config --libs-only-L sequoia-openpgp)
    1.37 +    SEQUOIA_INC=$(shell pkg-config --cflags-only-I sequoia-openpgp)
    1.38 +    CFLAGS+= $(SEQUOIA_CFLAGS)
    1.39 +    LD_FLAGS+= $(SEQUOIA_LDFLAGS)
    1.40 +endif
    1.41 +
    1.42  # YML_PATH is needed in the environment of every call to a program of the YML2 distribution
    1.43  export YML_PATH=$(YML2_PATH)