autotools: add option to enable eo file install

Summary:
eolian is not stable so these files should not be distributed by default
in order to discourage relying on something which may break later

fix T7676

Reviewers: bu5hm4n

Reviewed By: bu5hm4n

Subscribers: cedric, #reviewers, #committers

Tags: #efl

Maniphest Tasks: T7676

Differential Revision: https://phab.enlightenment.org/D8339

diff --git a/configure.ac b/configure.ac
index a26716f..d2adc9b 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -147,6 +147,20 @@ case "${build_tests}" in
      ;;
 esac
 
+install_eo_files="no"
+AC_ARG_ENABLE([install-eo-files],
+   [AS_HELP_STRING([--enable-install-eo-files],[Enable installing eo files. @<:@default=disabled@:>@])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       install_eo_files="yes"
+    else
+       install_eo_files="no"
+    fi
+   ],
+   [install_eo_files="no"])
+
+AM_CONDITIONAL([INSTALL_EO_FILES], [test "${install_eo_files}" = "yes"])
+
 AC_ARG_WITH([ecore-con-http-test-url],
    [AS_HELP_STRING([--with-ecore-con-http-test-url=http://username:password@example.com],[Url of http server for testing with username and password])],[ECORE_CON_HTTP_TEST_URL=${withval}][AC_DEFINE_UNQUOTED([ECORE_CON_HTTP_TEST_URL],["$withval"],[Http url for testing])])
 

diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index beef9c6..d7047e6 100644 (file)
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -74,8 +74,10 @@ BUILT_SOURCES += \
                  $(ecore_priv_c) \
                  $(ecore_priv_h)
 
+if INSTALL_EO_FILES
 ecoreeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
 ecoreeolianfiles_DATA = $(ecore_eolian_files_public) lib/ecore/efl_loop_timer.eo
+endif
 
 ecore_legacy_eo_c = \
 lib/ecore/ecore_exe_eo.c \

diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index 679fc1c..3ded156 100644 (file)
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -28,11 +28,13 @@ BUILT_SOURCES += \
                  $(ecore_audio_eolian_c) \
                  $(ecore_audio_eolian_h)
 
+if INSTALL_EO_FILES
 ecore_audioeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
 ecore_audioeolianfiles_DATA = $(ecore_audio_eolian_files)
+endif
 
 EXTRA_DIST2 += \
-              ${ecore_audioeolianfiles_DATA}
+              $(ecore_audio_eolian_files)
 
 lib_LTLIBRARIES += lib/ecore_audio/libecore_audio.la
 

diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index b184cc2..c38acac 100644 (file)
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -56,13 +56,16 @@ BUILT_SOURCES += \
                  $(ecore_con_eolian_c) \
                  $(ecore_con_eolian_h)
 
+if INSTALL_EO_FILES
 ecoreconeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
 ecoreconeolianfiles_DATA = \
                            $(ecore_con_eolian_files) \
                           $(ecore_con_eolian_type_files)
+endif
 
 EXTRA_DIST2 += \
-              ${ecoreconeolianfiles_DATA}
+              $(ecore_con_eolian_files) \
+                          $(ecore_con_eolian_type_files)
 
 
 lib_LTLIBRARIES += lib/ecore_con/libecore_con.la

diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am
index c74346a..9288458 100644 (file)
--- a/src/Makefile_Ector.am
+++ b/src/Makefile_Ector.am
@@ -58,10 +58,12 @@ BUILT_SOURCES += \
        $(ector_eolian_c) \
        $(ector_eolian_h)
 
+if INSTALL_EO_FILES
 ectoreolianfilesdir = $(datadir)/eolian/include/ector-@VMAJ@
 ectoreolianfiles_DATA = $(ector_eolian_files) $(ector_eolian_type_files)
+endif
 
-EXTRA_DIST2 += $(ectoreolianfiles_DATA) \
+EXTRA_DIST2 += $(ector_eolian_files) $(ector_eolian_type_files) \
 lib/ector/Ector.h \
 lib/ector/ector_util.h \
 lib/ector/ector_surface.h \

diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 034b97b..f6dd6b0 100644 (file)
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -35,15 +35,19 @@ BUILT_SOURCES += \
                  $(edje_eolian_priv_c) \
                  $(edje_eolian_priv_h)
 
+if INSTALL_EO_FILES
 edjeeolianfilesdir = $(datadir)/eolian/include/edje-@VMAJ@
 edjeeolianfiles_DATA = \
-                       $(edje_eolian_files) \
-                       $(edje_eolian_type_files)
+$(edje_eolian_files) \
+$(edje_eolian_type_files)
+endif
 
 noinst_DATA += $(edje_eolian_priv_c) $(edje_eolian_priv_h)
 
-EXTRA_DIST2 += ${edjeeolianfiles_DATA} \
-              $(edje_eolian_priv_files)
+EXTRA_DIST2 += \
+$(edje_eolian_files) \
+$(edje_eolian_type_files) \
+$(edje_eolian_priv_files)
 
 lib_LTLIBRARIES += lib/edje/libedje.la
 

diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 8b8d60e..c178a7d 100644 (file)
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -111,8 +111,10 @@ EXTRA_DIST2 += \
       $(efl_eolian_files) \
       $(efl_eolian_type_files)
 
+if INSTALL_EO_FILES
 efleolianfilesdir = $(datadir)/eolian/include/efl-@VMAJ@
 efleolianfiles_DATA = $(efl_eolian_files) $(efl_eolian_type_files)
+endif
 
 lib_LTLIBRARIES += lib/efl/libefl.la
 

diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am
index 4a92dd2..a92f130 100644 (file)
--- a/src/Makefile_Eio.am
+++ b/src/Makefile_Eio.am
@@ -11,11 +11,13 @@ eio_eolian_c =  $(eio_eolian_files:%.eo=%.eo.c)
 
 BUILT_SOURCES += $(eio_eolian_c) $(eio_eolian_h)
 
+if INSTALL_EO_FILES
 eioeolianfilesdir = $(datadir)/eolian/include/eio-@VMAJ@
 eioeolianfiles_DATA = $(eio_eolian_files)
+endif
 
 lib_LTLIBRARIES += lib/eio/libeio.la
-EXTRA_DIST2 += $(eioeolianfiles_DATA)
+EXTRA_DIST2 += $(eio_eolian_files)
 
 installed_eiomainheadersdir = $(includedir)/eio-@VMAJ@
 

diff --git a/src/Makefile_Eldbus.am b/src/Makefile_Eldbus.am
index e51a7ab..1e68fe5 100644 (file)
--- a/src/Makefile_Eldbus.am
+++ b/src/Makefile_Eldbus.am
@@ -21,12 +21,16 @@ BUILT_SOURCES += \
        $(eldbus_eolian_c) \
        $(eldbus_eolian_h)
 
+if INSTALL_EO_FILES
 eldbuseolianfilesdir = $(datadir)/eolian/include/eldbus-@VMAJ@
-eldbuseolianfiles_DATA = $(eldbus_eolian_files) \
-                        $(eldbus_eolian_type_files)
+eldbuseolianfiles_DATA = \
+$(eldbus_eolian_files) \
+$(eldbus_eolian_type_files)
+endif
 
 EXTRA_DIST2 += \
-       ${eldbuseolianfiles_DATA}
+$(eldbus_eolian_files) \
+$(eldbus_eolian_type_files)
 
 lib_LTLIBRARIES += lib/eldbus/libeldbus.la
 

diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 5d94090..37c0d70 100644 (file)
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -227,8 +227,10 @@ BUILT_SOURCES += \
        $(elm_legacy_eolian_eo_h) \
        $(elm_legacy_eolian_legacy_h)
 
+if INSTALL_EO_FILES
 elementaryeolianfilesdir = $(datadir)/eolian/include/elementary-@VMAJ@
 elementaryeolianfiles_DATA = $(elm_public_eolian_files) $(elm_eolian_type_files)
+endif
 
 noinst_DATA += $(elm_legacy_eolian_eo_h)
 
@@ -651,7 +653,7 @@ lib/elementary/elm_widget_clipper.h \
 $(NULL)
 
 
-EXTRA_DIST2 += ${elementaryeolianfiles_DATA} $(elm_legacy_eolian_files) $(elm_private_eolian_files) $(elm_legacy_eo_files) $(elm_legacy_eo_headers_priv)
+EXTRA_DIST2 += $(elm_public_eolian_files) $(elm_eolian_type_files) $(elm_legacy_eolian_files) $(elm_private_eolian_files) $(elm_legacy_eo_files) $(elm_legacy_eo_headers_priv)
 
 lib_LTLIBRARIES += lib/elementary/libelementary.la
 

diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index 39fff79..639557e 100644 (file)
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -9,14 +9,14 @@ emotion_eolian_h = $(emotion_eolian_files:%.eo=%.eo.h)
 BUILT_SOURCES += \
                  $(emotion_eolian_c) \
                  $(emotion_eolian_h)
-
+if INSTALL_EO_FILES
 emotioneolianfilesdir = $(datadir)/eolian/include/emotion-@VMAJ@
 emotioneolianfiles_DATA = \
                           $(emotion_eolian_files)
-
+endif
 EXTRA_DIST2 += \
 lib/emotion/efl_canvas_video_eo.legacy.c \
-              ${emotioneolianfiles_DATA}
+              ${emotion_eolian_files}
 
 lib_LTLIBRARIES += \
 lib/emotion/libemotion.la

diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index ae03748..68a8c02 100644 (file)
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -51,13 +51,15 @@ lib_eo_libeo_dbg_la_LDFLAGS = $(lib_eo_libeo_la_LDFLAGS)
 bin_SCRIPTS += scripts/eo/eo_debug
 
 ######
-
+if INSTALL_EO_FILES
 eoeolianfilesdir = $(datadir)/eolian/include/eo-@VMAJ@
 eoeolianfiles_DATA = \
                                         $(eo_eolian_files) \
                                         lib/eo/eina_types.eot # We don't generate .c/.h on purpose
-
-EXTRA_DIST2 += ${eoeolianfiles_DATA}
+endif
+EXTRA_DIST2 += \
+$(eo_eolian_files) \
+lib/eo/eina_types.eot
 
 ### Unit tests
 

diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 59204f1..bec73b7 100755 (executable)
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -111,9 +111,10 @@ BUILT_SOURCES += \
                  $(evas_eolian_c) \
                  $(evas_eolian_h)
 
+if INSTALL_EO_FILES
 evaseolianfilesdir = $(datadir)/eolian/include/evas-@VMAJ@
 evaseolianfiles_DATA = $(evas_eolian_files)
-
+endif
 
 evas_legacy_eo_h = \
 lib/evas/canvas/efl_canvas_event_grabber_eo.legacy.h \
@@ -169,7 +170,7 @@ lib/evas/canvas/evas_textgrid_eo.legacy.c
 
 
 EXTRA_DIST2 += \
-        $(evaseolianfiles_DATA) \
+        $(evas_eolian_files) \
         $(evas_eolian_internal_files) \
         $(evas_legacy_eo_c)