From e3c8b280c639058c54f5576f189d0dc288105fc7 Mon Sep 17 00:00:00 2001
From: Felipe Magno de Almeida <felipe@expertisesolutions.com.br>
Date: Mon, 23 May 2016 12:01:30 -0300
Subject: c++: Reorganized C++ binding generation

Moved all generation to a single Makefile_Cxx.am file instead of
throughout the whole project. And fixed C++ generation on Elementary
after elm merge.
---
 src/Makefile_Eio.am | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'src/Makefile_Eio.am')

diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am
index 6a95841150..64b7972e81 100644
--- a/src/Makefile_Eio.am
+++ b/src/Makefile_Eio.am
@@ -1,16 +1,16 @@
 
 ### Library
 
-EIO_EOS = \
+eio_eolian_files = \
         lib/eio/eio_model.eo
 
-EIO_EOS_H =  $(EIO_EOS:%.eo=%.eo.h)
-EIO_EOS_C =  $(EIO_EOS:%.eo=%.eo.c)
+eio_eolian_h =  $(eio_eolian_files:%.eo=%.eo.h)
+eio_eolian_c =  $(eio_eolian_files:%.eo=%.eo.c)
 
-BUILT_SOURCES += $(EIO_EOS_C) $(EIO_EOS_H)
+BUILT_SOURCES += $(eio_eolian_c) $(eio_eolian_h)
 
 eioeolianfilesdir = $(datadir)/eolian/include/eio-@VMAJ@
-eioeolianfiles_DATA = $(EIO_EOS)
+eioeolianfiles_DATA = $(eio_eolian_files)
 
 lib_LTLIBRARIES += lib/eio/libeio.la
 EXTRA_DIST += \
@@ -21,7 +21,7 @@ lib/eio/Makefile.in
 installed_eiomainheadersdir = $(includedir)/eio-@VMAJ@
 
 dist_installed_eiomainheaders_DATA = lib/eio/Eio.h lib/eio/eio_inline_helper.x
-nodist_installed_eiomainheaders_DATA = $(EIO_EOS_H)
+nodist_installed_eiomainheaders_DATA = $(eio_eoolian_h)
 
 lib_eio_libeio_la_SOURCES = \
 lib/eio/eio_dir.c \
@@ -62,6 +62,13 @@ if HAVE_NOTIFY_COCOA
 lib_eio_libeio_la_LDFLAGS += -framework CoreServices
 endif
 
+if HAVE_CXX11
+
+eio_eolian_cxx_hh = $(eio_eolian_files:%.eo=%.eo.hh)
+eio_eolian_cxx_impl = $(eio_eolian_files:%.eo=%.eo.impl.hh)
+
+endif
+
 if EFL_ENABLE_TESTS
 
 check_PROGRAMS += tests/eio/eio_suite
-- 
cgit v1.2.1