diff options
| author | Dave Airlie <airlied@linux.ie> | 2006-01-18 06:56:52 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-18 06:56:52 +0000 |
| commit | 506eca5f57b960a6650c3387047a6ae8a22181e9 (patch) | |
| tree | e2dcc044e444c18cee7c94cec003876b39571e42 | |
| parent | 8ccf4f2b8fdb5e57d2ec5f2d54731fbf83fb9d8c (diff) | |
Wrap sdk_HEADERS in if XORG as otherwise installing non-xorg servers
breaks.
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Xext/Makefile.am | 2 | ||||
| -rw-r--r-- | dbe/Makefile.am | 2 | ||||
| -rw-r--r-- | fb/Makefile.am | 4 | ||||
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | mi/Makefile.am | 2 | ||||
| -rw-r--r-- | miext/shadow/Makefile.am | 2 | ||||
| -rw-r--r-- | render/Makefile.am | 2 |
8 files changed, 27 insertions, 1 deletions
@@ -1,5 +1,17 @@ 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> + reviewed by: keithp, ajax, anholt (well they all read it...) * fb/fbgc.c: (fbPadPixmap): diff --git a/Xext/Makefile.am b/Xext/Makefile.am index 5020e244b..43753f396 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -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@ +if XORG sdk_HEADERS = xvdix.h xvmcext.h +endif # Sources always included in libXextbuiltin.la & libXext.la BUILTIN_SRCS = \ diff --git a/dbe/Makefile.am b/dbe/Makefile.am index 3a6727744..4385e199e 100644 --- a/dbe/Makefile.am +++ b/dbe/Makefile.am @@ -4,7 +4,9 @@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support +if XORG sdk_HEADERS = dbestruct.h +endif libdbe_la_SOURCES = \ dbe.c \ diff --git a/fb/Makefile.am b/fb/Makefile.am index 9d95e7144..bf5902492 100644 --- a/fb/Makefile.am +++ b/fb/Makefile.am @@ -6,7 +6,9 @@ INCLUDES = \ -I$(top_srcdir)/hw/xfree86/common 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 AM_CFLAGS += -DUSE_MMX diff --git a/include/Makefile.am b/include/Makefile.am index 3d0185ae0..9e340d72d 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,3 +1,4 @@ +if XORG sdk_HEADERS = \ XIstubs.h \ bstore.h \ @@ -46,6 +47,7 @@ sdk_HEADERS = \ window.h \ windowstr.h \ xorg-server.h +endif AM_CFLAGS = $(DIX_CFLAGS) diff --git a/mi/Makefile.am b/mi/Makefile.am index 9e2474627..c77eac709 100644 --- a/mi/Makefile.am +++ b/mi/Makefile.am @@ -1,8 +1,10 @@ noinst_LTLIBRARIES = libminimi.la libmi.la +if XORG sdk_HEADERS = mibank.h micmap.h miline.h mipointer.h mi.h mibstore.h \ migc.h mipointrst.h mizerarc.h micoord.h mifillarc.h \ mispans.h miwideline.h mistruct.h mifpoly.h +endif AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ diff --git a/miext/shadow/Makefile.am b/miext/shadow/Makefile.am index 69340e2f2..9490530e3 100644 --- a/miext/shadow/Makefile.am +++ b/miext/shadow/Makefile.am @@ -4,7 +4,9 @@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support +if XORG sdk_HEADERS = shadow.h +endif libshadow_la_SOURCES = \ shadow.c \ diff --git a/render/Makefile.am b/render/Makefile.am index 3d363c551..addabc67a 100644 --- a/render/Makefile.am +++ b/render/Makefile.am @@ -16,4 +16,6 @@ librender_la_SOURCES = \ render.c \ renderedge.c +if XORG sdk_HEADERS = picture.h mipict.h glyphstr.h picturestr.h renderedge.h +endif |