Re: [PATCH weston v2] build: honour libinput header location

[Pekka Paalanen]

On Thu, 15 Mar 2018 14:01:28 +
Daniel Stone  wrote:

> Hi,
> 
> On 15 March 2018 at 13:45, Emil Velikov  wrote:
> > Add the respective CFLAGS to the build, otherwise it will error out as
> > seen below.
> >
> > src/libinput-seat.c:30:22: fatal error: libinput.h: No such file or 
> > directory
> >
> > v2: add the CFLAGS only as needed, suggested by Pekka
> >
> > Cc: Pekka Paalanen 
> > Cc: Jan Engelhardt 
> > [Emil Velikov: polish commit message, v2]
> > Signed-off-by: Emil Velikov 
> > ---
> > Pekka feel free to pick whichever patch you feel more confortable with.  
> 
> I have a mild preference for this one, but either is:
> Reviewed-by: Daniel Stone 


Perfect! Pushed:
   df9278ae..5fa19343  master -> master


Thanks,
pq


pgpAerdoTLyHB.pgp
Description: OpenPGP digital signature
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/wayland-devel

Re: [PATCH weston v2] build: honour libinput header location

[Daniel Stone]

Hi,

On 15 March 2018 at 13:45, Emil Velikov  wrote:
> Add the respective CFLAGS to the build, otherwise it will error out as
> seen below.
>
> src/libinput-seat.c:30:22: fatal error: libinput.h: No such file or directory
>
> v2: add the CFLAGS only as needed, suggested by Pekka
>
> Cc: Pekka Paalanen 
> Cc: Jan Engelhardt 
> [Emil Velikov: polish commit message, v2]
> Signed-off-by: Emil Velikov 
> ---
> Pekka feel free to pick whichever patch you feel more confortable with.

I have a mild preference for this one, but either is:
Reviewed-by: Daniel Stone 

Cheers,
Daniel
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/wayland-devel

[PATCH weston v2] build: honour libinput header location

[Emil Velikov]

From: Jan Engelhardt 

Add the respective CFLAGS to the build, otherwise it will error out as
seen below.

src/libinput-seat.c:30:22: fatal error: libinput.h: No such file or directory

v2: add the CFLAGS only as needed, suggested by Pekka

Cc: Pekka Paalanen 
Cc: Jan Engelhardt 
[Emil Velikov: polish commit message, v2]
Signed-off-by: Emil Velikov 
---
Pekka feel free to pick whichever patch you feel more confortable with.
---
 Makefile.am | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index e028a2a1..7e930d2b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -178,7 +178,7 @@ weston_LDFLAGS = -export-dynamic
 weston_CPPFLAGS = $(AM_CPPFLAGS) -DIN_WESTON   \
 -DMODULEDIR='"$(moduledir)"' \
 -DXSERVER_PATH='"@XSERVER_PATH@"'
-weston_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS)
+weston_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBINPUT_BACKEND_CFLAGS)
 weston_LDADD = libshared.la libweston-@LIBWESTON_MAJOR@.la \
$(COMPOSITOR_LIBS) \
$(DL_LIBS) $(LIBINPUT_BACKEND_LIBS) \
@@ -346,6 +346,7 @@ x11_backend_la_SOURCES =\
shared/helpers.h
 endif
 
+INPUT_BACKEND_CFLAGS = $(LIBINPUT_BACKEND_CFLAGS)
 INPUT_BACKEND_LIBS = $(LIBINPUT_BACKEND_LIBS)
 INPUT_BACKEND_SOURCES =\
libweston/libinput-seat.c   \
@@ -369,6 +370,7 @@ drm_backend_la_CFLAGS = \
$(COMPOSITOR_CFLAGS)\
$(EGL_CFLAGS)   \
$(DRM_COMPOSITOR_CFLAGS)\
+   $(INPUT_BACKEND_CFLAGS) \
$(AM_CFLAGS)
 drm_backend_la_SOURCES =   \
libweston/compositor-drm.c  \
@@ -443,6 +445,7 @@ fbdev_backend_la_CFLAGS =   \
$(EGL_CFLAGS)   \
$(FBDEV_COMPOSITOR_CFLAGS)  \
$(PIXMAN_CFLAGS)\
+   $(INPUT_BACKEND_CFLAGS) \
$(AM_CFLAGS)
 fbdev_backend_la_SOURCES = \
libweston/compositor-fbdev.c\
-- 
2.16.0

___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/wayland-devel