mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: honour libinput header location

Browse Source 
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 <pekka.paalanen@collabora.co.uk>
Cc: Jan Engelhardt <jengelh@inai.de>
[Emil Velikov: polish commit message, v2]
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Jan Engelhardt
2018-03-15 13:45:28 +00:00
committed by Pekka Paalanen
parent df9278aea7
commit 5fa193430c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.am
+4 -1
View File
@@ -178,7 +178,7 @@ weston_LDFLAGS = -export-dynamic
weston_CPPFLAGS = $(AM_CPPFLAGS) -DIN_WESTON \ weston_CPPFLAGS = $(AM_CPPFLAGS) -DIN_WESTON \
-DMODULEDIR='"$(moduledir)"' \ -DMODULEDIR='"$(moduledir)"' \
-DXSERVER_PATH='"@XSERVER_PATH@"' -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 \ weston_LDADD = libshared.la libweston-@LIBWESTON_MAJOR@.la \
$(COMPOSITOR_LIBS) \ $(COMPOSITOR_LIBS) \
$(DL_LIBS) $(LIBINPUT_BACKEND_LIBS) \ $(DL_LIBS) $(LIBINPUT_BACKEND_LIBS) \
@@ -346,6 +346,7 @@ x11_backend_la_SOURCES = \
shared/helpers.h shared/helpers.h
endif endif
INPUT_BACKEND_CFLAGS = $(LIBINPUT_BACKEND_CFLAGS)
INPUT_BACKEND_LIBS = $(LIBINPUT_BACKEND_LIBS) INPUT_BACKEND_LIBS = $(LIBINPUT_BACKEND_LIBS)
INPUT_BACKEND_SOURCES = \ INPUT_BACKEND_SOURCES = \
libweston/libinput-seat.c \ libweston/libinput-seat.c \
@@ -369,6 +370,7 @@ drm_backend_la_CFLAGS = \
$(COMPOSITOR_CFLAGS) \ $(COMPOSITOR_CFLAGS) \
$(EGL_CFLAGS) \ $(EGL_CFLAGS) \
$(DRM_COMPOSITOR_CFLAGS) \ $(DRM_COMPOSITOR_CFLAGS) \
$(INPUT_BACKEND_CFLAGS) \
$(AM_CFLAGS) $(AM_CFLAGS)
drm_backend_la_SOURCES = \ drm_backend_la_SOURCES = \
libweston/compositor-drm.c \ libweston/compositor-drm.c \
@@ -443,6 +445,7 @@ fbdev_backend_la_CFLAGS = \
$(EGL_CFLAGS) \ $(EGL_CFLAGS) \
$(FBDEV_COMPOSITOR_CFLAGS) \ $(FBDEV_COMPOSITOR_CFLAGS) \
$(PIXMAN_CFLAGS) \ $(PIXMAN_CFLAGS) \
$(INPUT_BACKEND_CFLAGS) \
$(AM_CFLAGS) $(AM_CFLAGS)
fbdev_backend_la_SOURCES = \ fbdev_backend_la_SOURCES = \
libweston/compositor-fbdev.c \ libweston/compositor-fbdev.c \