summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Friloux <guillaume.friloux@gmail.com>2014-06-05 13:40:44 +0200
committerGuillaume Friloux <guillaume.friloux@gmail.com>2014-06-05 13:40:44 +0200
commit3ed4f745907d3e842e64b341e2426c0c99cf3297 (patch)
treea62d64eeb9b93bccf4a80557fcc04477810dbb70
parente7faaf9fc5dde56a9d07a046a4fbfbe2f2161f27 (diff)
Add --disable-gui.
This allows people to disable the building of anything GUI related. In my case, it is used for servers. I encourage anyone that think they can do a better patch to improve it, as i dislike having to add all those AM_CONDITIONAL(). Maybe the macros should be improved.
-rw-r--r--configure.ac204
-rw-r--r--data/Makefile.am3
-rw-r--r--doc/previews/Makefile.am3
-rw-r--r--src/Makefile.am26
4 files changed, 194 insertions, 42 deletions
diff --git a/configure.ac b/configure.ac
index e409c11..c948942 100644
--- a/configure.ac
+++ b/configure.ac
@@ -611,6 +611,18 @@ AC_DEFINE_IF([HAVE_ATFILE_SOURCE],
611 611
612 612
613###################### EFL ###################### 613###################### EFL ######################
614build_gui="yes"
615AC_ARG_ENABLE([gui],
616 [AC_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"])
614 626
615AC_ARG_ENABLE([systemd], 627AC_ARG_ENABLE([systemd],
616 [AC_HELP_STRING([--enable-systemd], 628 [AC_HELP_STRING([--enable-systemd],
@@ -1155,8 +1167,7 @@ EFL_INTERNAL_DEPEND_PKG([EOLIAN_CXX], [eo])
1155EFL_LIB_END([Eolian_Cxx]) 1167EFL_LIB_END([Eolian_Cxx])
1156 1168
1157#### Evas 1169#### Evas
1158 1170EFL_LIB_START_OPTIONAL([Evas], [test "x${build_gui}" = "xyes"])
1159EFL_LIB_START([Evas])
1160 1171
1161### Additional options to configure 1172### Additional options to configure
1162 1173
@@ -1950,7 +1961,80 @@ EFL_ADD_FEATURE([EVAS], [cserve], [${want_evas_cserve2}])
1950EFL_ADD_FEATURE([EVAS], [tile-rotate]) 1961EFL_ADD_FEATURE([EVAS], [tile-rotate])
1951EFL_ADD_FEATURE([EVAS], [dither-mask], [${build_evas_dither_mask}]) 1962EFL_ADD_FEATURE([EVAS], [dither-mask], [${build_evas_dither_mask}])
1952 1963
1953EFL_LIB_END([Evas]) 1964EFL_LIB_END_OPTIONAL([Evas])
1965
1966if test "x${build_gui}" = "xno"; then
1967 AM_CONDITIONAL([BUILD_ENGINE_BUFFER], [false])
1968 AM_CONDITIONAL([EVAS_STATIC_BUILD_BUFFER], [false])
1969 AM_CONDITIONAL([BUILD_ENGINE_FB], [false])
1970 AM_CONDITIONAL([EVAS_STATIC_BUILD_FB], [false])
1971 AM_CONDITIONAL([BUILD_ENGINE_PSL1GHT], [false])
1972 AM_CONDITIONAL([EVAS_STATIC_BUILD_PSL1GHT], [false])
1973 AM_CONDITIONAL([BUILD_ENGINE_GL_COCOA], [false])
1974 AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_COCOA], [false])
1975 AM_CONDITIONAL([BUILD_ENGINE_GL_SDL], [false])
1976 AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_SDL], [false])
1977 AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_GDI], [false])
1978 AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_GDI], [false])
1979 AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_DDRAW], [false])
1980 AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_DDRAW], [false])
1981 AM_CONDITIONAL([BUILD_ENGINE_WAYLAND_EGL], [false])
1982 AM_CONDITIONAL([EVAS_STATIC_BUILD_WAYLAND_EGL], [false])
1983 AM_CONDITIONAL([BUILD_ENGINE_WAYLAND_SHM], [false])
1984 AM_CONDITIONAL([EVAS_STATIC_BUILD_WAYLAND_SHM], [false])
1985 AM_CONDITIONAL([BUILD_ENGINE_DRM], [false])
1986 AM_CONDITIONAL([EVAS_STATIC_BUILD_DRM], [false])
1987 AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_XCB], [false])
1988 AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_XCB], [false])
1989 AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_XLIB], [false])
1990 AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_XLIB], [false])
1991 AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_X11], [false])
1992 AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_X11], [false])
1993 AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_GENERIC], [false])
1994 AM_CONDITIONAL([BUILD_ENGINE_GL_XCB], [false])
1995 AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_XCB], [false])
1996 AM_CONDITIONAL([BUILD_ENGINE_GL_XLIB], [false])
1997 AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_XLIB], [false])
1998 AM_CONDITIONAL([BUILD_ENGINE_GL_X11], [false])
1999 AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_X11], [false])
2000 AM_CONDITIONAL([BUILD_ENGINE_GL_COMMON], [false])
2001 AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_COMMON], [false])
2002 AM_CONDITIONAL([BUILD_LOADER_BMP], [false])
2003 AM_CONDITIONAL([EVAS_STATIC_BUILD_BMP], [false])
2004 AM_CONDITIONAL([BUILD_LOADER_EET], [false])
2005 AM_CONDITIONAL([EVAS_STATIC_BUILD_EET], [false])
2006 AM_CONDITIONAL([BUILD_LOADER_GENERIC], [false])
2007 AM_CONDITIONAL([EVAS_STATIC_BUILD_GENERIC], [false])
2008 AM_CONDITIONAL([BUILD_LOADER_GIF], [false])
2009 AM_CONDITIONAL([EVAS_STATIC_BUILD_GIF], [false])
2010 AM_CONDITIONAL([BUILD_LOADER_ICO], [false])
2011 AM_CONDITIONAL([EVAS_STATIC_BUILD_ICO], [false])
2012 AM_CONDITIONAL([BUILD_LOADER_JPEG], [false])
2013 AM_CONDITIONAL([EVAS_STATIC_BUILD_JPEG], [false])
2014 AM_CONDITIONAL([BUILD_LOADER_JP2K], [false])
2015 AM_CONDITIONAL([EVAS_STATIC_BUILD_JP2K], [false])
2016 AM_CONDITIONAL([BUILD_LOADER_PMAPS], [false])
2017 AM_CONDITIONAL([EVAS_STATIC_BUILD_PMAPS], [false])
2018 AM_CONDITIONAL([BUILD_LOADER_PNG], [false])
2019 AM_CONDITIONAL([EVAS_STATIC_BUILD_PNG], [false])
2020 AM_CONDITIONAL([BUILD_LOADER_PSD], [false])
2021 AM_CONDITIONAL([EVAS_STATIC_BUILD_PSD], [false])
2022 AM_CONDITIONAL([BUILD_LOADER_TGA], [false])
2023 AM_CONDITIONAL([EVAS_STATIC_BUILD_TGA], [false])
2024 AM_CONDITIONAL([BUILD_LOADER_TIFF], [false])
2025 AM_CONDITIONAL([EVAS_STATIC_BUILD_TIFF], [false])
2026 AM_CONDITIONAL([BUILD_LOADER_WBMP], [false])
2027 AM_CONDITIONAL([EVAS_STATIC_BUILD_WBMP], [false])
2028 AM_CONDITIONAL([BUILD_LOADER_WEBP], [false])
2029 AM_CONDITIONAL([EVAS_STATIC_BUILD_WEBP], [false])
2030 AM_CONDITIONAL([BUILD_LOADER_XPM], [false])
2031 AM_CONDITIONAL([EVAS_STATIC_BUILD_XPM], [false])
2032 AM_CONDITIONAL([BUILD_LOADER_TGV], [false])
2033 AM_CONDITIONAL([EVAS_STATIC_BUILD_TGV], [false])
2034 AM_CONDITIONAL([BUILD_SAVER_JPEG], [false])
2035 AM_CONDITIONAL([EVAS_CSERVE2], [false])
2036fi
2037
1954#### End of Evas 2038#### End of Evas
1955 2039
1956#### Edje CXX 2040#### Edje CXX
@@ -2065,6 +2149,9 @@ AC_ARG_ENABLE([gstreamer1],
2065 fi 2149 fi
2066 ], 2150 ],
2067 [want_gstreamer1="yes"]) 2151 [want_gstreamer1="yes"])
2152if test "x${build_gui}" = "xno"; then
2153 want_gstreamer1="no"
2154fi
2068 2155
2069AC_ARG_ENABLE([tizen], 2156AC_ARG_ENABLE([tizen],
2070 [AC_HELP_STRING([--enable-tizen], 2157 [AC_HELP_STRING([--enable-tizen],
@@ -2471,7 +2558,7 @@ EFL_LIB_END([Ecore_File])
2471 2558
2472 2559
2473#### Ecore_Input 2560#### Ecore_Input
2474EFL_LIB_START([Ecore_Input]) 2561EFL_LIB_START_OPTIONAL([Ecore_Input], [test "x${build_gui}" = "xyes"])
2475 2562
2476### Additional options to configure 2563### Additional options to configure
2477 2564
@@ -2499,12 +2586,12 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [eina])
2499 2586
2500### Checks for library functions 2587### Checks for library functions
2501 2588
2502EFL_LIB_END([Ecore_Input]) 2589EFL_LIB_END_OPTIONAL([Ecore_Input])
2503#### End of Ecore_Input 2590#### End of Ecore_Input
2504 2591
2505 2592
2506#### Ecore_Input_Evas 2593#### Ecore_Input_Evas
2507EFL_LIB_START([Ecore_Input_Evas]) 2594EFL_LIB_START_OPTIONAL([Ecore_Input_Evas], [test "x${build_gui}" = "xyes"])
2508 2595
2509### Additional options to configure 2596### Additional options to configure
2510 2597
@@ -2534,7 +2621,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [eina])
2534 2621
2535### Checks for library functions 2622### Checks for library functions
2536 2623
2537EFL_LIB_END([Ecore_Input_Evas]) 2624EFL_LIB_END_OPTIONAL([Ecore_Input_Evas])
2538#### End of Ecore_Input_Evas 2625#### End of Ecore_Input_Evas
2539 2626
2540 2627
@@ -2788,6 +2875,10 @@ AC_ARG_ENABLE([audio],
2788 ], 2875 ],
2789 [want_audio="yes"]) 2876 [want_audio="yes"])
2790 2877
2878if test "x${build_gui}" = "xno"; then
2879 want_audio="no"
2880fi
2881
2791EFL_LIB_START_OPTIONAL([Ecore_Audio], [test "${want_audio}" = "yes"]) 2882EFL_LIB_START_OPTIONAL([Ecore_Audio], [test "${want_audio}" = "yes"])
2792 2883
2793### Additional options to configure 2884### Additional options to configure
@@ -3275,7 +3366,7 @@ AM_CONDITIONAL([HAVE_ECORE_X_XCB], [test "${want_x11_xcb}" = "yes"])
3275 3366
3276 3367
3277#### Ecore_Imf 3368#### Ecore_Imf
3278EFL_LIB_START([Ecore_Imf]) 3369EFL_LIB_START_OPTIONAL([Ecore_Imf], [test "x${build_gui}" = "xyes"])
3279 3370
3280### Additional options to configure 3371### Additional options to configure
3281 3372
@@ -3396,12 +3487,18 @@ EFL_ADD_FEATURE([ECORE_IMF], [wayland], [${want_ecore_imf_wayland}])
3396 3487
3397### Checks for library functions 3488### Checks for library functions
3398 3489
3399EFL_LIB_END([Ecore_Imf]) 3490EFL_LIB_END_OPTIONAL([Ecore_Imf])
3491if test "x${build_gui}" = "xno"; then
3492 AM_CONDITIONAL([BUILD_ECORE_IMF_IBUS], [false])
3493 AM_CONDITIONAL([BUILD_ECORE_IMF_SCIM], [false])
3494 AM_CONDITIONAL([BUILD_ECORE_IMF_XIM], [false])
3495 AM_CONDITIONAL([BUILD_ECORE_IMF_WAYLAND], [false])
3496fi
3400#### End of Ecore_Imf 3497#### End of Ecore_Imf
3401 3498
3402 3499
3403#### Ecore_Imf_Evas 3500#### Ecore_Imf_Evas
3404EFL_LIB_START([Ecore_Imf_Evas]) 3501EFL_LIB_START_OPTIONAL([Ecore_Imf_Evas], [test "x${build_gui}" = "xyes"])
3405 3502
3406### Additional options to configure 3503### Additional options to configure
3407 3504
@@ -3432,7 +3529,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [eina])
3432 3529
3433### Checks for library functions 3530### Checks for library functions
3434 3531
3435EFL_LIB_END([Ecore_Imf_Evas]) 3532EFL_LIB_END_OPTIONAL([Ecore_Imf_Evas])
3436#### End of Ecore_Imf_Evas 3533#### End of Ecore_Imf_Evas
3437 3534
3438 3535
@@ -3555,7 +3652,7 @@ AM_CONDITIONAL([HAVE_EEZE_TIZEN], [test "x${want_tizen}" = "xyes"])
3555 3652
3556 3653
3557#### Ecore_Evas 3654#### Ecore_Evas
3558EFL_LIB_START([Ecore_Evas]) 3655EFL_LIB_START_OPTIONAL([Ecore_Evas], [test "x${build_gui}" = "xyes"])
3559 3656
3560### Additional options to configure 3657### Additional options to configure
3561 3658
@@ -3715,7 +3812,28 @@ EFL_EVAL_PKGS([ECORE_EVAS])
3715 3812
3716### Checks for library functions 3813### Checks for library functions
3717 3814
3718EFL_LIB_END([Ecore_Evas]) 3815EFL_LIB_END_OPTIONAL([Ecore_Evas])
3816if test "x${build_gui}" = "xno"; then
3817 AM_CONDITIONAL([BUILD_ECORE_EVAS_EXTN], [false])
3818 AM_CONDITIONAL([BUILD_ECORE_EVAS_EWS], [false])
3819 AM_CONDITIONAL([BUILD_ECORE_EVAS_FB], [false])
3820 AM_CONDITIONAL([BUILD_ECORE_EVAS_DRM], [false])
3821 AM_CONDITIONAL([BUILD_ECORE_EVAS_PSL1GHT], [false])
3822 AM_CONDITIONAL([BUILD_ECORE_EVAS_OPENGL_COCOA], [false])
3823 AM_CONDITIONAL([BUILD_ECORE_EVAS_SOFTWARE_SDL], [false])
3824 AM_CONDITIONAL([BUILD_ECORE_EVAS_OPENGL_SDL], [false])
3825 AM_CONDITIONAL([BUILD_ECORE_EVAS_SDL], [false])
3826 AM_CONDITIONAL([BUILD_ECORE_EVAS_WAYLAND_SHM], [false])
3827 AM_CONDITIONAL([BUILD_ECORE_EVAS_WAYLAND_EGL], [false])
3828 AM_CONDITIONAL([BUILD_ECORE_EVAS_WAYLAND], [false])
3829 AM_CONDITIONAL([BUILD_ECORE_EVAS_SOFTWARE_GDI], [false])
3830 AM_CONDITIONAL([BUILD_ECORE_EVAS_SOFTWARE_DDRAW], [false])
3831 AM_CONDITIONAL([BUILD_ECORE_EVAS_WIN32], [false])
3832 AM_CONDITIONAL([BUILD_ECORE_EVAS_SOFTWARE_X11], [false])
3833 AM_CONDITIONAL([BUILD_ECORE_EVAS_OPENGL_X11], [false])
3834 AM_CONDITIONAL([BUILD_ECORE_EVAS_X11], [false])
3835fi
3836
3719#### End of Ecore_Evas 3837#### End of Ecore_Evas
3720 3838
3721#### Eio 3839#### Eio
@@ -3849,6 +3967,10 @@ AC_ARG_ENABLE([physics],
3849 ], 3967 ],
3850 [want_physics="yes"]) 3968 [want_physics="yes"])
3851 3969
3970if test "x${build_gui}" = "xno"; then
3971 want_physics="no"
3972fi
3973
3852EFL_LIB_START_OPTIONAL([EPhysics], [test "${want_physics}" = "yes"]) 3974EFL_LIB_START_OPTIONAL([EPhysics], [test "${want_physics}" = "yes"])
3853 3975
3854### Additional options to configure 3976### Additional options to configure
@@ -3886,7 +4008,7 @@ EFL_LIB_END_OPTIONAL([EPhysics])
3886 4008
3887 4009
3888#### Edje 4010#### Edje
3889EFL_LIB_START([Edje]) 4011EFL_LIB_START_OPTIONAL([Edje], [test "x${build_gui}" = "xyes"])
3890 4012
3891### Additional options to configure 4013### Additional options to configure
3892 4014
@@ -3904,6 +4026,10 @@ AC_ARG_ENABLE([multisense],
3904 ], 4026 ],
3905 [want_multisense="no"]) 4027 [want_multisense="no"])
3906 4028
4029if test "x${build_gui}" = "xno"; then
4030 want_multisense="no"
4031fi
4032
3907# TODO: should we keep or remove these? 4033# TODO: should we keep or remove these?
3908want_edje_program_cache="no" 4034want_edje_program_cache="no"
3909want_edje_calc_cache="yes" 4035want_edje_calc_cache="yes"
@@ -3955,7 +4081,8 @@ AC_DEFINE_IF([BUILD_EDJE_FP], [test "${want_fixed_point}" = "yes"],
3955 4081
3956AM_CONDITIONAL([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"]) 4082AM_CONDITIONAL([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"])
3957AC_DEFINE_IF([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"], 4083AC_DEFINE_IF([ENABLE_MULTISENSE], [test "${want_multisense}" = "yes"],
3958 [1], [Use Multisense]) 4084 [1], [Use Multisense])
4085
3959AC_SUBST([want_multisense]) 4086AC_SUBST([want_multisense])
3960AC_SUBST([want_physics]) 4087AC_SUBST([want_physics])
3961 4088
@@ -3975,9 +4102,15 @@ sys/wait.h \
3975 4102
3976### Checks for library functions 4103### Checks for library functions
3977 4104
3978EFL_LIB_END([Edje]) 4105EFL_LIB_END_OPTIONAL([Edje])
4106
4107if test "x${build_gui}" = "xno"; then
4108 AC_DEFINE([ENABLE_MULTISENSE], [0], [Use Multisense])
4109 AM_CONDITIONAL([ENABLE_MULTISENSE], [false])
4110fi
3979#### End of Edje 4111#### End of Edje
3980 4112
4113
3981#### Edje CXX 4114#### Edje CXX
3982EFL_LIB_START([Edje_Cxx]) 4115EFL_LIB_START([Edje_Cxx])
3983 4116
@@ -3987,7 +4120,7 @@ EFL_LIB_END([Edje_Cxx])
3987#### End of Edje CXX 4120#### End of Edje CXX
3988 4121
3989#### Emotion 4122#### Emotion
3990EFL_LIB_START([Emotion]) 4123EFL_LIB_START_OPTIONAL([Emotion], [test "x${build_gui}" = "xyes"])
3991 4124
3992## Compatibility layers 4125## Compatibility layers
3993EFL_PLATFORM_DEPEND([Emotion], [evil]) 4126EFL_PLATFORM_DEPEND([Emotion], [evil])
@@ -4073,12 +4206,23 @@ fi
4073 4206
4074### Check availability 4207### Check availability
4075 4208
4076EFL_LIB_END([Emotion]) 4209EFL_LIB_END_OPTIONAL([Emotion])
4210
4211if test "x${build_gui}" = "xno"; then
4212 AM_CONDITIONAL([EMOTION_BUILD_XINE], [false])
4213 AM_CONDITIONAL([EMOTION_STATIC_BUILD_XINE], [false])
4214 AM_CONDITIONAL([EMOTION_BUILD_GSTREAMER], [false])
4215 AM_CONDITIONAL([EMOTION_STATIC_BUILD_GSTREAMER], [false])
4216 AM_CONDITIONAL([EMOTION_BUILD_GSTREAMER1], [false])
4217 AM_CONDITIONAL([EMOTION_STATIC_BUILD_GSTREAMER1], [false])
4218 AM_CONDITIONAL([EMOTION_BUILD_GENERIC], [false])
4219 AM_CONDITIONAL([EMOTION_STATIC_BUILD_GENERIC], [false])
4220fi
4077#### End of Emotion 4221#### End of Emotion
4078 4222
4079 4223
4080#### Ethumb 4224#### Ethumb
4081EFL_LIB_START([Ethumb]) 4225EFL_LIB_START_OPTIONAL([Ethumb], [test "x${build_gui}" = "xyes"])
4082 4226
4083### Default values 4227### Default values
4084 4228
@@ -4120,12 +4264,11 @@ EFL_EVAL_PKGS([ETHUMB])
4120 4264
4121### Check availability 4265### Check availability
4122 4266
4123EFL_LIB_END([Ethumb]) 4267EFL_LIB_END_OPTIONAL([Ethumb])
4124#### End of Ethumb 4268#### End of Ethumb
4125 4269
4126#### Ethumb_Client 4270#### Ethumb_Client
4127EFL_LIB_START([Ethumb_Client]) 4271EFL_LIB_START_OPTIONAL([Ethumb_Client], [test "x${build_gui}" = "xyes"])
4128
4129### Default values 4272### Default values
4130 4273
4131### Additional options to configure 4274### Additional options to configure
@@ -4161,7 +4304,7 @@ EFL_EVAL_PKGS([ETHUMB_CLIENT])
4161 4304
4162### Check availability 4305### Check availability
4163 4306
4164EFL_LIB_END([Ethumb_Client]) 4307EFL_LIB_END_OPTIONAL([Ethumb_Client])
4165#### End of Ethumb_Client 4308#### End of Ethumb_Client
4166 4309
4167 4310
@@ -4388,7 +4531,8 @@ echo " Cryptography..: ${build_crypto}"
4388echo " X11...........: ${with_x11}" 4531echo " X11...........: ${with_x11}"
4389echo " OpenGL........: ${with_opengl}" 4532echo " OpenGL........: ${with_opengl}"
4390echo " C++11.........: ${have_cxx11}" 4533echo " C++11.........: ${have_cxx11}"
4391echo "Evas............: yes (${features_evas})" 4534echo " GUI libs......: ${build_gui}"
4535echo "Evas............: ${efl_lib_optional_evas} (${features_evas})"
4392echo " Engines.......: ${features_evas_engine}" 4536echo " Engines.......: ${features_evas_engine}"
4393echo " Image Loaders.: ${features_evas_loader}" 4537echo " Image Loaders.: ${features_evas_loader}"
4394if test "x${have_pixman}" = "xyes" ; then 4538if test "x${have_pixman}" = "xyes" ; then
@@ -4400,7 +4544,7 @@ echo "Eina............: yes (${features_eina})"
4400echo "Ecore...........: yes (${features_ecore})" 4544echo "Ecore...........: yes (${features_ecore})"
4401echo "Ecore_Con.......: yes (${features_ecore_con})" 4545echo "Ecore_Con.......: yes (${features_ecore_con})"
4402echo "Ecore_File......: yes" 4546echo "Ecore_File......: yes"
4403echo "Ecore_IMF.......: yes (${features_ecore_imf})" 4547echo "Ecore_IMF.......: ${efl_lib_optional_ecore_imf} (${features_ecore_imf})"
4404echo "Ecore_X.........: ${with_x11} (${features_ecore_x})" 4548echo "Ecore_X.........: ${with_x11} (${features_ecore_x})"
4405echo "Ecore_SDL.......: $want_sdl" 4549echo "Ecore_SDL.......: $want_sdl"
4406echo "Ecore_Wayland...: $want_wayland" 4550echo "Ecore_Wayland...: $want_wayland"
@@ -4416,13 +4560,13 @@ echo "Ecore_WinCE.....: $have_wince"
4416fi 4560fi
4417echo "Ecore_Audio.....: ${efl_lib_optional_ecore_audio} (${features_ecore_audio})" 4561echo "Ecore_Audio.....: ${efl_lib_optional_ecore_audio} (${features_ecore_audio})"
4418echo "Ecore_Avahi.....: yes (${features_ecore_avahi})" 4562echo "Ecore_Avahi.....: yes (${features_ecore_avahi})"
4419echo "Ecore_Evas......: yes (${features_ecore_evas})" 4563echo "Ecore_Evas......: ${efl_lib_optional_ecore_evas} (${features_ecore_evas})"
4420echo "Eeze............: ${efl_lib_optional_eeze} (${features_eeze})" 4564echo "Eeze............: ${efl_lib_optional_eeze} (${features_eeze})"
4421echo "EPhysics........: ${efl_lib_optional_ephysics}" 4565echo "EPhysics........: ${efl_lib_optional_ephysics}"
4422echo "Edje............: yes (${features_edje})" 4566echo "Edje............: ${efl_lib_optional_edje} (${features_edje})"
4423echo "Emotion.........: yes (${features_emotion})" 4567echo "Emotion.........: ${efl_lib_optional_emotion} (${features_emotion})"
4424echo "Ethumb..........: yes" 4568echo "Ethumb..........: ${efl_lib_optional_ethumb}"
4425echo "Ethumb_Client...: yes" 4569echo "Ethumb_Client...: ${efl_lib_optional_ethumb_client}"
4426if test "${build_tests}" = "none"; then 4570if test "${build_tests}" = "none"; then
4427echo "Tests...........: no" 4571echo "Tests...........: no"
4428elif test "${build_tests}" = "auto"; then 4572elif test "${build_tests}" = "auto"; then
diff --git a/data/Makefile.am b/data/Makefile.am
index 5cd88de..6d42a09 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -55,6 +55,8 @@ CLEANFILES += libeo.so.@VMAJ@.@VMIN@.@VMIC@-gdb.py
55 55
56EXTRA_DIST += $(eogdb_SCRIPTS) eo/libeo-gdb.py.in 56EXTRA_DIST += $(eogdb_SCRIPTS) eo/libeo-gdb.py.in
57 57
58if BUILD_GUI
59
58######################################################################## 60########################################################################
59# Edje 61# Edje
60edjefilesdir = $(datadir)/edje/include 62edjefilesdir = $(datadir)/edje/include
@@ -110,3 +112,4 @@ ethumb/frames/border-0.jpg
110ethumb_clientfilesdir = $(datadir)/ethumb_client 112ethumb_clientfilesdir = $(datadir)/ethumb_client
111ethumb_clientfiles_DATA = ethumb_client/checkme 113ethumb_clientfiles_DATA = ethumb_client/checkme
112EXTRA_DIST += $(ethumb_clientfiles_DATA) 114EXTRA_DIST += $(ethumb_clientfiles_DATA)
115endif
diff --git a/doc/previews/Makefile.am b/doc/previews/Makefile.am
index b711b8b..7ec4d17 100644
--- a/doc/previews/Makefile.am
+++ b/doc/previews/Makefile.am
@@ -1,3 +1,4 @@
1if BUILD_GUI
1if EFL_BUILD_DOC 2if EFL_BUILD_DOC
2 3
3.PHONY: doc 4.PHONY: doc
@@ -63,9 +64,9 @@ endif
63 64
64 65
65endif 66endif
67endif
66 68
67EXTRA_DIST = preview_text_filter.c 69EXTRA_DIST = preview_text_filter.c
68 70
69clean-local: 71clean-local:
70 rm -rf $(DATADIR) 72 rm -rf $(DATADIR)
71
diff --git a/src/Makefile.am b/src/Makefile.am
index 41fc0d3..58124bb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,12 +34,20 @@ include Makefile_Eina.am
34include Makefile_Eo.am 34include Makefile_Eo.am
35include Makefile_Eet.am 35include Makefile_Eet.am
36include Makefile_Eolian.am 36include Makefile_Eolian.am
37include Makefile_Evas.am
38include Makefile_Ecore.am 37include Makefile_Ecore.am
39include Makefile_Ecore_Cxx.am 38include Makefile_Ecore_Cxx.am
40include Makefile_Ecore_Con.am 39include Makefile_Ecore_Con.am
41include Makefile_Ecore_Ipc.am 40include Makefile_Ecore_Ipc.am
42include Makefile_Ecore_File.am 41include Makefile_Ecore_File.am
42include Makefile_Ecore_Avahi.am
43include Makefile_Embryo.am
44include Makefile_Eio.am
45include Makefile_Eldbus.am
46include Makefile_Efreet.am
47include Makefile_Eeze.am
48
49if BUILD_GUI
50include Makefile_Evas.am
43include Makefile_Ecore_Input.am 51include Makefile_Ecore_Input.am
44include Makefile_Ecore_Input_Evas.am 52include Makefile_Ecore_Input_Evas.am
45include Makefile_Ecore_Cocoa.am 53include Makefile_Ecore_Cocoa.am
@@ -51,29 +59,25 @@ include Makefile_Ecore_Wayland.am
51include Makefile_Ecore_Win32.am 59include Makefile_Ecore_Win32.am
52include Makefile_Ecore_WinCE.am 60include Makefile_Ecore_WinCE.am
53include Makefile_Ecore_X.am 61include Makefile_Ecore_X.am
62include Makefile_Ecore_Audio.am
54include Makefile_Ecore_IMF.am 63include Makefile_Ecore_IMF.am
55include Makefile_Ecore_IMF_Evas.am 64include Makefile_Ecore_IMF_Evas.am
56include Makefile_Ecore_Evas.am 65include Makefile_Ecore_Evas.am
57include Makefile_Ecore_Audio.am
58include Makefile_Ecore_Audio_Cxx.am
59include Makefile_Ecore_Avahi.am
60include Makefile_Embryo.am
61include Makefile_Eio.am
62include Makefile_Eldbus.am
63include Makefile_Efreet.am
64include Makefile_Eeze.am
65include Makefile_EPhysics.am 66include Makefile_EPhysics.am
66include Makefile_Edje.am 67include Makefile_Edje.am
67include Makefile_Emotion.am 68include Makefile_Emotion.am
68include Makefile_Ethumb.am 69include Makefile_Ethumb.am
69include Makefile_Ethumb_Client.am 70include Makefile_Ethumb_Client.am
70 71
72include Makefile_Ecore_Audio_Cxx.am
73include Makefile_Edje_Cxx.am
74include Makefile_Evas_Cxx.am
75endif
76
71include Makefile_Eina_Cxx.am 77include Makefile_Eina_Cxx.am
72include Makefile_Eolian_Cxx.am 78include Makefile_Eolian_Cxx.am
73include Makefile_Eet_Cxx.am 79include Makefile_Eet_Cxx.am
74include Makefile_Eo_Cxx.am 80include Makefile_Eo_Cxx.am
75include Makefile_Edje_Cxx.am
76include Makefile_Evas_Cxx.am
77 81
78.PHONY: benchmark examples 82.PHONY: benchmark examples
79 83