discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=df4ada7e7577a26c7d6092c99fac26bd9c95004a
commit df4ada7e7577a26c7d6092c99fac26bd9c95004a Author: Mike Blumenkrantz <zm...@osg.samsung.com> Date: Wed Apr 22 17:29:53 2015 -0400 fix ecore-x cflags/libs inclusion for e binary these variables will always exist --- src/bin/Makefile.mk | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk index 0266f21..f8ade10 100644 --- a/src/bin/Makefile.mk +++ b/src/bin/Makefile.mk @@ -373,19 +373,16 @@ src/bin/e_comp_wl_input.c \ src/bin/e_comp_wl.c endif -src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DEFL_BETA_API_SUPPORT -DEFL_EO_API_SUPPORT -DE_LOGGING=1 @WAYLAND_CFLAGS@ @WAYLAND_EGL_CFLAGS@ -DNEED_WL +src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DEFL_BETA_API_SUPPORT -DEFL_EO_API_SUPPORT -DE_LOGGING=1 @WAYLAND_CFLAGS@ @WAYLAND_EGL_CFLAGS@ @ECORE_X_CFLAGS@ if ! HAVE_WAYLAND_ONLY -src_bin_enlightenment_CPPFLAGS += @ECORE_X_CFLAGS@ -DNEED_X=1 +src_bin_enlightenment_CPPFLAGS += -DNEED_X=1 endif src_bin_enlightenment_SOURCES = \ src/bin/e_main.c \ $(enlightenment_src) src_bin_enlightenment_LDFLAGS = -export-dynamic -src_bin_enlightenment_LDADD = @e_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @WAYLAND_LIBS@ @WL_DRM_LIBS@ @WAYLAND_EGL_LIBS@ -lm @SHM_OPEN_LIBS@ -if ! HAVE_WAYLAND_ONLY -src_bin_enlightenment_LDADD += @ECORE_X_LIBS@ -endif +src_bin_enlightenment_LDADD = @e_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @WAYLAND_LIBS@ @WL_DRM_LIBS@ @WAYLAND_EGL_LIBS@ -lm @SHM_OPEN_LIBS@ @ECORE_X_LIBS@ src_bin_enlightenment_imc_SOURCES = \ src/bin/e.h \ --