SCO port update for SCO OpenServer 5 and UnixWare 7. A few general cleanupssco_port_update

and bugs not specifically related to the port fixed along the way.
author: Kean Johnson <kean@armory.com> 2005-06-10 06:54:01 +0000
committer: Kean Johnson <kean@armory.com> 2005-06-10 06:54:01 +0000
commit: d69937273f6a28f1b42cc81d4dce15abb2537b42 (patch)
tree: 4ef8a315b73f50ca8044f8de4bdcdb797d0fe44f
parent: 57d21be715c319c6d8f61e9f7366794368dd9f37 (diff)
12 files changed, 476 insertions, 179 deletions
diff --git a/Imake.cf b/Imake.cf
index 543175e..3c11931 100644
--- a/Imake.cf
+++ b/Imake.cf
@@ -369,9 +369,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $
 # define HPArchitecture
 #endif /* hpux */
 
-#ifdef sco
+#ifdef __SCO__
 # define MacroIncludeFile <sco5.cf>
 # define MacroFile sco5.cf
+# undef __SCO__
 # undef sco
 # undef USL
 # undef SYSV
@@ -403,18 +404,41 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $
 # undef __pentium
 # undef pentiumpro
 # undef __pentiumpro
-#endif /* sco - SCO Open Server 5 */
+#endif /* __SCO__ - SCO Open Server 5 */
 
-#ifdef USL
+#ifdef __UNIXWARE__
 # define MacroIncludeFile <usl.cf>
 # define MacroFile usl.cf
+# undef __UNIXWARE__
 # undef USL
 # undef SVR4
 # undef i386
+# undef SVR5
+# undef SYSV5
 # define SVR4Architecture
 # define i386Architecture
 # define USLArchitecture
-#endif /* USL */
+# define UnixWareArchitecture
+# undef i386
+# undef i486
+# undef i586
+# undef i686
+# undef k6
+# undef __i386__
+# undef __i486__
+# undef __i586__
+# undef __i686__
+# undef __k6__
+# undef __i386
+# undef __i486
+# undef __i586
+# undef __i686
+# undef __k6
+# undef pentium
+# undef __pentium
+# undef pentiumpro
+# undef __pentiumpro
+#endif /* __UNIXWARE__ */
 
 #ifdef NCR
 # define MacroIncludeFile <ncr.cf>
diff --git a/Imake.rules b/Imake.rules
index a889c90..79d0983 100644
--- a/Imake.rules
+++ b/Imake.rules
@@ -2404,16 +2404,16 @@ clean::									@@\
 #endif
 
 #ifndef AssembleObject
-#define AssembleObject(flags) CPPOnlyAsm($*,flags)			@@\
-	RemoveFile($*.o)						@@\
-	$(AS) -o $*.o $*.i						@@\
-	RemoveFile($*.i)
+#define AssembleObject(basename,flags) CPPOnlyAsm(basename,flags)	@@\
+	RemoveFile(basename.o)						@@\
+	$(AS) -o basename.o basename.i					@@\
+	RemoveFile(basename.i)
 #endif
 
 #ifndef NormalAsmObjectRule
 #define NormalAsmObjectRule()						@@\
 .S.o:									@@\
-	AssembleObject($(_NOOP_))					@@\
+	AssembleObject($*,$(_NOOP_))					@@\
 									@@\
 .S.i:									@@\
 	CPPOnlyAsm($*,$(_NOOP_))
@@ -2426,7 +2426,7 @@ dst.S:  src.S								@@\
 	$(LN) $? $@							@@\
 									@@\
 dst.o:  dst.S								@@\
-	AssembleObject(flags)						@@\
+	AssembleObject(dst,flags)					@@\
 									@@\
 dst.i:  dst.S								@@\
 	CPPOnlyAsm(dst,flags)						@@\
@@ -2441,7 +2441,7 @@ clean::									@@\
 #define ObjectFromAsmSource(src,flags)					@@\
 									@@\
 src.o:  src.S								@@\
-	AssembleObject(flags)						@@\
+	AssembleObject(src,flags)					@@\
 									@@\
 src.i:  src.S								@@\
 	CPPOnlyAsm(src,flags)						@@\
diff --git a/Imake.tmpl b/Imake.tmpl
index a097f26..c9f3a4d 100644
--- a/Imake.tmpl
+++ b/Imake.tmpl
@@ -579,8 +579,6 @@ X_BYTE_ORDER = ByteOrder
 #define OsNeedZlibHeaders	!HasZlib
 #endif
 #if !HasZlib		/* if OS doesn't have it, we'll build it */
-#warning Building your own zlib can be a harmful security risk and is
-#warning deprecated; please strongly consider using vendor-supplied packages.
 #undef GzipLibrary	/* GzipLibrary was valid only if HasZlib */
 #endif
 #ifndef GzipLibrary	/* if OS config didn't define it, assume it's -lz */
diff --git a/QNX4.rules b/QNX4.rules
index c034d62..3ae8fe2 100644
--- a/QNX4.rules
+++ b/QNX4.rules
@@ -36,7 +36,7 @@ dst.S: src.S							@@\
 	$(CP) $? $@						@@\
 								@@\
 dst.o: dst.S							@@\
-	AssembleObject(flags)					@@\
+	AssembleObject(dst,flags)				@@\
 								@@\
 dst.i: dst.S							@@\
 	CPPOnlyAsm(dst,flags)					@@\
diff --git a/minix.cf b/minix.cf
index e4f520b..642a49f 100644
--- a/minix.cf
+++ b/minix.cf
@@ -54,11 +54,11 @@ XCOMM platform:  $XFree86: xc/config/cf/minix.cf,v 3.5 1999/07/10 07:24:33 dawes
 #define HasPutenv		YES	/* for xsm */
 
 #ifndef AssembleObject
