svn merge ^/branches/released .

1 files changed, 26 insertions, 26 deletions

diff --git a/xorg-server/hw/xfree86/os-support/Makefile.am b/xorg-server/hw/xfree86/os-support/Makefile.am
index c0504d5eb..3af4328ff 100644
--- a/xorg-server/hw/xfree86/os-support/Makefile.am
+++ b/xorg-server/hw/xfree86/os-support/Makefile.am
@@ -1,26 +1,26 @@
-SUBDIRS = bus @XORG_OS_SUBDIR@ misc $(DRI_SUBDIRS)

-DIST_SUBDIRS = bsd bus misc linux solaris sco hurd

-

-sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h

-

-EXTRA_DIST = int10Defines.h xf86OSpriv.h

-

-# to get the grouping semantics right, you have to glom these three together

-# as one library, otherwise libtool will actively defeat your attempts to

-# list them multiple times on the link line.

-noinst_LTLIBRARIES = libxorgos.la

-libxorgos_la_SOURCES = xorgos.c

-libxorgos_la_LIBADD = @XORG_OS_SUBDIR@/lib@XORG_OS_SUBDIR@.la \

-                      bus/libbus.la \

-                      misc/libmisc.la

-

-AM_CFLAGS = $(DIX_CFLAGS) 

-

-xorgos.c:

-	touch $@

-

-DISTCLEANFILES = xorgos.c

-

-# FIXME: These don't seem to be used anywhere

-EXTRA_DIST += \

-	shared/bios_devmem.c

+SUBDIRS = bus @XORG_OS_SUBDIR@ misc $(DRI_SUBDIRS)
+DIST_SUBDIRS = bsd bus misc linux solaris hurd
+
+sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h
+
+EXTRA_DIST = int10Defines.h xf86OSpriv.h
+
+# to get the grouping semantics right, you have to glom these three together
+# as one library, otherwise libtool will actively defeat your attempts to
+# list them multiple times on the link line.
+noinst_LTLIBRARIES = libxorgos.la
+libxorgos_la_SOURCES = xorgos.c
+libxorgos_la_LIBADD = @XORG_OS_SUBDIR@/lib@XORG_OS_SUBDIR@.la \
+                      bus/libbus.la \
+                      misc/libmisc.la
+
+AM_CFLAGS = $(DIX_CFLAGS) 
+
+xorgos.c:
+	touch $@
+
+DISTCLEANFILES = xorgos.c
+
+# FIXME: These don't seem to be used anywhere
+EXTRA_DIST += \
+	shared/bios_devmem.c