[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gnupg-devel
Subject:    [PINENTRY PATCH] fltk: Fix compilation and distcheck errors.
From:       Damien Goutte-Gattat <dgouttegattat () incenp ! org>
Date:       2017-10-29 11:19:39
Message-ID: 20171029111939.21497-1-dgouttegattat () incenp ! org
[Download RAW message or body]

* fltk/Makefile.am (AM_CXXFLAGS): Add -std=c++11 flag.
(pinentry_fltk_SOURCES): Add header files.
(EXTRA_DIST): Add icon files.
* .gitignore: Ignore autoconf-generated files in fltk/.
--

The FLTK pinentry requires C++11 due to the use of std::unique_ptr.

Signed-off-by: Damien Goutte-Gattat <dgouttegattat@incenp.org>
---
 .gitignore       | 2 ++
 fltk/Makefile.am | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index e9d3966..8d709c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,8 @@ doc/Makefile
 doc/pinentry.info
 doc/stamp-vti
 doc/version.texi
+fltk/Makefile.in
+fltk/Makefile
 gtk+-2/Makefile.in
 gtk+-2/Makefile
 gnome3/Makefile.in
diff --git a/fltk/Makefile.am b/fltk/Makefile.am
index 2c9338f..54209f9 100644
--- a/fltk/Makefile.am
+++ b/fltk/Makefile.am
@@ -11,6 +11,11 @@ libcurses =
 endif
 
 AM_CPPFLAGS = $(COMMON_CFLAGS) $(FLTKCXXFLAGS) $(ncurses_include) \
-I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry +AM_CXXFLAGS = -std=c++11
 LDADD = ../pinentry/libpinentry.a ../secmem/libsecmem.a $(COMMON_LIBS) $(LIBCAP) \
$(FLTKLIBS) $(libcurses)  
-pinentry_fltk_SOURCES = main.cxx pinwindow.cxx passwindow.cxx qualitypasswindow.cxx
+pinentry_fltk_SOURCES = main.cxx pinwindow.cxx pinwindow.h \
+			passwindow.cxx passwindow.h \
+			qualitypasswindow.cxx qualitypasswindow.h
+
+EXTRA_DIST = encrypt.xpm icon.xpm
-- 
2.14.1


_______________________________________________
Gnupg-devel mailing list
Gnupg-devel@gnupg.org
http://lists.gnupg.org/mailman/listinfo/gnupg-devel


[prev in list] [next in list] [prev in thread] [next in thread]