-#define AssembleObject(flags) $(RM) $@                                    @@\
-	$(CPP) AsmDefines $(DEFINES) $(INCLUDES) flags $*.S | \           @@\
-	    grep -v '^\#' > $*.i.s                                        @@\
-	$(AS) -o $*.o $*.i.s                                              @@\
-	$(RM) $*.i.s
+#define AssembleObject(basename,flags) $(RM) $@				@@\
+	$(CPP) AsmDefines $(DEFINES) $(INCLUDES) flags basename.S | \	@@\
+	    grep -v '^\#' > basename.i.s				@@\
+	$(AS) -o basename.o basename.i.s				@@\
+	$(RM) basename.i.s
 #endif
 
 #include <xorg.cf>
diff --git a/nto.rules b/nto.rules
index fbf11ad..e5023e2 100644
--- a/nto.rules
+++ b/nto.rules
@@ -59,7 +59,7 @@ dst.S: src.S							@@\
 	$(CP) $? $@						@@\
 								@@\
 dst.o: dst.S							@@\
-	AssembleObject(flags)					@@\
+	AssembleObject(dst,flags)				@@\
 								@@\
 dst.i: dst.S							@@\
 	CPPOnlyAsm(dst,flags)					@@\
diff --git a/sco5.cf b/sco5.cf
index cf7f925..bd2e834 100644
--- a/sco5.cf
+++ b/sco5.cf
@@ -14,19 +14,19 @@ XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 1.4 2004/08/16 16:36:13 krh Exp $
  */
 
 #ifndef OSName
-#define OSName                  UNIX System V/386 Open Server Release 5
+#define OSName			UNIX System V/386 OpenServer Release 5
 #endif
 #ifndef OSVendor
-#define OSVendor                SCO-Group
+#define OSVendor		SCO-Group
 #endif
 #ifndef OSMajorVersion
-#define OSMajorVersion          5
+#define OSMajorVersion		5
 #endif
 #ifndef OSMinorVersion
-#define OSMinorVersion          0
+#define OSMinorVersion		0
 #endif
 #ifndef OSTeenyVersion
-#define OSTeenyVersion          7
+#define OSTeenyVersion		7
 #endif
 
 /*
@@ -63,147 +63,262 @@ XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 1.4 2004/08/16 16:36:13 krh Exp $
  * safe at least with regards to things like errno and various _r functions.
  */
 #ifndef LibraryCCOptions
-# define LibraryCCOptions	-D_REENTRANT
+# define LibraryCCOptions	-D_REENTRANT -DFD_SETSIZE=11000 -DMAXPATHLEN=1024 -D_NO_STATIC
 #endif
-	
-#define StandardDefines		-Dsco -DSCO -DSCO5 -DSYSV -Di386 -DSCO325 -DFD_SETSIZE=256 -D_NO_STATIC -DMAXPATHLEN=1024
+
+#define StandardDefines		-DSYSV -Di386 -DSCO325 -D__SCO__
+
 #ifdef HasGcc2
-# define DefaultCCOptions       GccWarningOptions
-# define CcCmd			gcc
-# define DefaultCDebugFlags	-O6 -fomit-frame-pointer -march=i586 -mcpu=i686
-# define OptimizedCDebugFlags	-O6 -fomit-frame-pointer -march=i586 -mcpu=i686
+# define DefaultCCOptions	GccWarningOptions
+# ifndef CcCmd
+#  define CcCmd			gcc
+# endif
+# define DefaultCDebugFlags	-O6 -fomit-frame-pointer -march=i586 -mcpu=i586
+# ifndef OptimizedCDebugFlags
+#  define OptimizedCDebugFlags	-O6 -fomit-frame-pointer -march=i586 -mcpu=i586
+# endif
 #else
 # define DefaultCCOptions	-dy
-# define CcCmd			cc -belf
+# ifndef CcCmd
+#  define CcCmd			cc -belf
+# endif
 # define DefaultCDebugFlags	-O2
-# define OptimizedCDebugFlags	-O2
+# ifndef OptimizedCDebugFlags
+#  define OptimizedCDebugFlags	-O2
+# endif
 #endif
 
-#define	HasNCurses		YES
-#define NCursesLibName		-lcurses
+#ifndef HasNCurses
+# define HasNCurses		YES
+#endif
+#ifndef NCursesLibName
+# define NCursesLibName		-lcurses
+#endif
 
 #ifndef UseDeprecatedKeyboardDriver
-#define UseDeprecatedKeyboardDriver YES
+#define UseDeprecatedKeyboardDriver NO
 #endif
 
-#define LogDirectory		/var/adm
+#ifndef SCOHasGWXLIBS
+# define SCOHasGWXLIBS		YES
+#endif
+
+#ifndef LogDirectory
+# define LogDirectory		/var/adm
+#endif
 
 #ifndef PexDynamicModule
-#define PexDynamicModule        YES
+#define PexDynamicModule	YES
 #endif
 
 #ifndef XieDynamicModule
-#define XieDynamicModule        YES
+#define XieDynamicModule	YES
 #endif
 
-#ifndef HasSymLinks
-# define HasSymLinks            YES
-#endif
+#define HasSymLinks		YES
 
 #ifndef DoLoadableServer
 # define DoLoadableServer	YES
 #endif
 
 #ifdef BuildDynamicLoading
-# define SCODynamicFlags        -Wl,-Bexport
+# define SCODynamicFlags	-Wl,-Bexport
 #else
 # define SCODynamicFlags	/**/
 #endif
 
