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

Wrap sdk_HEADERS in if XORG as otherwise installing non-xorg servers 

breaks.
This commit is contained in:
Dave Airlie 2006-01-18 06:56:52 +00:00
parent 8ccf4f2b8f
commit 506eca5f57
8 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2006-01-18 Dave Airlie <airlied@linux.ie>
* Xext/Makefile.am:
* dbe/Makefile.am:
* fb/Makefile.am:
* include/Makefile.am:
* mi/Makefile.am:
* miext/shadow/Makefile.am:
* render/Makefile.am:
Wrap sdk_HEADERS in if XORG as otherwise installing non-xorg
servers breaks.
2006-01-18 Dave Airlie <airlied@linux.ie> 2006-01-18 Dave Airlie <airlied@linux.ie>
reviewed by: keithp, ajax, anholt (well they all read it...) reviewed by: keithp, ajax, anholt (well they all read it...)

2
Xext/Makefile.am
View File

@ -10,7 +10,9 @@ INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod -I$(top_srcdir)/hw/xfree86/
AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
if XORG
sdk_HEADERS = xvdix.h xvmcext.h sdk_HEADERS = xvdix.h xvmcext.h
endif
# Sources always included in libXextbuiltin.la & libXext.la # Sources always included in libXextbuiltin.la & libXext.la
BUILTIN_SRCS = \ BUILTIN_SRCS = \

2
dbe/Makefile.am
View File

@ -4,7 +4,9 @@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
if XORG
sdk_HEADERS = dbestruct.h sdk_HEADERS = dbestruct.h
endif
libdbe_la_SOURCES = \ libdbe_la_SOURCES = \
dbe.c \ dbe.c \

4
fb/Makefile.am
View File

@ -6,7 +6,9 @@ INCLUDES = \
-I$(top_srcdir)/hw/xfree86/common -I$(top_srcdir)/hw/xfree86/common
AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
sdk_HEADERS = fb.h fbrop.h fbpseudocolor.h fboverlay.h if XORG
sdk_HEADERS = fb.h fbrop.h fbpseudocolor.h fboverlay.hS
endif
if MMX_CAPABLE if MMX_CAPABLE
AM_CFLAGS += -DUSE_MMX AM_CFLAGS += -DUSE_MMX

2
include/Makefile.am
View File

@ -1,3 +1,4 @@
if XORG
sdk_HEADERS = \ sdk_HEADERS = \
XIstubs.h \ XIstubs.h \
bstore.h \ bstore.h \
@ -46,6 +47,7 @@ sdk_HEADERS = \
window.h \ window.h \
windowstr.h \ windowstr.h \
xorg-server.h xorg-server.h
endif
AM_CFLAGS = $(DIX_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS)

2
mi/Makefile.am
View File

@ -1,8 +1,10 @@
noinst_LTLIBRARIES = libminimi.la libmi.la noinst_LTLIBRARIES = libminimi.la libmi.la
if XORG
sdk_HEADERS = mibank.h micmap.h miline.h mipointer.h mi.h mibstore.h \ sdk_HEADERS = mibank.h micmap.h miline.h mipointer.h mi.h mibstore.h \
migc.h mipointrst.h mizerarc.h micoord.h mifillarc.h \ migc.h mipointrst.h mizerarc.h micoord.h mifillarc.h \
mispans.h miwideline.h mistruct.h mifpoly.h mispans.h miwideline.h mistruct.h mifpoly.h
endif
AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@

2
miext/shadow/Makefile.am
View File

@ -4,7 +4,9 @@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
if XORG
sdk_HEADERS = shadow.h sdk_HEADERS = shadow.h
endif
libshadow_la_SOURCES = \ libshadow_la_SOURCES = \
shadow.c \ shadow.c \

2
render/Makefile.am
View File

@ -16,4 +16,6 @@ librender_la_SOURCES = \
render.c \ render.c \
renderedge.c renderedge.c
if XORG
sdk_HEADERS = picture.h mipict.h glyphstr.h picturestr.h renderedge.h sdk_HEADERS = picture.h mipict.h glyphstr.h picturestr.h renderedge.h
endif