Fix out of tree builds

I broke out of tree builds when I landed the wayland protocol autogen
patches.  This should fix it up.
This commit is contained in:
Derek Foreman 2016-11-02 16:16:08 -05:00
parent 46cad09e3e
commit 9c26487b37
5 changed files with 8 additions and 5 deletions

View File

@ -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@ \

View File

@ -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

View File

@ -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)

View File

@ -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 = \

View File

@ -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 = \