frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/xwayland/Makefile.am: fix build without glx 

Commit d8ec33fe05 added libglxvnd.la to
Xwayland_LDFLAGS but GLX can be disabled through --disable-glx.
In this case, build fails on:

make[3]: *** No rule to make target '../../glx/libglxvnd.la', needed by 'Xwayland'.  Stop.
make[3]: *** Waiting for unfinished jobs....

Fixes:
 - http://autobuild.buildroot.org/results/397f8098c57fc6c88aa12dc8d35ebb1b933d52ef

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
This commit is contained in:
Fabrice Fontaine 2019-04-19 10:19:50 +02:00 committed by Adam Jackson
parent 0854732d55
commit 836f93de99
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xwayland/Makefile.am
View File

@ -21,10 +21,14 @@ Xwayland_SOURCES = \
$(top_srcdir)/Xi/stubs.c \ $(top_srcdir)/Xi/stubs.c \
$(top_srcdir)/mi/miinitext.c $(top_srcdir)/mi/miinitext.c
if GLX
GLXVND_LIB = $(top_builddir)/glx/libglxvnd.la
endif
Xwayland_LDADD = \ Xwayland_LDADD = \
$(glamor_lib) \ $(glamor_lib) \
$(XWAYLAND_LIBS) \ $(XWAYLAND_LIBS) \
$(top_builddir)/glx/libglxvnd.la \ $(GLXVND_LIB) \
$(XWAYLAND_SYS_LIBS) \ $(XWAYLAND_SYS_LIBS) \
$(top_builddir)/Xext/libXvidmode.la \ $(top_builddir)/Xext/libXvidmode.la \
$(XSERVER_SYS_LIBS) $(XSERVER_SYS_LIBS)