[Pkg-gnupg-commit] [gpgme] 85/412: Cpp: Ensure gpgme.h is taken from current build

Daniel Kahn Gillmor dkg at fifthhorseman.net
Thu Sep 22 21:26:21 UTC 2016


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gpgme.

commit b8de79160b2e05ac84d8feb61ff7ed1f7015a623
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed May 11 14:56:20 2016 +0200

    Cpp: Ensure gpgme.h is taken from current build
    
    * lang/cpp/src/Makefile.am (AM_CPPFLAGS): Add gpgme.h location.
    --
    This fixes the build in case an incompatible gpgme.h is also
    installed in other include locations.
---
 lang/cpp/src/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lang/cpp/src/Makefile.am b/lang/cpp/src/Makefile.am
index 24e0461..d3d28ce 100644
--- a/lang/cpp/src/Makefile.am
+++ b/lang/cpp/src/Makefile.am
@@ -59,7 +59,8 @@ nobase_gpgmeppinclude_HEADERS = $(interface_headers)
 libgpgmepp_la_SOURCES = $(main_sources) $(gpgmepp_headers) context_vanilla.cpp \
                         $(interface_headers) $(private_gpgmepp_headers)
 
-AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ -DBUILDING_GPGMEPP
+AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \
+              -DBUILDING_GPGMEPP
 
 libgpgmepp_la_LIBADD = ../../../src/libgpgme.la @LIBASSUAN_LIBS@
 libgpgmepp_la_LDFLAGS = -version-info \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git



More information about the Pkg-gnupg-commit mailing list