Dont install c++ headers of bindings when --disable-c++11 is used.

diff --git a/src/Makefile_Ecore_Cxx.am b/src/Makefile_Ecore_Cxx.am
index 63f3cfc..eb06789 100644 (file)
--- a/src/Makefile_Ecore_Cxx.am
+++ b/src/Makefile_Ecore_Cxx.am
@@ -1,11 +1,11 @@
 
 ### Library
 
+if HAVE_CXX11
+
 installed_ecorecxxmainheadersdir = $(includedir)/ecore-cxx-@VMAJ@
 dist_installed_ecorecxxmainheaders_DATA = bindings/ecore_cxx/Ecore.hh
 
-if HAVE_CXX11
-
 generated_ecore_cxx_bindings = \
 lib/ecore/ecore_poll.eo.hh \
 lib/ecore/ecore_job.eo.hh \
@@ -27,12 +27,10 @@ lib/ecore/Ecore.eo.hh:
        @for i in $(generated_ecore_cxx_bindings); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh; done
        @echo -e "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh
 
-endif
 
 ### Unit tests
 
 if EFL_ENABLE_TESTS
-if HAVE_CXX11
 
 check_PROGRAMS += tests/ecore_cxx/ecore_cxx_suite tests/ecore_cxx/cxx_compile_test
 TESTS += tests/ecore_cxx/ecore_cxx_suite tests/ecore_cxx/cxx_compile_test

diff --git a/src/Makefile_Eet_Cxx.am b/src/Makefile_Eet_Cxx.am
index 4d608f0..b6ea1de 100644 (file)
--- a/src/Makefile_Eet_Cxx.am
+++ b/src/Makefile_Eet_Cxx.am
@@ -1,6 +1,7 @@
 
 ### Library
 
+if HAVE_CXX11
 installed_eetcxxmainheadersdir = $(includedir)/eet-cxx-@VMAJ@
 dist_installed_eetcxxmainheaders_DATA = bindings/eet_cxx/Eet.hh
 
@@ -15,8 +16,6 @@ bindings/eet_cxx/eet_type.hh
 ### Unit tests
 
 if EFL_ENABLE_TESTS
-if HAVE_CXX11
-
 check_PROGRAMS += tests/eet_cxx/eet_cxx_suite
 TESTS += tests/eet_cxx/eet_cxx_suite
 
@@ -33,6 +32,5 @@ tests_eet_cxx_eet_cxx_suite_CPPFLAGS =        \
 @CHECK_CFLAGS@ @EET_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EET_CFLAGS@ @EINA_CFLAGS@
 tests_eet_cxx_eet_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EET_LIBS@
 tests_eet_cxx_eet_cxx_suite_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@
-
 endif
 endif

diff --git a/src/Makefile_Eina_Cxx.am b/src/Makefile_Eina_Cxx.am
index d9887c7..686a4cc 100644 (file)
--- a/src/Makefile_Eina_Cxx.am
+++ b/src/Makefile_Eina_Cxx.am
@@ -1,6 +1,7 @@
 
 ### Library
 
+if HAVE_CXX11
 installed_einacxxmainheadersdir = $(includedir)/eina-cxx-@VMAJ@
 dist_installed_einacxxmainheaders_DATA = \
 bindings/eina_cxx/Eina.hh
@@ -29,7 +30,6 @@ bindings/eina_cxx/eina_value.hh
 ### Unit tests
 
 if EFL_ENABLE_TESTS
-if HAVE_CXX11
 
 check_PROGRAMS += tests/eina_cxx/eina_cxx_suite
 TESTS += tests/eina_cxx/eina_cxx_suite

diff --git a/src/Makefile_Eo_Cxx.am b/src/Makefile_Eo_Cxx.am
index 2574ca2..2acdc05 100644 (file)
--- a/src/Makefile_Eo_Cxx.am
+++ b/src/Makefile_Eo_Cxx.am
@@ -1,6 +1,8 @@
 
 ### Library
 
+if HAVE_CXX11
+
 installed_eocxxmainheadersdir = $(includedir)/eo-cxx-@VMAJ@/
 dist_installed_eocxxmainheaders_DATA = \
 bindings/eo_cxx/Eo.hh
@@ -15,3 +17,5 @@ bindings/eo_cxx/eo_ops.hh \
 bindings/eo_cxx/eo_private.hh \
 bindings/eo_cxx/eo_inherit_bindings.hh \
 bindings/eo_cxx/Eo.hh
+
+endif

diff --git a/src/Makefile_Eolian_Cxx.am b/src/Makefile_Eolian_Cxx.am
index 82de3ff..6ed05b1 100644 (file)
--- a/src/Makefile_Eolian_Cxx.am
+++ b/src/Makefile_Eolian_Cxx.am
@@ -1,6 +1,7 @@
 
 ### Library
 
+if HAVE_CXX11
 installed_eoliancxxmainheadersdir = $(includedir)/eolian-cxx-@VMAJ@/
 dist_installed_eoliancxxmainheaders_DATA = \
 lib/eolian_cxx/Eolian_Cxx.hh
@@ -25,7 +26,6 @@ lib/eolian_cxx/grammar/tab.hh
 
 ### Binary
 
-if HAVE_CXX11
 
 bin_PROGRAMS += bin/eolian_cxx/eolian_cxx
 

diff --git a/src/Makefile_Eolian_Cxx_Helper.am b/src/Makefile_Eolian_Cxx_Helper.am
index d234e64..09840f7 100644 (file)
--- a/src/Makefile_Eolian_Cxx_Helper.am
+++ b/src/Makefile_Eolian_Cxx_Helper.am
@@ -1,4 +1,3 @@
-
 if HAVE_EOLIAN_CXX
 EOLIAN_CXX = @eolian_cxx@
 _EOLIAN_CXX_DEP = @eolian_cxx@