|
|
|
@ -213,12 +213,10 @@ GPG_CMD:=$(shell gpgconf --list-components | awk -F: '/^gpg:/ { print $$3; exit |
|
|
|
OPENPGP=GPG |
|
|
|
|
|
|
|
# Sequoia-specific variables
|
|
|
|
ifeq ($(OPENPGP),SEQUOIA) |
|
|
|
SEQUOIA_CFLAGS:=$(shell pkg-config --cflags-only-other sequoia) |
|
|
|
SEQUOIA_LDFLAGS:=$(shell pkg-config --libs-only-L --libs-only-other sequoia) |
|
|
|
SEQUOIA_LIB:=$(shell pkg-config --libs-only-l sequoia) |
|
|
|
SEQUOIA_INC:=$(shell pkg-config --cflags-only-I sequoia) |
|
|
|
endif |
|
|
|
SEQUOIA_CFLAGS= |
|
|
|
SEQUOIA_LDFLAGS= |
|
|
|
SEQUOIA_LIB= |
|
|
|
SEQUOIA_INC= |
|
|
|
|
|
|
|
# libGPGME filename
|
|
|
|
ifeq ($(BUILD_FOR),Linux) |
|
|
|
@ -244,6 +242,7 @@ NETPGP_INC= |
|
|
|
#NETPGP_INC=-I$(HOME)/include
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
######### CppUnit #########
|
|
|
|
# CppUnit library search flag
|
|
|
|
CPPUNIT_LIB= |
|
|
|
@ -278,5 +277,15 @@ ifdef BUILD_CONFIG |
|
|
|
include $(BUILD_CONFIG) |
|
|
|
endif |
|
|
|
|
|
|
|
######### Post processing assignments ########
|
|
|
|
ifeq ($(OPENPGP),SEQUOIA) |
|
|
|
SEQUOIA_CFLAGS=$(shell pkg-config --cflags-only-other sequoia-openpgp) |
|
|
|
SEQUOIA_LDFLAGS=$(shell pkg-config --libs-only-l --libs-only-other sequoia-openpgp) |
|
|
|
SEQUOIA_LIB=$(shell pkg-config --libs-only-L sequoia-openpgp) |
|
|
|
SEQUOIA_INC=$(shell pkg-config --cflags-only-I sequoia-openpgp) |
|
|
|
CFLAGS+= $(SEQUOIA_CFLAGS) |
|
|
|
LD_FLAGS+= $(SEQUOIA_LDFLAGS) |
|
|
|
endif |
|
|
|
|
|
|
|
# YML_PATH is needed in the environment of every call to a program of the YML2 distribution
|
|
|
|
export YML_PATH=$(YML2_PATH) |
