[xserver-commit] xfree86/os-support Makefile.am,3.1,3.2

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xfree86/os-support
In directory pdx:/tmp/cvs-serv8925/os-support

Modified Files:
	Makefile.am 
Log Message:
ChangeLog: fix up the date of my initial entry, add new entry.

* configure.ac:
* os-support/Makefile.am:
* os-support/bus/Makefile.am:
* OS autodetection magic for the planned supported platforms (Linux,
  BSD, Solaris); also, SBus build for SPARC. Linux/i386 is no longer
  a valid assumption.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/Makefile.am,v
retrieving revision 3.1
retrieving revision 3.2
diff -u -d -r3.1 -r3.2
--- a/Makefile.am	19 Feb 2004 03:50:06 -0000	3.1
+++ b/Makefile.am	19 Feb 2004 13:18:29 -0000	3.2
@@ -1,20 +1,4 @@
-#if qnx4
-#OS_SUBDIR = qnx4
-#else if nto # wtf is nto?
-#OS_SUBDIR = nto
-#else if svr4+sgi
-#OS_SUBDIR = irix
-#else if linux
-OS_SUBDIR = linux
-#else if free/net/openbsd
-#OS_SUBDIR = bsd
-#else if gnu/mach # tee hee
-#OS_SUBDIR = hurd
-#else if os/2
-#OS_SUBDIR = os2
-#endif
-
-SUBDIRS = bus $(OS_SUBDIR)
+SUBDIRS = bus $(XF86_OS_SUBDIR)
 
 dummy.c:
 	touch dummy.c
@@ -22,7 +6,7 @@
 
 lib_LIBRARIES = libxf86os.a
 libxf86os_a_SOURCES = dummy.c
-libxf86os_a_LIBADD = $(OS_SUBDIR)/libxf86$(OS_SUBDIR).a bus/libxf86bus.a
+libxf86os_a_LIBADD = $(XF86_OS_SUBDIR)/libxf86$(XF86_OS_SUBDIR).a bus/libxf86bus.a
 
 sdk_INCLUDEDIR = $(includedir)/X11/XF86SDK
 sdk_INCLUDES = xf86_OSproc.h xf86_OSlib.h xf86_ansic.h xf86_libc.h xf86drm.h \