diff options
| author | Mike Blumenkrantz <zmike@samsung.com> | 2013-09-11 14:23:43 +0100 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@samsung.com> | 2014-01-14 20:28:57 -0500 |
| commit | 12d7405a0fa1c82d6d86d84e2783af212e22f0b1 (patch) | |
| tree | aae209930af0b380ee3ef0e23dc6b42a4c9a1f95 /src/bin/Makefile.mk | |
| parent | a9627e84f511af70daef4e137720892657a2f841 (diff) | |
| download | enlightenment-12d7405a0fa1c82d6d86d84e2783af212e22f0b1.tar.gz | |
huge wl fixup (wayland clients actually working again)
* try to clear up build system for separating out ecore-x
* add #ifdefs for lots of ecore-x stuff
* break out some internal e wl functions for reuse in api
* store wl surface buffers as an inlist
* add protocol-specific client compositor data
** move lots of X client attributes here
* add pixmap type checks to a number of X-specific things, such as grabinput, to block them for non-X clients
* rearrange startup order to work with wayland
* move X screensaver code to e_comp_x
* flag modules still requiring X with -DNEED_X
Diffstat (limited to 'src/bin/Makefile.mk')
| -rw-r--r-- | src/bin/Makefile.mk | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk index 9fe961b00f..99553827b3 100644 --- a/src/bin/Makefile.mk +++ b/src/bin/Makefile.mk @@ -210,7 +210,6 @@ endif enlightenment_src = \ src/bin/e_about.c \ src/bin/e_acpi.c \ -src/bin/e_alert.c \ src/bin/e_actions.c \ src/bin/e_atoms.c \ src/bin/e_backlight.c \ @@ -226,7 +225,6 @@ src/bin/e_comp.c \ src/bin/e_comp_canvas.c \ src/bin/e_comp_cfdata.c \ src/bin/e_comp_object.c \ -src/bin/e_comp_x.c \ src/bin/e_config.c \ src/bin/e_config_data.c \ src/bin/e_config_dialog.c \ @@ -307,7 +305,6 @@ src/bin/e_place.c \ src/bin/e_pointer.c \ src/bin/e_powersave.c \ src/bin/e_prefix.c \ -src/bin/e_randr.c \ src/bin/e_remember.c \ src/bin/e_resist.c \ src/bin/e_scale.c \ @@ -362,25 +359,31 @@ src/bin/e_widget_toolbar.c \ src/bin/e_widget_toolbook.c \ src/bin/e_win.c \ src/bin/e_xinerama.c \ -src/bin/e_xkb.c \ -src/bin/e_xsettings.c \ src/bin/e_zoomap.c \ src/bin/e_zone.c \ $(ENLIGHTENMENTHEADERS) +if ! HAVE_WAYLAND_ONLY +enlightenment_src += \ +src/bin/e_alert.c \ +src/bin/e_comp_x.c \ +src/bin/e_randr.c \ +src/bin/e_xkb.c \ +src/bin/e_xsettings.c +endif + if HAVE_WAYLAND_CLIENTS enlightenment_src += \ src/bin/e_comp_wl.c endif -src_bin_enlightenment_CFLAGS = $(AM_CPPFLAGS) @WAYLAND_CFLAGS@ @WAYLAND_EGL_CFLAGS@ -src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DE_LOGGING=1 +src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DE_LOGGING=1 @WAYLAND_CFLAGS@ @WAYLAND_EGL_CFLAGS@ @ECORE_X_CFLAGS@ -DNEED_X=1 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@ @WAYLAND_EGL_LIBS@ -lm +src_bin_enlightenment_LDADD = @e_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @WAYLAND_LIBS@ @WAYLAND_EGL_LIBS@ -lm @ECORE_X_LIBS@ src_bin_enlightenment_imc_SOURCES = \ src/bin/e.h \ |