felipealmeida pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=540741dd48d0720876a5e68b2aa4aa7a9d79b8a3
commit 540741dd48d0720876a5e68b2aa4aa7a9d79b8a3
Author: Felipe Magno de Almeida <fel...@expertisesolutions.com.br>
Date: Wed Jul 30 08:43:48 2014 +0900
Fixed trying compiling C++ examples with --disable-c++11
The Makefile.am in examples weren't conditioning the compilation of
C++ examples when C++ is disabled in configuration of elementary.
Which made the compilation to fail when --disable-c++11 is
used (in EFL or elementary) on C++ examples.
---
src/examples/Makefile.am | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 020f334..fa8257f 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -38,7 +38,6 @@ bg_example_01.c \
bg_example_02.c \
bg_example_03.c \
box_example_02.c \
-box_cxx_example_02.cc \
bubble_example_01.c \
button_example_00.c \
button_example_01.c \
@@ -146,6 +145,11 @@ evas3d_map_example.edc \
evas3d_map_example.c \
track_example_01.c
+if HAVE_CXX11
+SRCS += \
+box_cxx_example_02.cc
+endif
+
.edc.edj:
$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
@@ -189,7 +193,6 @@ bg_example_01 \
bg_example_02 \
bg_example_03 \
box_example_02 \
-box_cxx_example_02 \
bubble_example_01 \
button_example_00 \
button_example_01 \
@@ -290,6 +293,11 @@ evas3d_object_on_button_example \
evas3d_map_example \
track_example_01
+if HAVE_CXX11
+examples_PROGRAMS += \
+box_cxx_example_02
+endif
+
if ELEMENTARY_WINDOWS_BUILD
efl_thread_1_SOURCES = efl_thread_win32_1.c
efl_thread_2_SOURCES = efl_thread_win32_2.c
@@ -302,6 +310,7 @@ efl_thread_3_SOURCES = efl_thread_3.c
efl_thread_4_SOURCES = efl_thread_4.c
endif
+if HAVE_CXX11
box_cxx_example_02_SOURCES = box_cxx_example_02.cc
box_cxx_example_02_CXXFLAGS = \
@ELEMENTARY_ELOCATION_CFLAGS@ \
@@ -310,6 +319,7 @@ box_cxx_example_02_CXXFLAGS = \
@ELEMENTARY_X_CFLAGS@ \
@ELEMENTARY_CFLAGS@ \
@ELEMENTARY_CXX_CFLAGS@
+endif
# This variable will hold the list of screenshots that will be made
# by "make screenshots". Each item in the list is of the form:
@@ -318,7 +328,6 @@ SCREENSHOTS = \
actionslider_example_01:actionslider_01.png:0.0 \
bg_example_02:bg_01.png:0.0 \
box_example_02:box_example_02.png:1.3 \
-box_cxx_example_02:box_cxx_example_02.png:1.3 \
bubble_example_01:bubble_example_01.png:0.0 \
button_example_00:button_00.png:0.0 \
button_example_01:button_01.png:0.0 \
@@ -396,6 +405,11 @@ table_example_01:table_example_01.png:0.0 \
table_example_02:table_example_02.png:0.0 \
menu_example_01:menu_example_01.png:0.5
+if HAVE_CXX11
+SCREENSHOTS = \
+box_cxx_example_02:box_cxx_example_02.png:1.3
+endif
+
HTML_SS_DIR=$(top_builddir)/doc/html/screenshots
LATEX_SS_DIR=$(top_builddir)/doc/latex/screenshots
screenshots: all
--
