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

hw/xwin: Don't unconditionally include rootless.h 

Don't unconditionally include rootless.h, and so we don't need to add
rootless to the include path unless building MWEXTWM.

Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Jon Turney 2017-05-07 20:31:55 +01:00 committed by Eric Anholt
parent d8ccfb1326
commit 793af4d3f9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xwin/Makefile.am
View File

@ -43,6 +43,7 @@ SRCS_MULTIWINDOWEXTWM = \
winwindowswm.c winwindowswm.c
DEFS_MULTIWINDOWEXTWM = -DXWIN_MULTIWINDOWEXTWM DEFS_MULTIWINDOWEXTWM = -DXWIN_MULTIWINDOWEXTWM
MULTIWINDOWEXTWM_LIBS = $(top_builddir)/miext/rootless/librootless.la MULTIWINDOWEXTWM_LIBS = $(top_builddir)/miext/rootless/librootless.la
MULTIWINDOWEXTWM_CFLAGS = -I$(top_srcdir)/miext/rootless
endif endif
if XWIN_RANDR if XWIN_RANDR
@ -132,8 +133,6 @@ SRCS = InitInput.c \
XWin_SOURCES = $(SRCS) XWin_SOURCES = $(SRCS)
AM_CPPFLAGS = -I$(top_srcdir)/miext/rootless
XWIN_SYS_LIBS += -ldxguid XWIN_SYS_LIBS += -ldxguid
XWIN_LIBS += \ XWIN_LIBS += \
@ -178,6 +177,7 @@ AM_LFLAGS = -i
AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \ AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \
$(XWINMODULES_CFLAGS) \ $(XWINMODULES_CFLAGS) \
-I$(top_srcdir) \ -I$(top_srcdir) \
$(MULTIWINDOWEXTWM_CFLAGS) \
-Wno-bad-function-cast -Wno-bad-function-cast
xwinconfigdir = $(sysconfdir)/X11 xwinconfigdir = $(sysconfdir)/X11

2
hw/xwin/win.h
View File

@ -165,7 +165,9 @@
#include "miline.h" #include "miline.h"
#include "shadow.h" #include "shadow.h"
#include "fb.h" #include "fb.h"
#ifdef XWIN_MULTIWINDOWEXTWM
#include "rootless.h" #include "rootless.h"
#endif
#include "mipict.h" #include "mipict.h"
#include "picturestr.h" #include "picturestr.h"