eolian_cxx: removes C++ examples when C++11 isn't supported

Summary:
Added HAVE_CXX11 guards to Makefile*.am files for C++ binding to avoid
compilation errors for examples when C++11 isn't supported. This also
disable installation of all EFL CXX pkgconfig files.

Reviewers: cedric, stefan, stefan_schmidt

CC: cedric, savio
Differential Revision: https://phab.enlightenment.org/D831

Signed-off-by: Cedric Bail <cedric.bail@free.fr>

diff --git a/Makefile.am b/Makefile.am
index d18778d75036b59edf13697044c36b38ab6b7776..e8cd55209f4bb60ab0b8fa9dee8186712a6b0b53 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -120,16 +120,11 @@ endif
 
 pkgconfig_DATA += \
 pc/eina.pc \
-pc/eina-cxx.pc \
 pc/eo.pc \
-pc/eo-cxx.pc \
 pc/eolian.pc \
-pc/eolian-cxx.pc \
 pc/eet.pc \
-pc/eet-cxx.pc \
 pc/evas.pc \
 pc/ecore.pc \
-pc/ecore-cxx.pc \
 pc/ecore-con.pc \
 pc/ecore-ipc.pc \
 pc/ecore-file.pc \
@@ -146,11 +141,20 @@ pc/efreet.pc \
 pc/efreet-mime.pc \
 pc/efreet-trash.pc \
 pc/edje.pc \
-pc/edje-cxx.pc \
 pc/emotion.pc \
 pc/ethumb.pc \
-pc/ethumb_client.pc \
-pc/evas-cxx.pc
+pc/ethumb_client.pc
+
+if HAVE_CXX11
+pkgconfig_DATA += \
+pc/eina-cxx.pc \
+pc/evas-cxx.pc \
+pc/ecore-cxx.pc \
+pc/eolian-cxx.pc \
+pc/edje-cxx.pc \
+pc/eet-cxx.pc \
+pc/eo-cxx.pc
+endif
 
 if BUILD_ENGINE_SOFTWARE_X11
 pkgconfig_DATA += pc/evas-software-x11.pc

diff --git a/src/Makefile.am b/src/Makefile.am
index a4d0a69232b55d3b048a86ccb129225bf5e19ff3..41fc0d31b81c193936cd30821ea69b9986a1c224 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -91,7 +91,6 @@ benchmark: all-am
 
 EXAMPLES_SUBDIRS = \
 examples/eina \
-examples/eina_cxx \
 examples/eo \
 examples/eet \
 examples/evas \
@@ -102,11 +101,18 @@ examples/eldbus \
 examples/ephysics \
 examples/edje \
 examples/emotion \
-examples/ethumb_client \
+examples/ethumb_client
+
+if HAVE_CXX11
+EXAMPLES_SUBDIRS += \
+examples/eina_cxx \
 examples/eolian_cxx
+endif
+
 if ALWAYS_BUILD_EXAMPLES
 SUBDIRS += . $(EXAMPLES_SUBDIRS)
 endif
+
 DIST_SUBDIRS += $(EXAMPLES_SUBDIRS)
 
 examples: all-am

diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am
index 4cd212d0bc278405478c82f0b06d02bc546d70df..e53e24d4d0eecf08c5b5f4488188afc3deff9034 100644 (file)
--- a/src/examples/evas/Makefile.am
+++ b/src/examples/evas/Makefile.am
@@ -206,6 +206,8 @@ evas_aspect_hints_SOURCES = evas-aspect-hints.c
 evas_aspect_hints_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
 evas_aspect_hints_LDADD = $(EDJE_COMMON_LDADD)
 
+if HAVE_CXX11
+
 EXTRA_PROGRAMS += evas_cxx_rectangle
 evas_cxx_rectangle_SOURCES = evas_cxx_rectangle.cc
 evas_cxx_rectangle_LDADD = $(ECORE_EVAS_COMMON_LDADD)
@@ -218,6 +220,8 @@ evas_cxx_rectangle_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS) \
 -I$(top_builddir)/src/bindings/evas_cxx \
 $(AM_CPPFLAGS) @EVAS_CFLAGS@
 
+endif
+
 EDJS = $(EDCS:%.edc=%.edj)
 
 SRCS = \