summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-14 12:43:33 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-03-14 12:44:00 -0400
commit781aa27b6b47842331267f33da3b612ad2c09e9a (patch)
treeac07cf2fe5c191280c20235a79cc1240d92eefe0
parent30bb8395c38bbbdd21708ddc5413c869aca6714b (diff)
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
-rw-r--r--configure.ac14
-rw-r--r--src/Makefile_Ecore.am2
-rw-r--r--src/Makefile_Ecore_Audio.am4
-rw-r--r--src/Makefile_Ecore_Con.am5
-rw-r--r--src/Makefile_Ector.am4
-rw-r--r--src/Makefile_Edje.am12
-rw-r--r--src/Makefile_Efl.am2
-rw-r--r--src/Makefile_Eio.am4
-rw-r--r--src/Makefile_Eldbus.am10
-rw-r--r--src/Makefile_Elementary.am4
-rw-r--r--src/Makefile_Emotion.am6
-rw-r--r--src/Makefile_Eo.am8
-rw-r--r--src/Makefile_Evas.am5
13 files changed, 60 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac
index f43c2cc48f..765a640da3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,6 +147,20 @@ case "${build_tests}" in
147 ;; 147 ;;
148esac 148esac
149 149
150install_eo_files="no"
151AC_ARG_ENABLE([install-eo-files],
152 [AS_HELP_STRING([--enable-install-eo-files],[Enable installing eo files. @<:@default=disabled@:>@])],
153 [
154 if test "x${enableval}" = "xyes" ; then
155 install_eo_files="yes"
156 else
157 install_eo_files="no"
158 fi
159 ],
160 [install_eo_files="no"])
161
162AM_CONDITIONAL([INSTALL_EO_FILES], [test "${install_eo_files}" = "yes"])
163
150AC_ARG_WITH([ecore-con-http-test-url], 164AC_ARG_WITH([ecore-con-http-test-url],
151 [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])]) 165 [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])])
152 166
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 92c69d1717..1b83d74fa5 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -74,8 +74,10 @@ BUILT_SOURCES += \
74 $(ecore_priv_c) \ 74 $(ecore_priv_c) \
75 $(ecore_priv_h) 75 $(ecore_priv_h)
76 76
77if INSTALL_EO_FILES
77ecoreeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@ 78ecoreeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
78ecoreeolianfiles_DATA = $(ecore_eolian_files_public) lib/ecore/efl_loop_timer.eo 79ecoreeolianfiles_DATA = $(ecore_eolian_files_public) lib/ecore/efl_loop_timer.eo
80endif
79 81
80ecore_legacy_eo_c = \ 82ecore_legacy_eo_c = \
81lib/ecore/ecore_exe_eo.c \ 83lib/ecore/ecore_exe_eo.c \
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index 919104fc93..330a5129e2 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -20,11 +20,13 @@ BUILT_SOURCES += \
20 $(ecore_audio_eolian_c) \ 20 $(ecore_audio_eolian_c) \
21 $(ecore_audio_eolian_h) 21 $(ecore_audio_eolian_h)
22 22
23if INSTALL_EO_FILES
23ecore_audioeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@ 24ecore_audioeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
24ecore_audioeolianfiles_DATA = $(ecore_audio_eolian_files) 25ecore_audioeolianfiles_DATA = $(ecore_audio_eolian_files)
26endif
25 27
26EXTRA_DIST2 += \ 28EXTRA_DIST2 += \
27 ${ecore_audioeolianfiles_DATA} 29 $(ecore_audio_eolian_files)
28 30
29lib_LTLIBRARIES += lib/ecore_audio/libecore_audio.la 31lib_LTLIBRARIES += lib/ecore_audio/libecore_audio.la
30 32
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index b184cc2a72..c38acacf6d 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -56,13 +56,16 @@ BUILT_SOURCES += \
56 $(ecore_con_eolian_c) \ 56 $(ecore_con_eolian_c) \
57 $(ecore_con_eolian_h) 57 $(ecore_con_eolian_h)
58 58
59if INSTALL_EO_FILES
59ecoreconeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@ 60ecoreconeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
60ecoreconeolianfiles_DATA = \ 61ecoreconeolianfiles_DATA = \
61 $(ecore_con_eolian_files) \ 62 $(ecore_con_eolian_files) \
62 $(ecore_con_eolian_type_files) 63 $(ecore_con_eolian_type_files)
64endif
63 65
64EXTRA_DIST2 += \ 66EXTRA_DIST2 += \
65 ${ecoreconeolianfiles_DATA} 67 $(ecore_con_eolian_files) \
68 $(ecore_con_eolian_type_files)
66 69
67 70
68lib_LTLIBRARIES += lib/ecore_con/libecore_con.la 71lib_LTLIBRARIES += lib/ecore_con/libecore_con.la
diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am
index c74346a9d9..9288458fc3 100644
--- a/src/Makefile_Ector.am
+++ b/src/Makefile_Ector.am
@@ -58,10 +58,12 @@ BUILT_SOURCES += \
58 $(ector_eolian_c) \ 58 $(ector_eolian_c) \
59 $(ector_eolian_h) 59 $(ector_eolian_h)
60 60
61if INSTALL_EO_FILES
61ectoreolianfilesdir = $(datadir)/eolian/include/ector-@VMAJ@ 62ectoreolianfilesdir = $(datadir)/eolian/include/ector-@VMAJ@
62ectoreolianfiles_DATA = $(ector_eolian_files) $(ector_eolian_type_files) 63ectoreolianfiles_DATA = $(ector_eolian_files) $(ector_eolian_type_files)
64endif
63 65
64EXTRA_DIST2 += $(ectoreolianfiles_DATA) \ 66EXTRA_DIST2 += $(ector_eolian_files) $(ector_eolian_type_files) \
65lib/ector/Ector.h \ 67lib/ector/Ector.h \
66lib/ector/ector_util.h \ 68lib/ector/ector_util.h \
67lib/ector/ector_surface.h \ 69lib/ector/ector_surface.h \
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 6d4120949a..916ab65b98 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -35,15 +35,19 @@ BUILT_SOURCES += \
35 $(edje_eolian_priv_c) \ 35 $(edje_eolian_priv_c) \
36 $(edje_eolian_priv_h) 36 $(edje_eolian_priv_h)
37 37
38if INSTALL_EO_FILES
38edjeeolianfilesdir = $(datadir)/eolian/include/edje-@VMAJ@ 39edjeeolianfilesdir = $(datadir)/eolian/include/edje-@VMAJ@
39edjeeolianfiles_DATA = \ 40edjeeolianfiles_DATA = \
40 $(edje_eolian_files) \ 41$(edje_eolian_files) \
41 $(edje_eolian_type_files) 42$(edje_eolian_type_files)
43endif
42 44
43noinst_DATA += $(edje_eolian_priv_c) $(edje_eolian_priv_h) 45noinst_DATA += $(edje_eolian_priv_c) $(edje_eolian_priv_h)
44 46
45EXTRA_DIST2 += ${edjeeolianfiles_DATA} \ 47EXTRA_DIST2 += \
46 $(edje_eolian_priv_files) 48$(edje_eolian_files) \
49$(edje_eolian_type_files) \
50$(edje_eolian_priv_files)
47 51
48lib_LTLIBRARIES += lib/edje/libedje.la 52lib_LTLIBRARIES += lib/edje/libedje.la
49 53
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 8b8d60eafb..c178a7d4dc 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -111,8 +111,10 @@ EXTRA_DIST2 += \
111 $(efl_eolian_files) \ 111 $(efl_eolian_files) \
112 $(efl_eolian_type_files) 112 $(efl_eolian_type_files)
113 113
114if INSTALL_EO_FILES
114efleolianfilesdir = $(datadir)/eolian/include/efl-@VMAJ@ 115efleolianfilesdir = $(datadir)/eolian/include/efl-@VMAJ@
115efleolianfiles_DATA = $(efl_eolian_files) $(efl_eolian_type_files) 116efleolianfiles_DATA = $(efl_eolian_files) $(efl_eolian_type_files)
117endif
116 118
117lib_LTLIBRARIES += lib/efl/libefl.la 119lib_LTLIBRARIES += lib/efl/libefl.la
118 120
diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am
index 4a92dd2f0e..a92f13030b 100644
--- a/src/Makefile_Eio.am
+++ b/src/Makefile_Eio.am
@@ -11,11 +11,13 @@ eio_eolian_c = $(eio_eolian_files:%.eo=%.eo.c)
11 11
12BUILT_SOURCES += $(eio_eolian_c) $(eio_eolian_h) 12BUILT_SOURCES += $(eio_eolian_c) $(eio_eolian_h)
13 13
14if INSTALL_EO_FILES
14eioeolianfilesdir = $(datadir)/eolian/include/eio-@VMAJ@ 15eioeolianfilesdir = $(datadir)/eolian/include/eio-@VMAJ@
15eioeolianfiles_DATA = $(eio_eolian_files) 16eioeolianfiles_DATA = $(eio_eolian_files)
17endif
16 18
17lib_LTLIBRARIES += lib/eio/libeio.la 19lib_LTLIBRARIES += lib/eio/libeio.la
18EXTRA_DIST2 += $(eioeolianfiles_DATA) 20EXTRA_DIST2 += $(eio_eolian_files)
19 21
20installed_eiomainheadersdir = $(includedir)/eio-@VMAJ@ 22installed_eiomainheadersdir = $(includedir)/eio-@VMAJ@
21 23
diff --git a/src/Makefile_Eldbus.am b/src/Makefile_Eldbus.am
index 4e310fc386..bb786104d5 100644
--- a/src/Makefile_Eldbus.am
+++ b/src/Makefile_Eldbus.am
@@ -21,12 +21,16 @@ BUILT_SOURCES += \
21 $(eldbus_eolian_c) \ 21 $(eldbus_eolian_c) \
22 $(eldbus_eolian_h) 22 $(eldbus_eolian_h)
23 23
24if INSTALL_EO_FILES
24eldbuseolianfilesdir = $(datadir)/eolian/include/eldbus-@VMAJ@ 25eldbuseolianfilesdir = $(datadir)/eolian/include/eldbus-@VMAJ@
25eldbuseolianfiles_DATA = $(eldbus_eolian_files) \ 26eldbuseolianfiles_DATA = \
26 $(eldbus_eolian_type_files) 27$(eldbus_eolian_files) \
28$(eldbus_eolian_type_files)
29endif
27 30
28EXTRA_DIST2 += \ 31EXTRA_DIST2 += \
29 ${eldbuseolianfiles_DATA} 32$(eldbus_eolian_files) \
33$(eldbus_eolian_type_files)
30 34
31lib_LTLIBRARIES += lib/eldbus/libeldbus.la 35lib_LTLIBRARIES += lib/eldbus/libeldbus.la
32 36
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 7625b880dc..542ed21537 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -219,8 +219,10 @@ BUILT_SOURCES += \
219 $(elm_legacy_eolian_eo_h) \ 219 $(elm_legacy_eolian_eo_h) \
220 $(elm_legacy_eolian_legacy_h) 220 $(elm_legacy_eolian_legacy_h)
221 221
222if INSTALL_EO_FILES
222elementaryeolianfilesdir = $(datadir)/eolian/include/elementary-@VMAJ@ 223elementaryeolianfilesdir = $(datadir)/eolian/include/elementary-@VMAJ@
223elementaryeolianfiles_DATA = $(elm_public_eolian_files) $(elm_eolian_type_files) 224elementaryeolianfiles_DATA = $(elm_public_eolian_files) $(elm_eolian_type_files)
225endif
224 226
225noinst_DATA += $(elm_legacy_eolian_eo_h) 227noinst_DATA += $(elm_legacy_eolian_eo_h)
226 228
@@ -628,7 +630,7 @@ lib/elementary/elm_widget_clipper.h \
628$(NULL) 630$(NULL)
629 631
630 632
631EXTRA_DIST2 += ${elementaryeolianfiles_DATA} $(elm_legacy_eolian_files) $(elm_private_eolian_files) $(elm_legacy_eo_files) $(elm_legacy_eo_headers_priv) 633EXTRA_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)
632 634
633lib_LTLIBRARIES += lib/elementary/libelementary.la 635lib_LTLIBRARIES += lib/elementary/libelementary.la
634 636
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index 39fff79979..639557ea53 100644
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -9,14 +9,14 @@ emotion_eolian_h = $(emotion_eolian_files:%.eo=%.eo.h)
9BUILT_SOURCES += \ 9BUILT_SOURCES += \
10 $(emotion_eolian_c) \ 10 $(emotion_eolian_c) \
11 $(emotion_eolian_h) 11 $(emotion_eolian_h)
12 12if INSTALL_EO_FILES
13emotioneolianfilesdir = $(datadir)/eolian/include/emotion-@VMAJ@ 13emotioneolianfilesdir = $(datadir)/eolian/include/emotion-@VMAJ@
14emotioneolianfiles_DATA = \ 14emotioneolianfiles_DATA = \
15 $(emotion_eolian_files) 15 $(emotion_eolian_files)
16 16endif
17EXTRA_DIST2 += \ 17EXTRA_DIST2 += \
18lib/emotion/efl_canvas_video_eo.legacy.c \ 18lib/emotion/efl_canvas_video_eo.legacy.c \
19 ${emotioneolianfiles_DATA} 19 ${emotion_eolian_files}
20 20
21lib_LTLIBRARIES += \ 21lib_LTLIBRARIES += \
22lib/emotion/libemotion.la 22lib/emotion/libemotion.la
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index ae03748830..68a8c02f3e 100644
--- 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)
51bin_SCRIPTS += scripts/eo/eo_debug 51bin_SCRIPTS += scripts/eo/eo_debug
52 52
53###### 53######
54 54if INSTALL_EO_FILES
55eoeolianfilesdir = $(datadir)/eolian/include/eo-@VMAJ@ 55eoeolianfilesdir = $(datadir)/eolian/include/eo-@VMAJ@
56eoeolianfiles_DATA = \ 56eoeolianfiles_DATA = \
57 $(eo_eolian_files) \ 57 $(eo_eolian_files) \
58 lib/eo/eina_types.eot # We don't generate .c/.h on purpose 58 lib/eo/eina_types.eot # We don't generate .c/.h on purpose
59 59endif
60EXTRA_DIST2 += ${eoeolianfiles_DATA} 60EXTRA_DIST2 += \
61$(eo_eolian_files) \
62lib/eo/eina_types.eot
61 63
62### Unit tests 64### Unit tests
63 65
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 48422ec1db..6fddfd75e3 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -111,9 +111,10 @@ BUILT_SOURCES += \
111 $(evas_eolian_c) \ 111 $(evas_eolian_c) \
112 $(evas_eolian_h) 112 $(evas_eolian_h)
113 113
114if INSTALL_EO_FILES
114evaseolianfilesdir = $(datadir)/eolian/include/evas-@VMAJ@ 115evaseolianfilesdir = $(datadir)/eolian/include/evas-@VMAJ@
115evaseolianfiles_DATA = $(evas_eolian_files) 116evaseolianfiles_DATA = $(evas_eolian_files)
116 117endif
117 118
118evas_legacy_eo_h = \ 119evas_legacy_eo_h = \
119lib/evas/canvas/efl_canvas_event_grabber_eo.legacy.h \ 120lib/evas/canvas/efl_canvas_event_grabber_eo.legacy.h \
@@ -169,7 +170,7 @@ lib/evas/canvas/evas_textgrid_eo.legacy.c
169 170
170 171
171EXTRA_DIST2 += \ 172EXTRA_DIST2 += \
172 $(evaseolianfiles_DATA) \ 173 $(evas_eolian_files) \
173 $(evas_eolian_internal_files) \ 174 $(evas_eolian_internal_files) \
174 $(evas_legacy_eo_c) 175 $(evas_legacy_eo_c)
175 176