summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2014-07-30 08:43:48 +0900
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2014-07-30 08:43:48 +0900
commit540741dd48d0720876a5e68b2aa4aa7a9d79b8a3 (patch)
tree42a02c8dc12c62090fe406e392c6eb87d2f56cf2
parentee3f0b730ca34aef87915594917adec8fed2f4c2 (diff)
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.
-rw-r--r--src/examples/Makefile.am20
1 files changed, 17 insertions, 3 deletions
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 020f33479..fa8257fed 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -38,7 +38,6 @@ bg_example_01.c \
38bg_example_02.c \ 38bg_example_02.c \
39bg_example_03.c \ 39bg_example_03.c \
40box_example_02.c \ 40box_example_02.c \
41box_cxx_example_02.cc \
42bubble_example_01.c \ 41bubble_example_01.c \
43button_example_00.c \ 42button_example_00.c \
44button_example_01.c \ 43button_example_01.c \
@@ -146,6 +145,11 @@ evas3d_map_example.edc \
146evas3d_map_example.c \ 145evas3d_map_example.c \
147track_example_01.c 146track_example_01.c
148 147
148if HAVE_CXX11
149SRCS += \
150box_cxx_example_02.cc
151endif
152
149.edc.edj: 153.edc.edj:
150 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@ 154 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
151 155
@@ -189,7 +193,6 @@ bg_example_01 \
189bg_example_02 \ 193bg_example_02 \
190bg_example_03 \ 194bg_example_03 \
191box_example_02 \ 195box_example_02 \
192box_cxx_example_02 \
193bubble_example_01 \ 196bubble_example_01 \
194button_example_00 \ 197button_example_00 \
195button_example_01 \ 198button_example_01 \
@@ -290,6 +293,11 @@ evas3d_object_on_button_example \
290evas3d_map_example \ 293evas3d_map_example \
291track_example_01 294track_example_01
292 295
296if HAVE_CXX11
297examples_PROGRAMS += \
298box_cxx_example_02
299endif
300
293if ELEMENTARY_WINDOWS_BUILD 301if ELEMENTARY_WINDOWS_BUILD
294efl_thread_1_SOURCES = efl_thread_win32_1.c 302efl_thread_1_SOURCES = efl_thread_win32_1.c
295efl_thread_2_SOURCES = efl_thread_win32_2.c 303efl_thread_2_SOURCES = efl_thread_win32_2.c
@@ -302,6 +310,7 @@ efl_thread_3_SOURCES = efl_thread_3.c
302efl_thread_4_SOURCES = efl_thread_4.c 310efl_thread_4_SOURCES = efl_thread_4.c
303endif 311endif
304 312
313if HAVE_CXX11
305box_cxx_example_02_SOURCES = box_cxx_example_02.cc 314box_cxx_example_02_SOURCES = box_cxx_example_02.cc
306box_cxx_example_02_CXXFLAGS = \ 315box_cxx_example_02_CXXFLAGS = \
307@ELEMENTARY_ELOCATION_CFLAGS@ \ 316@ELEMENTARY_ELOCATION_CFLAGS@ \
@@ -310,6 +319,7 @@ box_cxx_example_02_CXXFLAGS = \
310@ELEMENTARY_X_CFLAGS@ \ 319@ELEMENTARY_X_CFLAGS@ \
311@ELEMENTARY_CFLAGS@ \ 320@ELEMENTARY_CFLAGS@ \
312@ELEMENTARY_CXX_CFLAGS@ 321@ELEMENTARY_CXX_CFLAGS@
322endif
313 323
314# This variable will hold the list of screenshots that will be made 324# This variable will hold the list of screenshots that will be made
315# by "make screenshots". Each item in the list is of the form: 325# by "make screenshots". Each item in the list is of the form:
@@ -318,7 +328,6 @@ SCREENSHOTS = \
318actionslider_example_01:actionslider_01.png:0.0 \ 328actionslider_example_01:actionslider_01.png:0.0 \
319bg_example_02:bg_01.png:0.0 \ 329bg_example_02:bg_01.png:0.0 \
320box_example_02:box_example_02.png:1.3 \ 330box_example_02:box_example_02.png:1.3 \
321box_cxx_example_02:box_cxx_example_02.png:1.3 \
322bubble_example_01:bubble_example_01.png:0.0 \ 331bubble_example_01:bubble_example_01.png:0.0 \
323button_example_00:button_00.png:0.0 \ 332button_example_00:button_00.png:0.0 \
324button_example_01:button_01.png:0.0 \ 333button_example_01:button_01.png:0.0 \
@@ -396,6 +405,11 @@ table_example_01:table_example_01.png:0.0 \
396table_example_02:table_example_02.png:0.0 \ 405table_example_02:table_example_02.png:0.0 \
397menu_example_01:menu_example_01.png:0.5 406menu_example_01:menu_example_01.png:0.5
398 407
408if HAVE_CXX11
409SCREENSHOTS = \
410box_cxx_example_02:box_cxx_example_02.png:1.3
411endif
412
399HTML_SS_DIR=$(top_builddir)/doc/html/screenshots 413HTML_SS_DIR=$(top_builddir)/doc/html/screenshots
400LATEX_SS_DIR=$(top_builddir)/doc/latex/screenshots 414LATEX_SS_DIR=$(top_builddir)/doc/latex/screenshots
401screenshots: all 415screenshots: all