summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac205
-rw-r--r--data/Makefile.am3
-rw-r--r--doc/previews/Makefile.am3
-rw-r--r--src/Makefile.am27
4 files changed, 43 insertions, 195 deletions
diff --git a/configure.ac b/configure.ac
index 1979a165f9..c88c2f7c6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -611,18 +611,6 @@ AC_DEFINE_IF([HAVE_ATFILE_SOURCE],
611 611
612 612
613###################### EFL ###################### 613###################### EFL ######################
614build_gui="yes"
615AC_ARG_ENABLE([gui],
616 [AS_HELP_STRING([--disable-gui],[disable GUI libraries @<:@default=enable@:>@])],
617 [
618 if test "x${enableval}" = "xyes"; then
619 build_gui="yes"
620 CFOPT_WARNING="yes"
621 else
622 build_gui="no"
623 fi
624 ])
625AM_CONDITIONAL([BUILD_GUI], [test "x${build_gui}" = "xyes"])
626 614
627AC_ARG_ENABLE([systemd], 615AC_ARG_ENABLE([systemd],
628 [AS_HELP_STRING([--enable-systemd],[Enable systemd support. @<:@default=disabled@:>@])], 616 [AS_HELP_STRING([--enable-systemd],[Enable systemd support. @<:@default=disabled@:>@])],
@@ -1177,7 +1165,8 @@ EFL_LIB_END([Efl])
1177#### End of Efl 1165#### End of Efl
1178 1166
1179#### Evas 1167#### Evas
1180EFL_LIB_START_OPTIONAL([Evas], [test "x${build_gui}" = "xyes"]) 1168
1169EFL_LIB_START([Evas])
1181 1170
1182### Additional options to configure 1171### Additional options to configure
1183 1172
@@ -2050,81 +2039,7 @@ EFL_ADD_FEATURE([EVAS], [cserve], [${want_evas_cserve2}])
2050EFL_ADD_FEATURE([EVAS], [tile-rotate]) 2039EFL_ADD_FEATURE([EVAS], [tile-rotate])
2051EFL_ADD_FEATURE([EVAS], [dither-mask], [${build_evas_dither_mask}]) 2040EFL_ADD_FEATURE([EVAS], [dither-mask], [${build_evas_dither_mask}])
2052 2041
2053EFL_LIB_END_OPTIONAL([Evas]) 2042EFL_LIB_END([Evas])
2054
2055if test "x${build_gui}" = "xno"; then
2056 AM_CONDITIONAL([BUILD_ENGINE_BUFFER], [false])
2057 AM_CONDITIONAL([EVAS_STATIC_BUILD_BUFFER], [false])
2058 AM_CONDITIONAL([BUILD_ENGINE_FB], [false])
2059 AM_CONDITIONAL([EVAS_STATIC_BUILD_FB], [false])
2060 AM_CONDITIONAL([BUILD_ENGINE_PSL1GHT], [false])
2061 AM_CONDITIONAL([EVAS_STATIC_BUILD_PSL1GHT], [false])
2062 AM_CONDITIONAL([BUILD_ENGINE_GL_COCOA], [false])
2063 AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_COCOA], [false])
2064 AM_CONDITIONAL([BUILD_ENGINE_GL_SDL], [false])
2065 AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_SDL], [false])
2066 AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_GDI], [false])
2067 AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_GDI], [false])
2068 AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_DDRAW], [false])
2069 AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_DDRAW], [false])
2070 AM_CONDITIONAL([BUILD_ENGINE_WAYLAND_EGL], [false])
2071 AM_CONDITIONAL([EVAS_STATIC_BUILD_WAYLAND_EGL], [false])
2072 AM_CONDITIONAL([BUILD_ENGINE_WAYLAND_SHM], [false])
2073 AM_CONDITIONAL([EVAS_STATIC_BUILD_WAYLAND_SHM], [false])
2074 AM_CONDITIONAL([BUILD_ENGINE_DRM], [false])
2075 AM_CONDITIONAL([EVAS_STATIC_BUILD_DRM], [false])
2076 AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_XCB], [false])
2077 AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_XCB], [false])
2078 AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_XLIB], [false])
2079 AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_XLIB], [false])
2080 AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_X11], [false])
2081 AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_X11], [false])
2082 AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_GENERIC], [false])
2083 AM_CONDITIONAL([BUILD_ENGINE_GL_XCB], [false])
2084 AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_XCB], [false])
2085 AM_CONDITIONAL([BUILD_ENGINE_GL_XLIB], [false])
2086 AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_XLIB], [false])
2087 AM_CONDITIONAL([BUILD_ENGINE_GL_X11], [false])
2088 AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_X11], [false])
2089 AM_CONDITIONAL([BUILD_ENGINE_GL_COMMON], [false])
2090 AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_COMMON], [false])
2091 AM_CONDITIONAL([BUILD_LOADER_BMP], [false])
2092 AM_CONDITIONAL([EVAS_STATIC_BUILD_BMP], [false])
2093 AM_CONDITIONAL([BUILD_LOADER_EET], [false])
2094 AM_CONDITIONAL([EVAS_STATIC_BUILD_EET], [false])
2095 AM_CONDITIONAL([BUILD_LOADER_GENERIC], [false])
2096 AM_CONDITIONAL([EVAS_STATIC_BUILD_GENERIC], [false])
2097 AM_CONDITIONAL([BUILD_LOADER_GIF], [false])
2098 AM_CONDITIONAL([EVAS_STATIC_BUILD_GIF], [false])
2099 AM_CONDITIONAL([BUILD_LOADER_ICO], [false])
2100 AM_CONDITIONAL([EVAS_STATIC_BUILD_ICO], [false])
2101 AM_CONDITIONAL([BUILD_LOADER_JPEG], [false])
2102 AM_CONDITIONAL([EVAS_STATIC_BUILD_JPEG], [false])
2103 AM_CONDITIONAL([BUILD_LOADER_JP2K], [false])
2104 AM_CONDITIONAL([EVAS_STATIC_BUILD_JP2K], [false])
2105 AM_CONDITIONAL([BUILD_LOADER_PMAPS], [false])
2106 AM_CONDITIONAL([EVAS_STATIC_BUILD_PMAPS], [false])
2107 AM_CONDITIONAL([BUILD_LOADER_PNG], [false])
2108 AM_CONDITIONAL([EVAS_STATIC_BUILD_PNG], [false])
2109 AM_CONDITIONAL([BUILD_LOADER_PSD], [false])
2110 AM_CONDITIONAL([EVAS_STATIC_BUILD_PSD], [false])
2111 AM_CONDITIONAL([BUILD_LOADER_TGA], [false])
2112 AM_CONDITIONAL([EVAS_STATIC_BUILD_TGA], [false])
2113 AM_CONDITIONAL([BUILD_LOADER_TIFF], [false])
2114 AM_CONDITIONAL([EVAS_STATIC_BUILD_TIFF], [false])
2115 AM_CONDITIONAL([BUILD_LOADER_WBMP], [false])
2116 AM_CONDITIONAL([EVAS_STATIC_BUILD_WBMP], [false])
2117 AM_CONDITIONAL([BUILD_LOADER_WEBP], [false])
2118 AM_CONDITIONAL([EVAS_STATIC_BUILD_WEBP], [false])
2119 AM_CONDITIONAL([BUILD_LOADER_XPM], [false])
2120 AM_CONDITIONAL([EVAS_STATIC_BUILD_XPM], [false])
2121 AM_CONDITIONAL([BUILD_LOADER_TGV], [false])
2122 AM_CONDITIONAL([EVAS_STATIC_BUILD_TGV], [false])
2123 AM_CONDITIONAL([BUILD_LOADER_DDS], [false])
2124 AM_CONDITIONAL([EVAS_STATIC_BUILD_DDS], [false])
2125 AM_CONDITIONAL([EVAS_CSERVE2], [false])
2126fi
2127
2128#### End of Evas 2043#### End of Evas
2129 2044
2130#### Edje CXX 2045#### Edje CXX
@@ -2235,9 +2150,6 @@ AC_ARG_ENABLE([gstreamer1],
2235 fi 2150 fi
2236 ], 2151 ],
2237 [want_gstreamer1="yes"]) 2152 [want_gstreamer1="yes"])
2238if test "x${build_gui}" = "xno"; then
2239 want_gstreamer1="no"
2240fi
2241 2153
2242AC_ARG_ENABLE([tizen], 2154AC_ARG_ENABLE([tizen],
2243 [AS_HELP_STRING([--enable-tizen],[enable tizen support. @<:@default=disabled@:>@])], 2155 [AS_HELP_STRING([--enable-tizen],[enable tizen support. @<:@default=disabled@:>@])],
@@ -2654,7 +2566,7 @@ EFL_LIB_END([Ecore_File])
2654 2566
2655 2567
2656#### Ecore_Input 2568#### Ecore_Input
2657EFL_LIB_START_OPTIONAL([Ecore_Input], [test "x${build_gui}" = "xyes"]) 2569EFL_LIB_START([Ecore_Input])
2658 2570
2659### Additional options to configure 2571### Additional options to configure
2660 2572
@@ -2682,12 +2594,12 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [eina])
2682 2594
2683### Checks for library functions 2595### Checks for library functions
2684 2596
2685EFL_LIB_END_OPTIONAL([Ecore_Input]) 2597EFL_LIB_END([Ecore_Input])
2686#### End of Ecore_Input 2598#### End of Ecore_Input
2687 2599
2688 2600
2689#### Ecore_Input_Evas 2601#### Ecore_Input_Evas
2690EFL_LIB_START_OPTIONAL([Ecore_Input_Evas], [test "x${build_gui}" = "xyes"]) 2602EFL_LIB_START([Ecore_Input_Evas])
2691 2603
2692### Additional options to configure 2604### Additional options to configure
2693 2605
@@ -2718,7 +2630,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [eina])
2718 2630
2719### Checks for library functions 2631### Checks for library functions
2720 2632
2721EFL_LIB_END_OPTIONAL([Ecore_Input_Evas]) 2633EFL_LIB_END([Ecore_Input_Evas])
2722#### End of Ecore_Input_Evas 2634#### End of Ecore_Input_Evas
2723 2635
2724 2636
@@ -3152,10 +3064,6 @@ AC_ARG_ENABLE([audio],
3152 ], 3064 ],
3153 [want_audio="yes"]) 3065 [want_audio="yes"])
3154 3066
3155if test "x${build_gui}" = "xno"; then
3156 want_audio="no"
3157fi
3158
3159EFL_LIB_START_OPTIONAL([Ecore_Audio], [test "${want_audio}" = "yes"]) 3067EFL_LIB_START_OPTIONAL([Ecore_Audio], [test "${want_audio}" = "yes"])
3160 3068
3161### Additional options to configure 3069### Additional options to configure
@@ -3609,7 +3517,7 @@ AM_CONDITIONAL([HAVE_ECORE_X_XCB], [test "${want_x11_xcb}" = "yes"])
3609 3517
3610 3518
3611#### Ecore_Imf 3519#### Ecore_Imf
3612EFL_LIB_START_OPTIONAL([Ecore_Imf], [test "x${build_gui}" = "xyes"]) 3520EFL_LIB_START([Ecore_Imf])
3613 3521
3614### Additional options to configure 3522### Additional options to configure
3615 3523
@@ -3725,18 +3633,12 @@ EFL_ADD_FEATURE([ECORE_IMF], [wayland], [${want_ecore_imf_wayland}])
3725 3633
3726### Checks for library functions 3634### Checks for library functions
3727 3635
3728EFL_LIB_END_OPTIONAL([Ecore_Imf]) 3636EFL_LIB_END([Ecore_Imf])
3729if test "x${build_gui}" = "xno"; then
3730 AM_CONDITIONAL([BUILD_ECORE_IMF_IBUS], [false])
3731 AM_CONDITIONAL([BUILD_ECORE_IMF_SCIM], [false])
3732 AM_CONDITIONAL([BUILD_ECORE_IMF_XIM], [false])
3733 AM_CONDITIONAL([BUILD_ECORE_IMF_WAYLAND], [false])
3734fi
3735#### End of Ecore_Imf 3637#### End of Ecore_Imf
3736 3638
3737 3639
3738#### Ecore_Imf_Evas 3640#### Ecore_Imf_Evas
3739EFL_LIB_START_OPTIONAL([Ecore_Imf_Evas], [test "x${build_gui}" = "xyes"]) 3641EFL_LIB_START([Ecore_Imf_Evas])
3740 3642
3741### Additional options to configure 3643### Additional options to configure
3742 3644
@@ -3768,12 +3670,12 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [eina])
3768 3670
3769### Checks for library functions 3671### Checks for library functions
3770 3672
3771EFL_LIB_END_OPTIONAL([Ecore_Imf_Evas]) 3673EFL_LIB_END([Ecore_Imf_Evas])
3772#### End of Ecore_Imf_Evas 3674#### End of Ecore_Imf_Evas
3773 3675
3774 3676
3775#### Ecore_Evas 3677#### Ecore_Evas
3776EFL_LIB_START_OPTIONAL([Ecore_Evas], [test "x${build_gui}" = "xyes"]) 3678EFL_LIB_START([Ecore_Evas])
3777 3679
3778### Additional options to configure 3680### Additional options to configure
3779 3681
@@ -3935,28 +3837,7 @@ EFL_EVAL_PKGS([ECORE_EVAS])
3935 3837
3936### Checks for library functions 3838### Checks for library functions
3937 3839
3938EFL_LIB_END_OPTIONAL([Ecore_Evas]) 3840EFL_LIB_END([Ecore_Evas])
3939if test "x${build_gui}" = "xno"; then
3940 AM_CONDITIONAL([BUILD_ECORE_EVAS_EXTN], [false])
3941 AM_CONDITIONAL([BUILD_ECORE_EVAS_EWS], [false])
3942 AM_CONDITIONAL([BUILD_ECORE_EVAS_FB], [false])
3943 AM_CONDITIONAL([BUILD_ECORE_EVAS_DRM], [false])
3944 AM_CONDITIONAL([BUILD_ECORE_EVAS_PSL1GHT], [false])
3945 AM_CONDITIONAL([BUILD_ECORE_EVAS_OPENGL_COCOA], [false])
3946 AM_CONDITIONAL([BUILD_ECORE_EVAS_SOFTWARE_SDL], [false])
3947 AM_CONDITIONAL([BUILD_ECORE_EVAS_OPENGL_SDL], [false])
3948 AM_CONDITIONAL([BUILD_ECORE_EVAS_SDL], [false])
3949 AM_CONDITIONAL([BUILD_ECORE_EVAS_WAYLAND_SHM], [false])
3950 AM_CONDITIONAL([BUILD_ECORE_EVAS_WAYLAND_EGL], [false])
3951 AM_CONDITIONAL([BUILD_ECORE_EVAS_WAYLAND], [false])
3952 AM_CONDITIONAL([BUILD_ECORE_EVAS_SOFTWARE_GDI], [false])
3953 AM_CONDITIONAL([BUILD_ECORE_EVAS_SOFTWARE_DDRAW], [false])
3954 AM_CONDITIONAL([BUILD_ECORE_EVAS_WIN32], [false])
3955 AM_CONDITIONAL([BUILD_ECORE_EVAS_SOFTWARE_X11], [false])
3956 AM_CONDITIONAL([BUILD_ECORE_EVAS_OPENGL_X11], [false])
3957 AM_CONDITIONAL([BUILD_ECORE_EVAS_X11], [false])
3958fi
3959
3960#### End of Ecore_Evas 3841#### End of Ecore_Evas
3961 3842
3962#### Eio 3843#### Eio
@@ -4067,10 +3948,6 @@ AC_ARG_ENABLE([physics],
4067 ], 3948 ],
4068 [want_physics="yes"]) 3949 [want_physics="yes"])
4069 3950
4070if test "x${build_gui}" = "xno"; then
4071 want_physics="no"
4072fi
4073
4074EFL_LIB_START_OPTIONAL([EPhysics], [test "${want_physics}" = "yes"]) 3951EFL_LIB_START_OPTIONAL([EPhysics], [test "${want_physics}" = "yes"])
4075 3952
4076### Additional options to configure 3953### Additional options to configure
@@ -4109,7 +3986,7 @@ EFL_LIB_END_OPTIONAL([EPhysics])
4109 3986
4110 3987
4111#### Edje 3988#### Edje
4112EFL_LIB_START_OPTIONAL([Edje], [test "x${build_gui}" = "xyes"]) 3989EFL_LIB_START([Edje])
4113 3990
4114### Additional options to configure 3991### Additional options to configure
4115 3992
@@ -4127,10 +4004,6 @@ AC_ARG_ENABLE([multisense],
4127 ], 4004 ],
4128 [want_multisense="${want_pulseaudio}"]) 4005 [want_multisense="${want_pulseaudio}"])
4129 4006
4130if test "x${build_gui}" = "xno"; then
4131 want_multisense="no"
4132fi
4133
4134# TODO: should we keep or remove these? 4007# TODO: should we keep or remove these?
4135want_edje_program_cache="no" 4008want_edje_program_cache="no"
4136want_edje_calc_cache="yes" 4009want_edje_calc_cache="yes"
@@ -4181,8 +4054,7 @@ AC_DEFINE_IF([BUILD_EDJE_FP], [test "${want_fixed_point}" = "yes"],
4181 4054
4182AM_CONDITIONAL([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"]) 4055AM_CONDITIONAL([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"])
4183AC_DEFINE_IF([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"], 4056AC_DEFINE_IF([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"],
4184 [1], [Use Multisense]) 4057 [1], [Use Multisense])
4185
4186AC_SUBST([want_multisense]) 4058AC_SUBST([want_multisense])
4187AC_SUBST([want_physics]) 4059AC_SUBST([want_physics])
4188 4060
@@ -4202,15 +4074,9 @@ sys/wait.h \
4202 4074
4203### Checks for library functions 4075### Checks for library functions
4204 4076
4205EFL_LIB_END_OPTIONAL([Edje]) 4077EFL_LIB_END([Edje])
4206
4207if test "x${build_gui}" = "xno"; then
4208 AC_DEFINE([ENABLE_MULTISENSE], [0], [Use Multisense])
4209 AM_CONDITIONAL([ENABLE_MULTISENSE], [false])
4210fi
4211#### End of Edje 4078#### End of Edje
4212 4079
4213
4214#### Edje CXX 4080#### Edje CXX
4215EFL_LIB_START([Edje_Cxx]) 4081EFL_LIB_START([Edje_Cxx])
4216 4082
@@ -4220,7 +4086,7 @@ EFL_LIB_END([Edje_Cxx])
4220#### End of Edje CXX 4086#### End of Edje CXX
4221 4087
4222#### Emotion 4088#### Emotion
4223EFL_LIB_START_OPTIONAL([Emotion], [test "x${build_gui}" = "xyes"]) 4089EFL_LIB_START([Emotion])
4224 4090
4225## Compatibility layers 4091## Compatibility layers
4226EFL_PLATFORM_DEPEND([Emotion], [evil]) 4092EFL_PLATFORM_DEPEND([Emotion], [evil])
@@ -4306,23 +4172,12 @@ fi
4306 4172
4307### Check availability 4173### Check availability
4308 4174
4309EFL_LIB_END_OPTIONAL([Emotion]) 4175EFL_LIB_END([Emotion])
4310
4311if test "x${build_gui}" = "xno"; then
4312 AM_CONDITIONAL([EMOTION_BUILD_XINE], [false])
4313 AM_CONDITIONAL([EMOTION_STATIC_BUILD_XINE], [false])
4314 AM_CONDITIONAL([EMOTION_BUILD_GSTREAMER], [false])
4315 AM_CONDITIONAL([EMOTION_STATIC_BUILD_GSTREAMER], [false])
4316 AM_CONDITIONAL([EMOTION_BUILD_GSTREAMER1], [false])
4317 AM_CONDITIONAL([EMOTION_STATIC_BUILD_GSTREAMER1], [false])
4318 AM_CONDITIONAL([EMOTION_BUILD_GENERIC], [false])
4319 AM_CONDITIONAL([EMOTION_STATIC_BUILD_GENERIC], [false])
4320fi
4321#### End of Emotion 4176#### End of Emotion
4322 4177
4323 4178
4324#### Ethumb 4179#### Ethumb
4325EFL_LIB_START_OPTIONAL([Ethumb], [test "x${build_gui}" = "xyes"]) 4180EFL_LIB_START([Ethumb])
4326 4181
4327### Default values 4182### Default values
4328 4183
@@ -4365,11 +4220,12 @@ EFL_EVAL_PKGS([ETHUMB])
4365 4220
4366### Check availability 4221### Check availability
4367 4222
4368EFL_LIB_END_OPTIONAL([Ethumb]) 4223EFL_LIB_END([Ethumb])
4369#### End of Ethumb 4224#### End of Ethumb
4370 4225
4371#### Ethumb_Client 4226#### Ethumb_Client
4372EFL_LIB_START_OPTIONAL([Ethumb_Client], [test "x${build_gui}" = "xyes"]) 4227EFL_LIB_START([Ethumb_Client])
4228
4373### Default values 4229### Default values
4374 4230
4375### Additional options to configure 4231### Additional options to configure
@@ -4407,7 +4263,7 @@ EFL_EVAL_PKGS([ETHUMB_CLIENT])
4407 4263
4408### Check availability 4264### Check availability
4409 4265
4410EFL_LIB_END_OPTIONAL([Ethumb_Client]) 4266EFL_LIB_END([Ethumb_Client])
4411#### End of Ethumb_Client 4267#### End of Ethumb_Client
4412 4268
4413#### Elua 4269#### Elua
@@ -4736,8 +4592,7 @@ echo " Cryptography..: ${build_crypto}"
4736echo " X11...........: ${with_x11}" 4592echo " X11...........: ${with_x11}"
4737echo " OpenGL........: ${with_opengl}" 4593echo " OpenGL........: ${with_opengl}"
4738echo " C++11.........: ${have_cxx11}" 4594echo " C++11.........: ${have_cxx11}"
4739echo " GUI libs......: ${build_gui}" 4595echo "Evas............: yes (${features_evas})"
4740echo "Evas............: ${efl_lib_optional_evas} (${features_evas})"
4741echo " Engines.......: ${features_evas_engine}" 4596echo " Engines.......: ${features_evas_engine}"
4742echo " Image Loaders.: ${features_evas_loader}" 4597echo " Image Loaders.: ${features_evas_loader}"
4743if test "x${have_pixman}" = "xyes" ; then 4598if test "x${have_pixman}" = "xyes" ; then
@@ -4749,7 +4604,7 @@ echo "Eina............: yes (${features_eina})"
4749echo "Ecore...........: yes (${features_ecore})" 4604echo "Ecore...........: yes (${features_ecore})"
4750echo "Ecore_Con.......: yes (${features_ecore_con})" 4605echo "Ecore_Con.......: yes (${features_ecore_con})"
4751echo "Ecore_File......: yes" 4606echo "Ecore_File......: yes"
4752echo "Ecore_IMF.......: ${efl_lib_optional_ecore_imf} (${features_ecore_imf})" 4607echo "Ecore_IMF.......: yes (${features_ecore_imf})"
4753echo "Ecore_X.........: ${with_x11} (${features_ecore_x})" 4608echo "Ecore_X.........: ${with_x11} (${features_ecore_x})"
4754echo "Ecore_SDL.......: $want_sdl" 4609echo "Ecore_SDL.......: $want_sdl"
4755echo "Ecore_Wayland...: $want_wayland" 4610echo "Ecore_Wayland...: $want_wayland"
@@ -4765,13 +4620,13 @@ echo "Ecore_Win32.....: $have_win32"
4765fi 4620fi
4766echo "Ecore_Audio.....: ${efl_lib_optional_ecore_audio} (${features_ecore_audio})" 4621echo "Ecore_Audio.....: ${efl_lib_optional_ecore_audio} (${features_ecore_audio})"
4767echo "Ecore_Avahi.....: yes (${features_ecore_avahi})" 4622echo "Ecore_Avahi.....: yes (${features_ecore_avahi})"
4768echo "Ecore_Evas......: ${efl_lib_optional_ecore_evas} (${features_ecore_evas})" 4623echo "Ecore_Evas......: yes (${features_ecore_evas})"
4769echo "Eeze............: ${efl_lib_optional_eeze} (${features_eeze})" 4624echo "Eeze............: ${efl_lib_optional_eeze} (${features_eeze})"
4770echo "EPhysics........: ${efl_lib_optional_ephysics}" 4625echo "EPhysics........: ${efl_lib_optional_ephysics}"
4771echo "Edje............: ${efl_lib_optional_edje} (${features_edje})" 4626echo "Edje............: yes (${features_edje})"
4772echo "Emotion.........: ${efl_lib_optional_emotion} (${features_emotion})" 4627echo "Emotion.........: yes (${features_emotion})"
4773echo "Ethumb..........: ${efl_lib_optional_ethumb}" 4628echo "Ethumb..........: yes"
4774echo "Ethumb_Client...: ${efl_lib_optional_ethumb_client}" 4629echo "Ethumb_Client...: yes"
4775echo "Elua............: $have_elua" 4630echo "Elua............: $have_elua"
4776if test "${build_tests}" = "none"; then 4631if test "${build_tests}" = "none"; then
4777echo "Tests...........: no" 4632echo "Tests...........: no"
diff --git a/data/Makefile.am b/data/Makefile.am
index 77ff99d9ca..5b30bf3d53 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -63,8 +63,6 @@ CLEANFILES += libeo.so.@VMAJ@.@VMIN@.@VMIC@-gdb.py
63 63
64EXTRA_DIST += $(eogdb_SCRIPTS) eo/libeo-gdb.py.in 64EXTRA_DIST += $(eogdb_SCRIPTS) eo/libeo-gdb.py.in
65 65
66if BUILD_GUI
67
68######################################################################## 66########################################################################
69# Edje 67# Edje
70edjefilesdir = $(datadir)/edje/include 68edjefilesdir = $(datadir)/edje/include
@@ -111,7 +109,6 @@ ethumb/frames/border-0.jpg
111ethumb_clientfilesdir = $(datadir)/ethumb_client 109ethumb_clientfilesdir = $(datadir)/ethumb_client
112ethumb_clientfiles_DATA = ethumb_client/checkme 110ethumb_clientfiles_DATA = ethumb_client/checkme
113EXTRA_DIST += $(ethumb_clientfiles_DATA) 111EXTRA_DIST += $(ethumb_clientfiles_DATA)
114endif
115 112
116######################################################################## 113########################################################################
117# Elua 114# Elua
diff --git a/doc/previews/Makefile.am b/doc/previews/Makefile.am
index e00f5ee159..ea0d30789c 100644
--- a/doc/previews/Makefile.am
+++ b/doc/previews/Makefile.am
@@ -1,4 +1,3 @@
1if BUILD_GUI
2if EFL_BUILD_DOC 1if EFL_BUILD_DOC
3 2
4.PHONY: doc 3.PHONY: doc
@@ -65,9 +64,9 @@ endif
65 64
66 65
67endif 66endif
68endif
69 67
70EXTRA_DIST = preview_text_filter.c 68EXTRA_DIST = preview_text_filter.c
71 69
72clean-local: 70clean-local:
73 rm -rf $(DATADIR) 71 rm -rf $(DATADIR)
72
diff --git a/src/Makefile.am b/src/Makefile.am
index 5a4e4143c9..4c9c95e9ce 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,19 +33,11 @@ include Makefile_Eo.am
33include Makefile_Efl.am 33include Makefile_Efl.am
34include Makefile_Eet.am 34include Makefile_Eet.am
35include Makefile_Eolian.am 35include Makefile_Eolian.am
36include Makefile_Evas.am
36include Makefile_Ecore.am 37include Makefile_Ecore.am
37include Makefile_Ecore_Con.am 38include Makefile_Ecore_Con.am
38include Makefile_Ecore_Ipc.am 39include Makefile_Ecore_Ipc.am
39include Makefile_Ecore_File.am 40include Makefile_Ecore_File.am
40include Makefile_Ecore_Avahi.am
41include Makefile_Embryo.am
42include Makefile_Eio.am
43include Makefile_Eldbus.am
44include Makefile_Efreet.am
45include Makefile_Eeze.am
46
47if BUILD_GUI
48include Makefile_Evas.am
49include Makefile_Ecore_Input.am 41include Makefile_Ecore_Input.am
50include Makefile_Ecore_Input_Evas.am 42include Makefile_Ecore_Input_Evas.am
51include Makefile_Ecore_Cocoa.am 43include Makefile_Ecore_Cocoa.am
@@ -56,21 +48,23 @@ include Makefile_Ecore_SDL.am
56include Makefile_Ecore_Wayland.am 48include Makefile_Ecore_Wayland.am
57include Makefile_Ecore_Win32.am 49include Makefile_Ecore_Win32.am
58include Makefile_Ecore_X.am 50include Makefile_Ecore_X.am
59include Makefile_Ecore_Audio.am
60include Makefile_Ecore_IMF.am 51include Makefile_Ecore_IMF.am
61include Makefile_Ecore_IMF_Evas.am 52include Makefile_Ecore_IMF_Evas.am
62include Makefile_Ecore_Evas.am 53include Makefile_Ecore_Evas.am
54include Makefile_Ecore_Audio.am
55include Makefile_Ecore_Audio_Cxx.am
56include Makefile_Ecore_Avahi.am
57include Makefile_Embryo.am
58include Makefile_Eio.am
59include Makefile_Eldbus.am
60include Makefile_Efreet.am
61include Makefile_Eeze.am
63include Makefile_EPhysics.am 62include Makefile_EPhysics.am
64include Makefile_Edje.am 63include Makefile_Edje.am
65include Makefile_Emotion.am 64include Makefile_Emotion.am
66include Makefile_Ethumb.am 65include Makefile_Ethumb.am
67include Makefile_Ethumb_Client.am 66include Makefile_Ethumb_Client.am
68 67
69include Makefile_Ecore_Audio_Cxx.am
70include Makefile_Edje_Cxx.am
71include Makefile_Evas_Cxx.am
72endif
73
74include Makefile_Eina_Cxx.am 68include Makefile_Eina_Cxx.am
75include Makefile_Ecore_Cxx.am 69include Makefile_Ecore_Cxx.am
76include Makefile_Eldbus_Cxx.am 70include Makefile_Eldbus_Cxx.am
@@ -78,6 +72,9 @@ include Makefile_Eolian_Cxx.am
78include Makefile_Eet_Cxx.am 72include Makefile_Eet_Cxx.am
79include Makefile_Eo_Cxx.am 73include Makefile_Eo_Cxx.am
80include Makefile_Efl_Cxx.am 74include Makefile_Efl_Cxx.am
75include Makefile_Edje_Cxx.am
76include Makefile_Evas_Cxx.am
77
81include Makefile_Elua.am 78include Makefile_Elua.am
82include Makefile_Elocation.am 79include Makefile_Elocation.am
83 80