derekf pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=9c26487b37c046e954b8223a0a32e46c7b16c9f4
commit 9c26487b37c046e954b8223a0a32e46c7b16c9f4 Author: Derek Foreman <[email protected]> Date: Wed Nov 2 16:16:08 2016 -0500 Fix out of tree builds I broke out of tree builds when I landed the wayland protocol autogen patches. This should fix it up. --- src/bin/Makefile.mk | 2 +- src/modules/Makefile_shot.mk | 2 +- src/modules/Makefile_wl_desktop_shell.mk | 3 ++- src/modules/Makefile_wl_text_input.mk | 3 ++- src/modules/Makefile_wl_weekeyboard.mk | 3 ++- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk index 4c91854..e214a7d 100644 --- a/src/bin/Makefile.mk +++ b/src/bin/Makefile.mk @@ -21,7 +21,7 @@ E_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/bin/efx \ --I$(top_srcdir)/src/bin/generated \ +-I$(top_builddir)/src/bin/generated \ @e_cflags@ \ @cf_cflags@ \ @VALGRIND_CFLAGS@ \ diff --git a/src/modules/Makefile_shot.mk b/src/modules/Makefile_shot.mk index 31e104d..2c20672 100644 --- a/src/modules/Makefile_shot.mk +++ b/src/modules/Makefile_shot.mk @@ -12,7 +12,7 @@ shotpkg_LTLIBRARIES = src/modules/shot/module.la nodist_src_modules_shot_module_la_SOURCES = src_modules_shot_module_la_LIBADD = $(MOD_LIBS) @WAYLAND_LIBS@ src_modules_shot_module_la_CPPFLAGS = \ -$(MOD_CPPFLAGS) @WAYLAND_CFLAGS@ +$(MOD_CPPFLAGS) @WAYLAND_CFLAGS@ -I$(top_builddir)/src/modules/shot src_modules_shot_module_la_LDFLAGS = $(MOD_LDFLAGS) src_modules_shot_module_la_SOURCES = \ src/modules/shot/e_mod_main.c diff --git a/src/modules/Makefile_wl_desktop_shell.mk b/src/modules/Makefile_wl_desktop_shell.mk index 83b0d5a..3995799 100644 --- a/src/modules/Makefile_wl_desktop_shell.mk +++ b/src/modules/Makefile_wl_desktop_shell.mk @@ -17,7 +17,8 @@ wl_desktop_shell_wayland_sources = \ src/modules/wl_desktop_shell/input-method-unstable-v1-server-protocol.h src_modules_wl_desktop_shell_module_la_DEPENDENCIES = $(MDEPENDENCIES) -src_modules_wl_desktop_shell_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @WAYLAND_CFLAGS@ +src_modules_wl_desktop_shell_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @WAYLAND_CFLAGS@ \ + -I$(top_builddir)/src/modules/wl_desktop_shell src_modules_wl_desktop_shell_module_la_LIBADD = $(MOD_LIBS) @WAYLAND_LIBS@ src_modules_wl_desktop_shell_module_la_LDFLAGS = $(MOD_LDFLAGS) diff --git a/src/modules/Makefile_wl_text_input.mk b/src/modules/Makefile_wl_text_input.mk index 305013d..4db6f7e 100644 --- a/src/modules/Makefile_wl_text_input.mk +++ b/src/modules/Makefile_wl_text_input.mk @@ -10,7 +10,8 @@ wl_text_input_wayland_sources = \ src/modules/wl_text_input/input-method-unstable-v1-protocol.c \ src/modules/wl_text_input/input-method-unstable-v1-server-protocol.h src_modules_wl_text_input_module_la_DEPENDENCIES = $(MDEPENDENCIES) -src_modules_wl_text_input_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @WAYLAND_CFLAGS@ +src_modules_wl_text_input_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @WAYLAND_CFLAGS@ \ + -I$(top_builddir)/src/modules/wl_text_input src_modules_wl_text_input_module_la_LIBADD = $(MOD_LIBS) @WAYLAND_LIBS@ src_modules_wl_text_input_module_la_LDFLAGS = $(MOD_LDFLAGS) nodist_src_modules_wl_text_input_module_la_SOURCES = \ diff --git a/src/modules/Makefile_wl_weekeyboard.mk b/src/modules/Makefile_wl_weekeyboard.mk index d90ebdf..d993747 100644 --- a/src/modules/Makefile_wl_weekeyboard.mk +++ b/src/modules/Makefile_wl_weekeyboard.mk @@ -17,7 +17,8 @@ src_modules_wl_weekeyboard_module_la_DEPENDENCIES = $(MDEPENDENCIES) src_modules_wl_weekeyboard_module_la_CPPFLAGS = \ $(MOD_CPPFLAGS) \ @WAYLAND_CFLAGS@ \ - -DPKGDATADIR='"$pkgdatadir)"' + -DPKGDATADIR='"$pkgdatadir)"' \ + -I$(top_builddir)/src/modules/wl_weekeyboard src_modules_wl_weekeyboard_module_la_LIBADD = $(MOD_LIBS) @WAYLAND_LIBS@ src_modules_wl_weekeyboard_module_la_LDFLAGS = $(MOD_LDFLAGS) wl_weekeyboard_wayland_sources = \ --