-#define AsmDefines		-D__ELF__ -D__PIC__
-#define XawI18nDefines          -DHAS_WCHAR_H -DHAS_WCTYPE_H -DHAS_ISW_FUNCS
-#define ServerExtraSysLibs      $(CBRT) -lm -levent SCODynamicFlags
-#define ExtraLibraries          -lsocket
-#define NeedWidePrototypes      NO
-#define ServerOSDefines         -DDDXTIME XFree86ServerOSDefines
+#ifndef BuildFreetypeDlModule
+# define BuildFreetypeDlModule	NO
+#endif
+
+#ifndef AsmDefines
+# define AsmDefines		-D__ELF__ -D__PIC__
+#endif
+
+#ifndef XawI18nDefines
+# define XawI18nDefines		-DHAS_WCHAR_H -DHAS_WCTYPE_H -DHAS_ISW_FUNCS
+#endif
+
+#ifndef ServerExtraSysLibs
+# define ServerExtraSysLibs	$(CBRT) -lm -levent SCODynamicFlags
+#endif
+
+#ifndef ExtraLibraries
+# define ExtraLibraries		-lsocket
+#endif
+
+#ifndef NeedWidePrototypes
+# define NeedWidePrototypes	YES
+#endif
+
+#define SCOBuildFlags		-DFD_SETSIZE=11000 -DMAXPATHLEN=1024 -DPATH_MAX=1024
+
+#define ServerExtraDefines	-D_REENTRANT SCOBuildFlags -DDDXTIME XFree86ServerDefines
+
 #define ToolkitStringsABIOptions -intelabi
-#define ThreadedX               NO
-#define HasThreadSafeAPI        NO
-#define HasNdbm                 YES
-#define HasVFork                YES
-#define HasPutenv               YES
-#define HasSnprintf             YES
+
+#ifndef ThreadedX
+# define ThreadedX		NO
+#endif
+
+#ifndef HasThreadSafeAPI
+# define HasThreadSafeAPI	NO
+#endif
+
+#define HasNdbm			YES
+#define HasVFork		YES
+#define HasPutenv		YES
+#define HasSnprintf		YES
 #define HasSetenv		NO
 #define HasMkstemp		YES
-#define ExecableScripts         YES
-#define HasShadowPasswd         YES
-#define ManSourcePath           $(MANPATH)/man
-#define Malloc0ReturnsNull      YES
-#define RemoveDSDENroffMacros   NO
-#define CompressManPages        NO
+#define ExecableScripts		YES
+#define HasShadowPasswd		YES
+
+#ifndef ManSourcePath
+# define ManSourcePath		$(MANPATH)/man
+#endif
+
+#ifndef Malloc0ReturnsNull
+# define Malloc0ReturnsNull	YES
+#endif
+
+#ifndef RemoveDSDENroffMacros
+# define RemoveDSDENroffMacros	NO
+#endif
+
+#ifndef CompressManPages
+# define CompressManPages	NO
+#endif
 
 #ifndef HasLibCrypt
-# define HasLibCrypt            YES
-# define SpecialLibCrypt        -lcrypt
+# define HasLibCrypt		YES
+# define SpecialLibCrypt	-lcrypt
+#endif
+
+#ifndef PosixLibraries
+# define PosixLibraries		/**/
 #endif
-#define PosixLibraries          /**/
 
 #ifndef ForceNormalLib
-# define ForceNormalLib         NO 
+# define ForceNormalLib		NO 
+#endif
+
+#ifndef HasCplusplus
+# define HasCplusplus		YES
 #endif
 
-#define HasExpat		YES
-#define HasFreetype2		YES
-#define HasLibpng		YES
-#define HasPerl			YES
-#define HasPerl5		YES
 #define HasDlopen		YES
 #define HasShm			YES
 #define HasStrcasecmp		YES
+
+#if SCOHasGWXLIBS
+#define HasExpat		YES
+#define HasFreetype2		YES
+#define HasLibpng		YES
 #define HasZlib			YES
 #define HasFontconfig		YES
+#endif /* SCOHasGWXLIBS */
 
-#define SharedLibXmu            YES
-#define SystemV                 YES
-#define LdCombineFlags          -r 
+#define HasPerl			YES
+#define HasPerl5		YES
+
+#define SharedLibXmu		YES
+#define SystemV			YES
+#define LdCombineFlags		-r 
 
 #define AvoidNullMakeCommand	YES
-#define HasLdRunPath            YES
-#define HasPoll                 YES
+#define HasLdRunPath		YES
+#define HasPoll			YES
 #define PatheticCpp		YES
 
-#define HasGnuMake		YES
+/*
+ * Prefer SysV make as its way less chatty. But, it doesn't do parallel
+ * builds. If you want to use GNU make, set this to YES in your host.cf file.
+ */
+#ifndef HasGnuMake
+#define HasGnuMake		NO
+#endif
 
 #define MesaUseX86Asm		NO
 
+#if HasGnuMake
 #define MakeNamedTargetSubdir(dir,flags,subname)\
 	$(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname
+#endif
+
+#define ArCmdBase		ar
 
-#define ArCmdBase               ar
-#define AsCmd                   CcCmd
-#define CppCmd			/lib/cpp
-#define PreProcessCmd		CppCmd
-#define RawCppCmd		CppCmd
+#ifndef AsCmd
+# define AsCmd			CcCmd
+#endif
+
+#ifndef CppCmd
+# define CppCmd			/lib/cpp
+#endif
+
+#ifndef PreProcessCmd
+# define PreProcessCmd		CppCmd
+#endif
+
+#ifndef RawCppCmd
+# define RawCppCmd		CppCmd
+#endif
+
+#ifndef LdCmd
+# define LdCmd			CcCmd
+#endif
 
 #ifdef HasGcc2
-# define LdCmd                   CcCmd
 # ifndef SharedLibraryLoadFlags
 #  define SharedLibraryLoadFlags -shared
 # endif
 # undef LdCombineFlags
 # define LdCombineFlags		-nostdlib -r
-#else
-# define LdCmd			/usr/ccs/bin/elf/ld
 #endif
 
-#define LexCmd                  /usr/gnu/bin/flex
-#define MakeCmd	                /usr/gnu/bin/gmake
-#define YaccCmd                 /usr/gnu/bin/bison -y
-#define InstallCmd		/usr/gnu/bin/ginstall
+#ifndef LexCmd
+# define LexCmd			/usr/gnu/bin/flex
+#endif
+
+#ifndef MakeCmd
+# if HasGnuMake
+#  define MakeCmd		/usr/gnu/bin/gmake
+# else
+#  define MakeCmd		/usr/bin/make
+# endif
+#endif
+
+#ifndef YaccCmd
+# define YaccCmd		/usr/gnu/bin/bison -y
+#endif
+
+#ifndef InstallCmd
+# define InstallCmd		/usr/gnu/bin/ginstall
+#endif
 
+#ifndef NothingOutsideProjectRoot 
+# define NothingOutsideProjectRoot YES
+#endif
 
 #ifndef UseSeparateConfDir
-#define UseSeparateConfDir	NO
+# define UseSeparateConfDir	NO
 #endif
 
 #ifndef BuildHtmlManPages
-#define BuildHtmlManPages	NO
+# define BuildHtmlManPages	NO
 #endif
 
-#define DefaultUserPath         /bin:/usr/bin:$(BINDIR):/usr/bin/X11:/usr/gnu/bin:/usr/local/bin:/etc
-#define DefaultSystemPath       /etc:/bin:/usr/bin:$(BINDIR):/usr/bin/X11
+#ifndef DefaultUserPath
+# define DefaultUserPath	/bin:/usr/bin:$(BINDIR):/usr/bin/X11:/usr/gnu/bin:/usr/local/bin:/etc
+#endif
 
-#define ConnectionFlags         -DLOCALCONN -DTCPCONN -DUNIXCONN 
+#ifndef DefaultSystemPath
+# define DefaultSystemPath	/etc:/bin:/usr/bin:$(BINDIR):/usr/bin/X11
+#endif
+
+#ifndef ConnectionFlags
+# define ConnectionFlags	-DLOCALCONN -DTCPCONN -DUNIXCONN
+#endif
 
 /*
  * These settings control the interdependence of the shared libraries.
@@ -221,47 +336,47 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
 
 #define SharedXlibi18nReqs $(LDPRELIB) $(XLIBONLY)
 
-#define SharedXfontReqs     $(LDPRELIB) $(FONTSTUBLIB) GzipLibrary $(FREETYPE2LIB) $(XLIB)
-#define SharedFontencReqs   $(LDPRELIB) GzipLibrary
-#define SharedGLReqs        $(LDPRELIB) $(XLIB)
-#define SharedGLUReqs       $(LDPRELIB) $(XLIB) $(GLXLIB)
-#define SharedOSMesaReqs    $(LDPRELIB) $(XLIB) $(GLXLIB)
-#define SharedPexReqs       $(LDPRELIB) $(XONLYLIB) MathLibrary
-#define SharedSMReqs        $(LDPRELIB) $(ICELIB)
-#define SharedX11Reqs       $(LDPRELIB) -lsocket
-#define SharedXawReqs       $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB)
-#define SharedXaw7Reqs      $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-#define SharedXaw6Reqs      $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-#define SharedXcursorReqs   $(LDPRELIB) $(XRENDERLIB) $(XLIB)
-#define SharedXextReqs      $(LDPRELIB) $(XONLYLIB)
-#define SharedXiReqs        $(LDPRELIB) $(XLIB)
-#define SharedXieReqs       $(LDPRELIB) $(XONLYLIB)
-#define SharedXmuReqs       $(LDPRELIB) $(XTOOLLIB) $(XLIB)
-#define SharedXmuuReqs      $(LDPRELIB) $(XONLYLIB)
-#define SharedXpReqs        $(LDPRELIB) $(XLIB)
-#define SharedXpmReqs       $(LDPRELIB) $(XLIB)
-#define SharedXrandrReqs    $(LDPRELIB) $(XRENDERLIB) $(XLIB)
-#define SharedXrenderReqs   $(LDPRELIB) $(XLIB)
-#define SharedXtReqs        $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
-#define SharedXtstReqs      $(LDPRELIB) $(XLIB)
-#define SharedXvReqs        $(LDPRELIB) $(XLIB)
-#define SharedDPSReqs       $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
-#define SharedDPSTKReqs     $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIB)
-#define SharedOldXReqs      $(LDPRELIB) $(XONLYLIB)
-#define SharedpsresReqs     $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
-#define SharedXResReqs	    $(LDPRELIB) $(XLIB)
-#define SharedXfontcacheReqs $(LDPRELIB) $(XLIB)
-#define SharedXineramaReqs  $(LDPRELIB) $(XLIB)
-#define SharedXssReqs	    $(LDPRELIB) $(XLIB)
-#define SharedXvMCReqs	    $(LDPRELIB) $(XLIB)
-#define SharedXxf86miscReqs $(LDPRELIB) $(XLIB)
-#define SharedXxf86vmReqs   $(LDPRELIB) $(XLIB)
-#define SharedxkbfileReqs   $(LDPRELIB) $(XONLYLIB)
-#define SharedxkbuiReqs	    $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB)
-#define SharedXReqs         $(XTOOLLIB) $(XPLIB) $(XLIB)
-#define SharedXmReqs        $(LDPRELIB) SharedXReqs
-#define SharedMrmReqs       $(LDPRELIB) $(XMLIB) SharedXReqs
-#define SharedUilReqs       $(LDPRELIB) $(XMLIB) SharedXReqs
+#define SharedXfontReqs		$(LDPRELIB) $(FONTSTUBLIB) GzipLibrary $(FREETYPE2LIB) $(XLIB)
+#define SharedFontencReqs	$(LDPRELIB) GzipLibrary
+#define SharedGLReqs		$(LDPRELIB) $(XLIB)
+#define SharedGLUReqs		$(LDPRELIB) $(XLIB) $(GLXLIB)
+#define SharedOSMesaReqs	$(LDPRELIB) $(XLIB) $(GLXLIB)
+#define SharedPexReqs		$(LDPRELIB) $(XONLYLIB) MathLibrary
+#define SharedSMReqs		$(LDPRELIB) $(ICELIB)
+#define SharedX11Reqs		$(LDPRELIB) -lsocket
+#define SharedXawReqs		$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB)
+#define SharedXaw7Reqs		$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+#define SharedXaw6Reqs		$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
+#define SharedXcursorReqs	$(LDPRELIB) $(XRENDERLIB) $(XLIB)
+#define SharedXextReqs		$(LDPRELIB) $(XONLYLIB)
+#define SharedXiReqs		$(LDPRELIB) $(XLIB)
+#define SharedXieReqs		$(LDPRELIB) $(XONLYLIB)
+#define SharedXmuReqs		$(LDPRELIB) $(XTOOLLIB) $(XLIB)
+#define SharedXmuuReqs		$(LDPRELIB) $(XONLYLIB)
+#define SharedXpReqs		$(LDPRELIB) $(XLIB)
+#define SharedXpmReqs		$(LDPRELIB) $(XLIB)
+#define SharedXrandrReqs	$(LDPRELIB) $(XRENDERLIB) $(XLIB)
+#define SharedXrenderReqs	$(LDPRELIB) $(XLIB)
+#define SharedXtReqs		$(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
+#define SharedXtstReqs		$(LDPRELIB) $(XLIB)
+#define SharedXvReqs		$(LDPRELIB) $(XLIB)
+#define SharedDPSReqs		$(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
+#define SharedDPSTKReqs		$(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIB)
+#define SharedOldXReqs		$(LDPRELIB) $(XONLYLIB)
+#define SharedpsresReqs		$(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
+#define SharedXResReqs		$(LDPRELIB) $(XLIB)
+#define SharedXfontcacheReqs	$(LDPRELIB) $(XLIB)
+#define SharedXineramaReqs	$(LDPRELIB) $(XLIB)
+#define SharedXssReqs		$(LDPRELIB) $(XLIB)
+#define SharedXvMCReqs		$(LDPRELIB) $(XLIB)
+#define SharedXxf86miscReqs	$(LDPRELIB) $(XLIB)
+#define SharedXxf86vmReqs	$(LDPRELIB) $(XLIB)
+#define SharedxkbfileReqs	$(LDPRELIB) $(XONLYLIB)
+#define SharedxkbuiReqs		$(LDPRELIB) $(XKBFILELIB) $(XONLYLIB)
+#define SharedXReqs		$(XTOOLLIB) $(XPLIB) $(XLIB)
+#define SharedXmReqs		$(LDPRELIB) SharedXReqs
+#define SharedMrmReqs		$(LDPRELIB) $(XMLIB) SharedXReqs
+#define SharedUilReqs		$(LDPRELIB) $(XMLIB) SharedXReqs
 
 #define ObjectFromAsmSource(src,flags)					@@\
 									@@\
@@ -269,7 +384,7 @@ src.o: src.S								@@\
 	RemoveFile(src.o)						@@\
 	$(CC) -c AsmDefines $(DEFINES) $(INCLUDES) flags src.S
 
-#include <scoLib.rules>  /* minor changes to sv4Lib.rules */
+#include <scoLib.rules>		/* minor changes to sv4Lib.rules */
 #include <sv4Lib.rules>
 
 #include <xorg.cf>
diff --git a/scoLib.rules b/scoLib.rules
index 05bdf3a..cf054aa 100644
--- a/scoLib.rules
+++ b/scoLib.rules
@@ -17,7 +17,7 @@ XCOMM $XFree86: xc/config/cf/scoLib.rules,v 1.10 2003/12/18 16:38:34 dawes Exp $
 #if SCOAbsShlibPath
 # define SCOShlibFlags -h $(SHLIBDIR)/$@
 #else
-# define SCOShlibFlags -R $(DESTDIR)$(SHLIBDIR) -h $@
+# define SCOShlibFlags -R $(SHLIBDIR) -h $@
 #endif
 
 /*
@@ -33,7 +33,7 @@ AllTarget(Concat(lib,libname.so.rev))					@@\
 									@@\
 Concat(lib,libname.so.rev): solist1 solist2 solist3 $(EXTRALIBRARYDEPS)	@@\
 	$(RM) $@~							@@\
-	echo -n $(LD) -o up/$@~ $(SHLIBLDFLAGS) SCOShlibFlags solist1 " " > Concat(down/lib,cmd) 	@@\
+	echo -n $(CC) -o up/$@~ $(SHLIBLDFLAGS) SCOShlibFlags solist1 " " > Concat(down/lib,cmd) 	@@\
 	echo -n solist2 " " >> Concat(down/lib,cmd)			@@\
 	echo -n solist3 " " >> Concat(down/lib,cmd)			@@\
 	echo -n $(REQUIREDLIBS) >> Concat(down/lib,cmd)			@@\
@@ -54,16 +54,33 @@ clean::									@@\
 #ifndef LinkWithExports
 # if UseExportLists
 #  define LinkWithExports(libname,rev,solist,down,up) \
-	(cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) SCOShlibFlags solist $(REQUIREDLIBS))	@@\
+	(cd down; $(CCENVSETUP) $(CC) -o up/$@~ $(SHLIBLDFLAGS) SCOShlibFlags solist $(REQUIREDLIBS))	@@\
 	if [ -f Concat(lib,libname.elist) ]; then \			@@\
 	    $(RM) down/$@.exports $@.list; \				@@\
 	    $(CPP) $(ALLINCLUDES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) Concat(lib,libname.elist) | CppSedMagic >$@.list; \	@@\
 	    $(EXPORTLISTGEN) $@~ $@.list > down/$@.exports; \		@@\
-	    (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) SCOShlibFlags ShlibExportListOpt($@.exports) solist $(REQUIREDLIBS)); \	@@\
+	    (cd down; $(CCENVSETUP) $(CC) -o up/$@~ $(SHLIBLDFLAGS) SCOShlibFlags ShlibExportListOpt($@.exports) solist $(REQUIREDLIBS)); \	@@\
 	    $(RM) down/$@.exports $@.list; \				@@\
 	fi;
 # else
 #  define LinkWithExports(libname,rev,solist,down,up) \
-	(cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) SCOShlibFlags solist $(REQUIREDLIBS))
+	(cd down; $(CCENVSETUP) $(CC) -o up/$@~ $(SHLIBLDFLAGS) SCOShlibFlags solist $(REQUIREDLIBS))
+# endif
+#endif
+
+#ifndef LinkPlusplusWithExports
+# if UseExportLists
+#  define LinkPlusplusWithExports(libname,rev,solist,down,up) \
+	(cd down; $(CXXENVSETUP) $(CXX) -o up/$@~ $(SHLIBLDFLAGS) SCOShlibFlags solist $(REQUIREDLIBS))	@@\
+	if [ -f Concat(lib,libname.elist) ]; then \			@@\
+	    $(RM) down/$@.exports $@.list; \				@@\
+	    $(CPP) $(ALLINCLUDES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) Concat(lib,libname.elist) | CppSedMagic >$@.list; \	@@\
+	    $(EXPORTLISTGEN) $@~ $@.list > down/$@.exports; \		@@\
+	    (cd down; $(CCENVSETUP) $(CXX) -o up/$@~ $(SHLIBLDFLAGS) SCOShlibFlags ShlibExportListOpt($@.exports) solist $(REQUIREDLIBS)); \	@@\
+	    $(RM) down/$@.exports $@.list; \				@@\
+	fi;
+# else
+#  define LinkPlusplusWithExports(libname,rev,solist,down,up) \
+	(cd down; $(CXXENVSETUP) $(CXX) -o up/$@~ $(SHLIBLDFLAGS) SCOShlibFlags solist $(REQUIREDLIBS))
 # endif
 #endif
diff --git a/sv4Lib.rules b/sv4Lib.rules
index e8815ef..7c27c46 100644
--- a/sv4Lib.rules
+++ b/sv4Lib.rules
@@ -27,6 +27,9 @@ XCOMM $XFree86: xc/config/cf/sv4Lib.rules,v 3.8tsi Exp $
 #ifndef SharedLibraryLdCmd
 # define SharedLibraryLdCmd $(LD)
 #endif
+#ifndef SharedLibraryLdPlusplusCmd
+# define SharedLibraryLdPlusplusCmd $(CXX)
+#endif
 #ifndef SharedLibraryLoadFlags
 # define SharedLibraryLoadFlags -G -z text
 #endif
@@ -102,6 +105,23 @@ install:: Concat(lib,libname.so.rev) 					@@\
 # endif
 #endif
 
+#ifndef LinkPlusplusWithExports
+# if UseExportLists
+#  define LinkPlusplusWithExports(libname,rev,solist,down,up) \
+	(cd down; $(CXXENVSETUP) SharedLibraryLdPlusplusCmd -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS))	@@\
+	if [ -f Concat(lib,libname.elist) ]; then \			@@\
+	    $(RM) down/$@.exports $@.list; \				@@\
+	    $(CPP) $(ALLINCLUDES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) Concat(lib,libname.elist) | CppSedMagic >$@.list; \	@@\
+	    $(EXPORTLISTGEN) $@~ $@.list > down/$@.exports; \		@@\
+	    (cd down; $(CXXENVSETUP) SharedLibraryLdPlusplusCmd -o up/$@~ $(SHLIBLDFLAGS) -h $@ ShlibExportListOpt($@.exports) solist $(REQUIREDLIBS)); \	@@\
+	    $(RM) down/$@.exports $@.list; \				@@\
+	fi;
+# else
+#  define LinkPlusplusWithExports(libname,rev,solist,down,up) \
+	(cd down; $(CXXENVSETUP) SharedLibraryLdPlusplusCmd -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS))
+# endif
+#endif
+
 /*
  * SharedLibraryTarget - generate rules to create a shared library;
  * build it into a different name so that we do not hose people by having
@@ -159,10 +179,14 @@ AllTarget(Concat(lib,libname.so.rev))					@@\
 									@@\
 Concat(lib,libname.so.rev):  deplist $(EXTRALIBRARYDEPS)		@@\
 	$(RM) $@~							@@\
-	(cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
+	LinkPlusplusWithExports(libname,rev,solist,down,up)		@@\
 	$(RM) $@ 							@@\
 	$(MV) $@~ $@							@@\
+	@if $(SOSYMLINK); then (set -x; \				@@\
+	  $(RM) Concat(lib,libname.so); \				@@\
+	  $(LN) $@ Concat(lib,libname.so)); fi				@@\
 	LinkBuildLibrary($@)						@@\
+	LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK))	@@\
 									@@\
 clean::									@@\
 	$(RM) Concat(lib,libname.so.rev)				
diff --git a/usl.cf b/usl.cf
index 60a8f23..93648dc 100644
--- a/usl.cf
+++ b/usl.cf
@@ -1,8 +1,4 @@
 XCOMM platform:  $Xorg: usl.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
-
-
-
-
 XCOMM platform:  $XFree86: xc/config/cf/usl.cf,v 3.22 2001/01/12 19:28:24 dawes Exp $
 
 #ifndef OSName
@@ -22,6 +18,12 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVer
 #ifndef  CcCmd
 # define CcCmd			/usr/ccs/bin/cc
 #endif
+#ifndef LexCmd
+# define LexCmd			/usr/ccs/bin/lex
+#endif
+#ifndef YaccCmd
+# define YaccCmd		/usr/ccs/bin/yacc
+#endif
 #ifndef  CplusplusCmd
 # define CplusplusCmd		/usr/ccs/bin/CC
 #endif
@@ -32,11 +34,16 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVer
 # define CplusplusDependIncludes	-I/usr/include/CC
 #endif
 
+#ifndef LibraryCCOptions
+# define LibraryCCOptions	-D_REENTRANT -DFD_SETSIZE=16384 
+#endif
+
 #define BootstrapCFlags		/* none needed */
-#define StandardDefines		-DUSL -DSVR4 -Di386
+#define StandardDefines		-DSVR4 -Di386 -D__UNIXWARE__
 #define NeedWidePrototypes	NO	/* experimental */
-#define ServerExtraDefines	-D__USLC__ XFree86ServerDefines
-#define ServerOSDefines		-DDDXTIME XFree86ServerOSDefines
+#define ServerExtraDefines	XFree86ServerDefines
+#define ServerExtraSysLibs      $(CBRT) -lm -Wl,-Bexport
+#define ServerOSDefines		-D_REENTRANT -DFD_SETSIZE=16384 -DDDXTIME XFree86ServerOSDefines
 #define ToolkitStringsABIOptions -intelabi
 #if OSMajorVersion < 2
 #define XawI18nDefines		-DHAS_WCTYPE_H -DHAS_ISW_FUNCS
@@ -55,21 +62,34 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVer
 # define MTSafeAPIDefines	\
 -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI -DXNO_MTSAFE_GRPAPI
 # define SystemMTDefines	-D_REENTRANT
-# define ThreadsLibraries	-lthread
-# define ThreadsCplusplusLibraries	-lthread
+# define ThreadsLoadFlags	-Kpthread
 # ifndef DefaultCCOptions
-#  define DefaultCCOptions	-W0,-2A -Xa -Dasm=__asm
+#  define DefaultCCOptions	-O -Kalloca -Dasm=__asm
 # endif
 #endif
 #define BuildLibPathVar	  LD_LIBRARY_PATH
 
-/* UnixWare 7.x comes with perl. */
-#ifndef HasPerl
-# if OSMajorVersion >= 7
-#  define HasPerl		YES
-# else
-#  define HasPerl		NO
-# endif
+#define	HasNCurses		YES
+#define NCursesLibName		-lcurses
+
+#ifndef BuildFreetypeDlModule
+# define BuildFreetypeDlModule	NO
+#endif
+
+#ifndef UseDeprecatedKeyboardDriver
+#define UseDeprecatedKeyboardDriver NO
+#endif
+
+#ifndef ManSuffix
+# define ManSuffix		1
+#endif
+
+#ifndef LibManSuffix
+# define LibManSuffix		3
+#endif
+
+#ifndef FileManSuffix
+# define FileManSuffix		4
 #endif
 
 #ifndef UseExportLists
@@ -78,13 +98,58 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVer
 
 #define GencatFlags		-m
 
-#define HasStrcasecmp		NO
+#ifndef HasCplusplus
+# define HasCplusplus		YES
+#endif
+
+#ifndef HasDlopen
+# define HasDlopen		YES
+#endif
+
+#ifndef HasShm
+# define HasShm			YES
+#endif
+
+#ifndef HasStrcasecmp
+# define HasStrcasecmp		YES
+#endif
+
 #ifndef HasSnprintf
-#define HasSnprintf		YES
+# define HasSnprintf		YES
 #endif
 
+#ifndef UseSmartScheduler
+# define UseSmartScheduler	NO
+#endif
 
-#include <svr4.cf>
+#define SharedLibXmu            YES
+
+#ifndef NothingOutsideProjectRoot 
+# define NothingOutsideProjectRoot YES
+#endif
+
+#ifndef UseSeparateConfDir
+# define UseSeparateConfDir	NO
+#endif
+
+#ifndef BuildHtmlManPages
+# define BuildHtmlManPages	NO
+#endif
+
+#ifndef SCOHasGWXLIBS
+# define SCOHasGWXLIBS		YES
+#endif
+
+#if SCOHasGWXLIBS
+#define HasExpat		YES
+#define HasFreetype2		YES
+#define HasLibpng		YES
+#define HasZlib			YES
+#define HasFontconfig		YES
+#endif /* SCOHasGWXLIBS */
+
+#define HasPerl			YES
+#define HasPerl5		YES
 
 /*
  * When generating templates the UnixWare 2.02 C++ compiler leaves
@@ -101,9 +166,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVer
 #define UseLocalRegex		YES
 
 #define XmDefines		\
-	-DNO_REGCOMP -DNEED_STRCASECMP \
 	-DSUPPORT_ZERO_WIDTH -DHAS_WIDECHAR_FUNCTIONS
-#define DtSvcDefines		-DXK_MISCELLANY -DMULTIBYTE -DNO_REGCOMP
+#define DtSvcDefines		-DXK_MISCELLANY -DMULTIBYTE
 #define DtSearchDefines		-DI18N_MSG DtSvcDefines
 #define DtWidgetDefines		DtSearchDefines
 #define DtPrintDefines		DtSearchDefines
@@ -116,16 +180,71 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVer
 #define ExportListGenSource	elistgen.usl
 #define ShlibExportListOpt(filename)	Concat(-Bexport:,filename)
 
-/* Remove -lc because select.o is not relocatable. */
-/* Remove -lgen (and set UseLocalRegex) because no shared library exists. */
-#define SharedXmReqs $(LDPRELIBS) SharedXReqs -lsocket -lnsl -lw
-#define SharedMrmReqs $(LDPRELIBS) $(XMLIB) SharedXReqs -lsocket -lnsl -lw
-#define SharedUilReqs $(LDPRELIBS) $(MRESOURCELIB) $(XMLIB) SharedXReqs -lsocket -lnsl -lw
-  
 /* <X11/Xos_r.h> requires process locking for missing _r functions */
 #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
 #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
 
 #define CdeProjectDefines \
-	-DANSICPP -DMULTIBYTE -DNLS16 -DNEED_STRCASECMP \
+	-DANSICPP -DMULTIBYTE -DNLS16 \
 	-DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion
+
+/*
+ * These settings control the interdependence of the shared libraries.
+ * Mostly borrowed from darwinLib.tmpl.
+ */
+#ifndef FixupLibReferences
+#define FixupLibReferences()						@@\
+XMULIBONLY = -lXmu							@@\
+XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
+#endif
+
+#ifndef XawClientLibs
+#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
+#endif
+
+#define SharedXlibi18nReqs $(LDPRELIB) $(XLIBONLY)
+
+#define SharedXfontReqs     $(LDPRELIB) $(FONTSTUBLIB) GzipLibrary $(FREETYPE2LIB) $(XLIB)
+#define SharedFontencReqs   $(LDPRELIB) GzipLibrary
+#define SharedGLReqs        $(LDPRELIB) $(XLIB)
+#define SharedGLUReqs       $(LDPRELIB) $(XLIB) $(GLXLIB)
+#define SharedOSMesaReqs    $(LDPRELIB) $(XLIB) $(GLXLIB)
+#define SharedPexReqs       $(LDPRELIB) $(XONLYLIB) MathLibrary
+#define SharedSMReqs        $(LDPRELIB) $(ICELIB)
+#define SharedX11Reqs       $(LDPRELIB) -lsocket -lnsl
+#define SharedXawReqs       $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB)
+#define SharedXaw7Reqs      $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+#define SharedXaw6Reqs      $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
+#define SharedXcursorReqs   $(LDPRELIB) $(XRENDERLIB) $(XLIB)
+#define SharedXextReqs      $(LDPRELIB) $(XONLYLIB)
+#define SharedXiReqs        $(LDPRELIB) $(XLIB)
+#define SharedXieReqs       $(LDPRELIB) $(XONLYLIB)
+#define SharedXmuReqs       $(LDPRELIB) $(XTOOLLIB) $(XLIB)
+#define SharedXmuuReqs      $(LDPRELIB) $(XONLYLIB)
+#define SharedXpReqs        $(LDPRELIB) $(XLIB)
+#define SharedXpmReqs       $(LDPRELIB) $(XLIB)
+#define SharedXrandrReqs    $(LDPRELIB) $(XRENDERLIB) $(XLIB)
+#define SharedXrenderReqs   $(LDPRELIB) $(XLIB)
+#define SharedXtReqs        $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
+#define SharedXtstReqs      $(LDPRELIB) $(XLIB)
+#define SharedXvReqs        $(LDPRELIB) $(XLIB)
+#define SharedDPSReqs       $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
+#define SharedDPSTKReqs     $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIB)
+#define SharedOldXReqs      $(LDPRELIB) $(XONLYLIB)
+#define SharedpsresReqs     $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
+#define SharedXResReqs	    $(LDPRELIB) $(XLIB)
+#define SharedXfontcacheReqs $(LDPRELIB) $(XLIB)
+#define SharedXineramaReqs  $(LDPRELIB) $(XLIB)
+#define SharedXssReqs	    $(LDPRELIB) $(XLIB)
+#define SharedXvMCReqs	    $(LDPRELIB) $(XLIB)
+#define SharedXxf86miscReqs $(LDPRELIB) $(XLIB)
+#define SharedXxf86vmReqs   $(LDPRELIB) $(XLIB)
+#define SharedxkbfileReqs   $(LDPRELIB) $(XONLYLIB)
+#define SharedxkbuiReqs	    $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB)
+#define SharedXReqs         $(XTOOLLIB) $(XPLIB) $(XLIB)
+#define SharedXmReqs        $(LDPRELIB) SharedXReqs
+#define SharedMrmReqs       $(LDPRELIB) $(XMLIB) SharedXReqs
+#define SharedUilReqs       $(LDPRELIB) $(XMLIB) SharedXReqs
+
+#include <scoLib.rules>  /* minor changes to sv4Lib.rules */
+#include <svr4.cf>
diff --git a/xf86.tmpl b/xf86.tmpl
index 157994e..ba35244 100644
--- a/xf86.tmpl
+++ b/xf86.tmpl
@@ -84,10 +84,10 @@ MODULE_DEFINES = -DXFree86Module
 		grep -v '^\#' > basename.i
 
 #undef AssembleObject
-#define AssembleObject(flags) ModCPPOnlyAsm($*,flags)			@@\
-	RemoveFile($*.o)						@@\
-	$(MODAS) $(MODASFLAGS) -o $*.o $*.i				@@\
-	RemoveFile($*.i)
+#define AssembleObject(basename,flags) ModCPPOnlyAsm(basename,flags)	@@\
+	RemoveFile(basename.o)						@@\
+	$(MODAS) $(MODASFLAGS) -o basename.o basename.i			@@\
+	RemoveFile(basename.i)
 
 /* This overrides the NormalRelocatableTarget in Imake.rules */
 #undef NormalRelocatableTarget
diff --git a/xorg.tmpl b/xorg.tmpl
index 25cd050..242bb6e 100644
--- a/xorg.tmpl
+++ b/xorg.tmpl
@@ -101,10 +101,10 @@ MODULE_DEFINES = -DXFree86Module
 		grep -v '^\#' > basename.i
 
 #undef AssembleObject
-#define AssembleObject(flags) ModCPPOnlyAsm($*,flags)			@@\
-	RemoveFile($*.o)						@@\
-	$(MODAS) $(MODASFLAGS) -o $*.o $*.i				@@\
-	RemoveFile($*.i)
+#define AssembleObject(basename,flags) ModCPPOnlyAsm(basename,flags)	@@\
+	RemoveFile(basename.o)						@@\
+	$(MODAS) $(MODASFLAGS) -o basename.o basename.i			@@\
+	RemoveFile(basename.i)
 
 /* This overrides the NormalRelocatableTarget in Imake.rules */
 #undef NormalRelocatableTarget
author	Kean Johnson <kean@armory.com>	2005-06-10 06:54:01 +0000
committer	Kean Johnson <kean@armory.com>	2005-06-10 06:54:01 +0000
commit	d69937273f6a28f1b42cc81d4dce15abb2537b42 (patch)
tree	4ef8a315b73f50ca8044f8de4bdcdb797d0fe44f
parent	57d21be715c319c6d8f61e9f7366794368dd9f37 (diff)