Index: xc/config/cf/Imake.rules
--- xc.xf335/config/cf/Imake.rules	Wed Nov 25 01:44:38 1998
+++ xc/config/cf/Imake.rules	Tue Sep  7 12:17:08 1999
@@ -2096,6 +2096,21 @@
 
 
 /*
+ * ProfiledDepLibraryTarget - generate rules to create a profiled library.
+ */
+#ifndef ProfiledDepLibraryTarget
+#define	ProfiledDepLibraryTarget(libname,deplist,objlist)		@@\
+AllTarget(LibraryTargetNameSuffix(libname,_p))				@@\
+									@@\
+LibraryTargetNameSuffix(libname,_p): deplist $(EXTRALIBRARYDEPS)	@@\
+	RemoveFile($@)							@@\
+	MakeLibrary($@,objlist)						@@\
+	RanLibrary($@)
+
+#endif /* ProfiledDepLibraryTarget */
+
+
+/*
  * DebuggedLibraryTarget - generate rules to create a debuggable library.
  */
 #ifndef DebuggedLibraryTarget
@@ -2108,6 +2123,21 @@
 	RanLibrary($@)
 
 #endif /* DebuggedLibraryTarget */
+
+
+/*
+ * DebuggedDepLibraryTarget - generate rules to create a debuggable library.
+ */
+#ifndef DebuggedDepLibraryTarget
+#define	DebuggedDepLibraryTarget(libname,deplist,objlist)		@@\
+AllTarget(LibraryTargetNameSuffix(libname,_d))				@@\
+									@@\
+LibraryTargetNameSuffix(libname,_d): deplist $(EXTRALIBRARYDEPS)	@@\
+	RemoveFile($@)							@@\
+	MakeLibrary($@,objlist)						@@\
+	RanLibrary($@)
+
+#endif /* DebuggedDepLibraryTarget */
 
 
 /*
Index: xc/config/cf/X11.tmpl
--- xc.xf335/config/cf/X11.tmpl	Tue Jul 27 04:43:08 1999
+++ xc/config/cf/X11.tmpl	Tue Sep  7 12:17:08 1999
@@ -1497,8 +1497,27 @@
 ProjectUnsharedLibReferences(FS,FS,$(FSLIBSRC),XBuildLibDir)
 #endif
 
+#ifndef SharedLibFont
+#define SharedLibFont HasSharedLibraries
+#endif
+#ifndef NormalLibFont
+#define NormalLibFont (!SharedLibFont | ForceNormalLib)
+#endif
+#ifndef DebugLibFont
+#define DebugLibFont		NO	/* debugged Font library */
+#endif
+#ifndef ProfileLibFont
+#define ProfileLibFont		NO	/* profiled Font library */
+#endif
          FONTLIBSRC = $(LIBSRC)/font
+#if SharedLibFont
+#ifndef SharedFontRev
+#define SharedFontRev 1.0
+#endif
+SharedLibReferences(FONT,font,$(FONTLIBSRC),SOFONTREV,SharedFontRev)
+#else
 ProjectUnsharedLibReferences(FONT,font,$(FONTLIBSRC),XBuildLibDir)
+#endif
 
           XPMLIBSRC = $(LIBSRC)/Xpm
 #if SharedLibXpm
Index: xc/config/cf/bsdLib.rules
--- xc.xf335/config/cf/bsdLib.rules	Tue Jul 27 04:43:46 1999
+++ xc/config/cf/bsdLib.rules	Tue Sep  7 12:17:08 1999
@@ -70,6 +70,25 @@
 
 #endif /* SharedLibraryTarget */
 
+/*
+ * SharedDepLibraryTarget - generate rules to create a shared library.
+ */
+#ifndef SharedDepLibraryTarget
+#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+AllTarget(Concat(lib,libname.so.rev))					@@\
+									@@\
+Concat(lib,libname.so.rev):  deplist $(EXTRALIBRARYDEPS)		@@\
+	$(RM) $@~							@@\
+	(cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
+	$(RM) $@							@@\
+	$(MV) $@~ $@							@@\
+	LinkBuildLibrary($@)						@@\
+									@@\
+clean::									@@\
+	$(RM) Concat(lib,libname.so.rev)
+
+#endif /* SharedDepLibraryTarget */
+
 #ifndef SharedDepModuleTarget
 #define SharedDepModuleTarget(name,deps,solist)				@@\
 AllTarget(name)								@@\
@@ -242,6 +261,34 @@
 	$(RM) Concat(lib,libname.so.rev)
 
 #endif /* SharedLibraryTarget */
+
+/*
+ * SharedDepLibraryTarget - generate rules to create a shared library.
+ */
+#ifndef SharedDepLibraryTarget
+#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+AllTarget(Concat(lib,libname.so.rev))					@@\
+									@@\
+Concat(lib,libname.so.rev):  deplist					@@\
+	$(RM) $@~							@@\
+	@SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \		@@\
+		(cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
+		$(RM) $$SONAME; $(LN) $@ $$SONAME; \			@@\
+		LinkBuildSonameLibrary($$SONAME)			@@\
+	$(RM) $@							@@\
+	$(MV) $@~ $@							@@\
+	$(RM) Concat(lib,libname.so)					@@\
+	$(LN) $@ Concat(lib,libname.so)					@@\
+	LinkBuildLibrary($@)						@@\
+	LinkBuildLibrary(Concat(lib,libname.so))			@@\
+									@@\
+clean::									@@\
+	@SONAME=`echo Concat(lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`; \ @@\
+	set -x; $(RM) $$SONAME						@@\
+	$(RM) Concat(lib,libname.so)					@@\
+	$(RM) Concat(lib,libname.so.rev)
+
+#endif /* SharedDepLibraryTarget */
 
 #ifndef SharedDepModuleTarget
 #define SharedDepModuleTarget(name,deps,solist)				@@\
Index: xc/config/cf/hpLib.rules
--- xc.xf335/config/cf/hpLib.rules	Mon Aug  4 13:51:36 1997
+++ xc/config/cf/hpLib.rules	Tue Sep  7 12:17:08 1999
@@ -112,6 +112,29 @@
 #endif /* SharedLibraryTarget */
 
 /*
+ * SharedDepLibraryTarget - generate rules to create a shared library.
+ */
+#ifndef SharedDepLibraryTarget
+# define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+AllTarget(Concat(lib,libname.sl.rev))					@@\
+									@@\
+Concat(lib,libname.sl.rev):  deplist $(EXTRALIBRARYDEPS)		@@\
+	$(RM) $@~							@@\
+	LinkWithExports(libname,rev,solist,down,up)			@@\
+	-RemoveFiles($@ $@.bak)						@@\
+	MoveToBakFile($@)						@@\
+	$(MV) $@~ $@							@@\
+	$(RM) Concat(lib,libname.sl)					@@\
+	$(LN) $@ Concat(lib,libname.sl)					@@\
+	LinkBuildLibrary($@)						@@\
+	LinkBuildLibrary(Concat(lib,libname.sl))			@@\
+									@@\
+clean::									@@\
+	$(RM) Concat(lib,libname.sl.rev) Concat(lib,libname.sl)
+
+#endif /* SharedDepLibraryTarget */
+
+/*
  * SharedLibraryDataTarget - generate rules to create shlib data file;
  */
 #ifndef SharedLibraryDataTarget
Index: xc/config/cf/ibmLib.rules
--- xc.xf335/config/cf/ibmLib.rules	Tue Dec 31 16:03:48 1996
+++ xc/config/cf/ibmLib.rules	Tue Sep  7 12:17:09 1999
@@ -197,6 +197,58 @@
 #endif
 
 /*
+ * SharedDepLibraryTarget - generate rules to create a shared library.
+ */
+#if OSMajorVersion < 4
+
+# ifndef SharedDepLibraryTarget
+#  define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+AllTarget(Concat(lib,libname.a))					@@\
+									@@\
+Concat(lib,libname.a):  deplist $(UNSHAREDOBJS) $(EXTRALIBRARYDEPS)	@@\
+	$(RM) $@~ shr.o shr4.o						@@\
+	(cd down; $(AR) up/$@~ solist)					@@\
+	dump -g $@~ | sed -n -e 's/^[ 	]*[0-9][0-9]*[	 ]*\([^	 .][^	 ]*\)$$/\1/p' > $@.syms	@@\
+	$(LD) -o shr.o $@~ -H512 -T512 -bM\:SRE -bE\:$@.syms $(REQUIREDLIBS) BaseShLibReqs SharedLibPostRef	@@\
+	$(LN) shr.o shr4.o						@@\
+	$(RM) $@~							@@\
+	case ,$(SHR4OBJLIBS), in *,libname,*) shr4obj=shr4.o;; esac &&\	@@\
+		$(AR) $@~ $${shr4obj} shr.o $(UNSHAREDOBJS)		@@\
+	$(RM) $@.syms $@ shr.o shr4.o					@@\
+	$(MV) $@~ $@							@@\
+	LinkBuildLibrary($@)						@@\
+									@@\
+clean::									@@\
+	$(RM) Concat(lib,libname.a)
+# endif /* SharedDepLibraryTarget */
+
+#else /* OSMajorVersion >= 4 */
+
+# ifndef SharedDepLibraryTarget
+#  define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+AllTarget(Concat(lib,libname.a))					@@\
+									@@\
+Concat(lib,libname.a):  deplist $(UNSHAREDOBJS) $(EXTRALIBRARYDEPS)	@@\
+	RemoveFiles($@~ shr.o shr4.o)					@@\
+	(cd down; $(AR) up/$@~ solist)					@@\
+	MakeExportList(libname,libname.imp)				@@\
+	$(LD) -o shr.o $@~ -H512 -T512 -bM\:SRE -bE\:libname.imp -bnoentry $(REQUIREDLIBS) BaseShLibReqs $(LDPOSTLIBS)	@@\
+	$(LN) shr.o shr4.o						@@\
+	RemoveFile($@~)							@@\
+	case ,$(SHR4OBJLIBS), in *,libname,*) shr4obj=shr4.o;; esac &&\	@@\
+		$(AR) $@~ $${shr4obj} shr.o $(UNSHAREDOBJS)		@@\
+	RemoveFile($@)							@@\
+	$(MV) $@~ $@							@@\
+	LinkBuildLibrary($@)						@@\
+	LinkBuildLibrary(libname.imp)					@@\
+									@@\
+clean::									@@\
+	$(RM) Concat(lib,libname.a)
+# endif /* SharedDepLibraryTarget */
+
+#endif
+
+/*
  * SharedLibraryDataTarget - generate rules to create shlib data file;
  */
 #ifndef SharedLibraryDataTarget
Index: xc/config/cf/lnxLib.rules
--- xc.xf335/config/cf/lnxLib.rules	Tue Jul 27 04:42:56 1999
+++ xc/config/cf/lnxLib.rules	Tue Sep  7 12:17:09 1999
@@ -139,6 +139,44 @@
 
 #endif /* SharedLibraryTarget */
 
+/*
+ * SharedDepLibraryTarget - generate rules to create a shared library.
+ */
+#ifndef SharedDepLibraryTarget
+#ifdef UseInstalled
+#ifndef LinkBuildSonameLibrary
+#define LinkBuildSonameLibrary(lib) true
+#endif
+#else
+#ifndef LinkBuildSonameLibrary
+#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
+	cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
+#endif
+#endif
+
+#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+AllTarget(Concat(lib,libname.so.rev))					@@\
+									@@\
+Concat(lib,libname.so.rev):  deplist $(EXTRALIBRARYDEPS)		@@\
+	$(RM) $@~							@@\
+	@SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \		@@\
+		(cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
+		$(RM) $$SONAME; $(LN) $@ $$SONAME; \			@@\
+		LinkBuildSonameLibrary($$SONAME)			@@\
+	$(RM) $@ 							@@\
+	$(MV) $@~ $@							@@\
+	$(RM) Concat(lib,libname.so)					@@\
+	$(LN) $@ Concat(lib,libname.so)					@@\
+	LinkBuildLibrary($@)						@@\
+	LinkBuildLibrary(Concat(lib,libname.so))			@@\
+									@@\
+clean::									@@\
+	@MAJREV=`expr rev : '\(.*\)\.'`; \				@@\
+	set -x; $(RM) Concat(lib,libname.so.$$MAJREV)			@@\
+	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
+
+#endif /* SharedDepLibraryTarget */
+
 #ifndef SharedDepModuleTarget
 #define SharedDepModuleTarget(name,deps,solist)				@@\
 AllTarget(name)								@@\
Index: xc/config/cf/necLib.rules
--- xc.xf335/config/cf/necLib.rules	Sun Dec 22 12:15:05 1996
+++ xc/config/cf/necLib.rules	Tue Sep  7 12:17:09 1999
@@ -86,6 +86,32 @@
 #endif /* SharedLibraryTarget */
 
 /*
+ * SharedDepLibraryTarget - generate rules to create a shared library.
+ */
+#ifndef SharedDepLibraryTarget
+#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+AllTarget(Concat(lib,libname.so.rev))					@@\
+									@@\
+Concat(lib,libname.so.rev):  deplist $(EXTRALIBRARYDEPS)		@@\
+	$(RM) $@~							@@\
+	$(CC) -G -o $@~ $(SHLIBLDFLAGS) solist				@@\
+	$(RM) $@ 							@@\
+	$(MV) $@~ $@							@@\
+									@@\
+AllTarget(Concat(lib,libname.so))					@@\
+									@@\
+Concat(lib,libname.so):  Concat(lib,libname.so.rev)			@@\
+	$(RM) $@ 							@@\
+	$(LN) $? $@							@@\
+	LinkBuildLibrary($@)						@@\
+	LinkBuildLibrary(Concat(lib,libname.so))			@@\
+									@@\
+clean::									@@\
+	$(RM) Concat(lib,libname.so.rev)
+
+#endif /* SharedDepLibraryTarget */
+
+/*
  * SharedLibraryDataTarget - generate rules to create shlib data file;
  */
 #ifndef SharedLibraryDataTarget
Index: xc/config/cf/os2Lib.rules
--- xc.xf335/config/cf/os2Lib.rules	Tue Jul 27 04:43:46 1999
+++ xc/config/cf/os2Lib.rules	Tue Sep  7 12:17:09 1999
@@ -229,6 +229,21 @@
 #endif /* DebuggedLibraryTarget */
 
 /*
+ * DebuggedDepLibraryTarget - generate rules to create a debuggable library.
+ */
+#ifndef DebuggedDepLibraryTarget
+#define	DebuggedDepLibraryTarget(libname,deplist,objlist)		@@\
+AllTarget(LibraryTargetNameSuffix(libname,_d))				@@\
+									@@\
+LibraryTargetNameSuffix(libname,_d): deplist $(EXTRALIBRARYDEPS)	@@\
+	RemoveFile($@)							@@\
+	ImakeIndir debugger MakeStaticLibrary(../$@)			@@\
+	RanLibrary($@)							@@\
+	_LinkBuildLibrary($@)
+
+#endif /* DebuggedDepLibraryTarget */
+
+/*
  * ProfiledLibraryTarget - generate rules to create a profiled library.
  */
 #ifndef ProfiledLibraryTarget
@@ -242,6 +257,22 @@
 	_LinkBuildLibrary($@)
 
 #endif /* ProfiledLibraryTarget */
+
+
+/*
+ * ProfiledDepLibraryTarget - generate rules to create a profiled library.
+ */
+#ifndef ProfiledDepLibraryTarget
+#define	ProfiledDepLibraryTarget(libname,deplist,objlist)		@@\
+AllTarget(LibraryTargetNameSuffix(libname,_p))				@@\
+									@@\
+LibraryTargetNameSuffix(libname,_p): deplist $(EXTRALIBRARYDEPS)	@@\
+	RemoveFile($@)							@@\
+	ImakeIndir profiled MakeStaticLibrary(../$@)			@@\
+	RanLibrary($@)							@@\
+	_LinkBuildLibrary($@)
+
+#endif /* ProfiledDepLibraryTarget */
 
 /*
 define ExtraLibMkdir() $(_NULLCMD_)
Index: xc/config/cf/osfLib.rules
--- xc.xf335/config/cf/osfLib.rules	Sun Dec 22 12:15:08 1996
+++ xc/config/cf/osfLib.rules	Tue Sep  7 12:17:09 1999
@@ -111,6 +111,49 @@
 #endif /* SharedLibraryTarget */
 
 /*
+ * SharedDepLibraryTarget - generate rules to create a shared library.
+ */
+#ifndef SharedDepLibraryTarget
+#if SeparateSharedCompile
+#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+AllTarget(Concat(lib,libname.so.rev))					@@\
+									@@\
+Concat(lib,libname.so.rev):  deplist $(EXTRALIBRARYDEPS)		@@\
+	$(RM) $@~							@@\
+	(cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) PackageName($@) \	@@\
+		-soname $@ Objects(solist) \				@@\
+		$(REQUIREDLIBS) BaseShLibReqs) 				@@\
+	$(RM) $@ 							@@\
+	$(MV) $@~ $@							@@\
+	$(RM) Concat(lib,libname.so)					@@\
+	$(LN) $@ Concat(lib,libname.so)					@@\
+	LinkBuildLibrary($@)						@@\
+	LinkBuildLibrary(Concat(lib,libname.so))			@@\
+									@@\
+clean::									@@\
+	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
+#else
+#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+AllTarget(Concat(lib,libname.so.rev))					@@\
+									@@\
+Concat(lib,libname.so.rev):  deplist $(EXTRALIBRARYDEPS)		@@\
+	$(RM) $@~							@@\
+	$(LD) -o $@~ $(SHLIBLDFLAGS) PackageName($@) \			@@\
+		-soname $@ Objects(solist) \				@@\
+		$(REQUIREDLIBS) BaseShLibReqs 				@@\
+	$(RM) $@ 							@@\
+	$(MV) $@~ $@							@@\
+	$(RM) Concat(lib,libname.so)					@@\
+	$(LN) $@ Concat(lib,libname.so)					@@\
+	LinkBuildLibrary($@)						@@\
+	LinkBuildLibrary(Concat(lib,libname.so))			@@\
+									@@\
+clean::									@@\
+	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
+#endif /* SeparateSharedCompile */
+#endif /* SharedDepLibraryTarget */
+
+/*
  * SharedLibraryDataTarget - generate rules to create shlib data file;
  */
 #ifndef SharedLibraryDataTarget
Index: xc/config/cf/sgiLib.rules
--- xc.xf335/config/cf/sgiLib.rules	Sun Dec 22 12:15:12 1996
+++ xc/config/cf/sgiLib.rules	Tue Sep  7 12:17:09 1999
@@ -30,6 +30,23 @@
 clean::									@@\
 	$(RM) Concat3(lib,libname,_s) Concat3(lib,libname,_s.a)
 
+/*
+ * SharedDepLibraryTarget - generate rules to create a shared library.
+ */
+#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+AllTarget(Concat3(lib,libname,_s))					@@\
+									@@\
+Concat3(lib,libname,_s): deplist sharedlib.o Concat(lib,libname.spec) $(EXTRALIBRARYDEPS) @@\
+	$(RM) $@ $@.a \							@@\
+	&& cd down \							@@\
+	&& mkshlib -s Concat(up/lib,libname.spec) -t up/$@ -h up/$@.a \	@@\
+	&& ar rs up/$@.a sharedlib.o					@@\
+	LinkBuildLibrary($@)						@@\
+	LinkBuildLibrary($@.a)						@@\
+									@@\
+clean::									@@\
+	$(RM) Concat3(lib,libname,_s) Concat3(lib,libname,_s.a)
+
 #define SharedLibraryDataTarget(libname,rev,salist)
 
 /*
Index: xc/config/cf/sunLib.rules
--- xc.xf335/config/cf/sunLib.rules	Sun Dec 22 12:15:18 1996
+++ xc/config/cf/sunLib.rules	Tue Sep  7 12:17:09 1999
@@ -94,6 +94,26 @@
 #endif /* SharedLibraryTarget */
 
 /*
+ * SharedDepLibraryTarget - generate rules to create a shared library.
+ */
+#ifndef SharedDepLibraryTarget
+#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+AllTarget(Concat(lib,libname.so.rev))					@@\
+									@@\
+Concat(lib,libname.so.rev):  deplist $(EXTRALIBRARYDEPS)		@@\
+	$(RM) $@~							@@\
+	(cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
+	$(RM) $@ 							@@\
+	$(MV) $@~ $@							@@\
+	LinkBuildLibrary($@)						@@\
+									@@\
+clean::									@@\
+	$(RM) Concat(lib,libname.so.rev)				@@\
+									@@\
+PureCleanSharedLibrary(libname,rev)
+#endif /* SharedDepLibraryTarget */
+
+/*
  * SharedLibraryDataTarget - generate rules to create shlib data file;
  */
 #ifndef SharedLibraryDataTarget
Index: xc/config/cf/sv3Lib.rules
--- xc.xf335/config/cf/sv3Lib.rules	Fri Dec 27 15:50:27 1996
+++ xc/config/cf/sv3Lib.rules	Tue Sep  7 12:17:09 1999
@@ -223,6 +223,30 @@
 #endif /* SharedLibraryTarget */
 
 /*
+ * SharedDepLibraryTarget - generate rules to create a shared library.
+ */
+#ifndef SharedDepLibraryTarget
+#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+AllTarget(Concat(lib,libname.rev))					@@\
+									@@\
+Concat(lib,libname.rev):  deplist					@@\
+	$(RM) $@ Concat3(lib,libname,_s.a)				@@\
+        $(CPP) -DDOWN=down ConnectionFlags ShlibDefines Concat(lib,libname.def) | \ @@\
+        sed -e '/^#  *[0-9][0-9]*  *.*$$/d; /^$$/d' >spec.cpp           @@\
+        sed -e '1,/#libraries/d; /#externals/,$$d' spec.cpp | \         @@\
+        nawk '{ system("ar x " $$1 " " $$2 )}'                          @@\
+        echo "#target " Concat($(LIBDIR)/shlib/lib,libname.rev) >spec   @@\
+        sed -e '/#libraries/,$$d' spec.cpp >>spec                             @@\
+        mkshlib -s spec -t $@ -h Concat3(lib,libname,_s.a) $(SHLIBLDFLAGS)    @@\
+        ar rulv Concat3(lib,libname,_s.a) `sed -e '1,/#externals/d' spec.cpp` @@\
+        $(RM) spec.cpp spec                                             @@\
+									@@\
+clean::									@@\
+	$(RM) Concat(lib,libname.rev) Concat3(lib,libname,_s.a)
+
+#endif /* SharedDepLibraryTarget */
+
+/*
  * SharedLibraryDataTarget - generate rules to create shlib data file;
  */
 #ifndef SharedLibraryDataTarget
Index: xc/config/cf/sv4Lib.rules
--- xc.xf335/config/cf/sv4Lib.rules	Mon Dec 23 14:50:34 1996
+++ xc/config/cf/sv4Lib.rules	Tue Sep  7 12:17:09 1999
@@ -112,6 +112,28 @@
 
 #endif /* SharedLibraryTarget */
 
+/*
+ * SharedDepLibraryTarget - generate rules to create a shared library.
+ */
+#ifndef SharedDepLibraryTarget
+# define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+AllTarget(Concat(lib,libname.so.rev))					@@\
+									@@\
+Concat(lib,libname.so.rev):  deplist $(EXTRALIBRARYDEPS)		@@\
+	$(RM) $@~							@@\
+	LinkWithExports(libname,rev,solist,down,up)			@@\
+	$(RM) $@ 							@@\
+	$(MV) $@~ $@							@@\
+	$(RM) Concat(lib,libname.so)					@@\
+	$(LN) $@ Concat(lib,libname.so)					@@\
+	LinkBuildLibrary($@)						@@\
+	LinkBuildLibrary(Concat(lib,libname.so))			@@\
+									@@\
+clean::									@@\
+	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
+
+#endif /* SharedDepLibraryTarget */
+
 
 #ifndef SharedDepModuleTarget
 #define SharedDepModuleTarget(name,deps,solist)				@@\
Index: xc/lib/font/Speedo/Imakefile
--- xc.xf335/lib/font/Speedo/Imakefile	Wed Apr 27 16:10:13 1994
+++ xc/lib/font/Speedo/Imakefile	Tue Sep  7 12:17:09 1999
@@ -15,8 +15,14 @@
 		spencode.o \
 		$(SPEEDOOBJS)
 
+#define DoNormalLib NormalLibFont
+#define DoSharedLib SharedLibFont
+#define DoDebugLib DebugLibFont
+#define DoProfileLib ProfileLibFont
+#include <Library.tmpl>
+LibraryObjectRule()
+
 SubdirLibraryRule($(OBJS))
-NormalLibraryObjectRule()
 NormalLintTarget($(SRCS))
 
 DependTarget()
Index: xc/lib/font/Type1/Imakefile
--- xc.xf335/lib/font/Type1/Imakefile	Wed Apr 27 16:09:50 1994
+++ xc/lib/font/Type1/Imakefile	Tue Sep  7 12:17:09 1999
@@ -46,8 +46,14 @@
        type1.o         \
        util.o
 
+#define DoNormalLib NormalLibFont
+#define DoSharedLib SharedLibFont
+#define DoDebugLib DebugLibFont
+#define DoProfileLib ProfileLibFont
+#include <Library.tmpl>
+LibraryObjectRule()
+
 SubdirLibraryRule($(OBJS))
-NormalLibraryObjectRule()
 NormalLintTarget($(SRCS))
 
 DependTarget()
Index: xc/lib/font/bitmap/Imakefile
--- xc.xf335/lib/font/bitmap/Imakefile	Sun Dec 22 12:21:30 1996
+++ xc/lib/font/bitmap/Imakefile	Tue Sep  7 12:17:09 1999
@@ -18,11 +18,15 @@
 		   bitmapfunc.o pcfread.o pcfwrite.o snfread.o \
 		   fontink.o
 
-SpecialCObjectRule(bitmapfunc,$(ICONFIGFILES),$(GZIP_DEFS))
+#define DoNormalLib NormalLibFont
+#define DoSharedLib SharedLibFont
+#define DoDebugLib DebugLibFont
+#define DoProfileLib ProfileLibFont
+#include <Library.tmpl>
+LibraryObjectRule()
 
+SpecialCLibObjectRule(bitmapfunc,$(ICONFIGFILES),$(GZIP_DEFS))
 SubdirLibraryRule($(OBJS))
-NormalLibraryObjectRule()
 NormalLintTarget($(SRCS))
 
 DependTarget()
-
Index: xc/lib/font/fc/Imakefile
--- xc.xf335/lib/font/fc/Imakefile	Wed Nov 25 01:44:45 1998
+++ xc/lib/font/fc/Imakefile	Tue Sep  7 12:17:09 1999
@@ -18,10 +18,17 @@
 #endif
   DEPEND_DEFINES = $(TRANS_INCLUDES) $(CONN_DEFINES)
 
+
+#define DoNormalLib NormalLibFont
+#define DoSharedLib SharedLibFont
+#define DoDebugLib DebugLibFont
+#define DoProfileLib ProfileLibFont
+#include <Library.tmpl>
+LibraryObjectRule()
+
 SubdirLibraryRule($(OBJS))
-NormalLibraryObjectRule()
-SpecialCObjectRule(fsio,$(ICONFIGFILES),$(CONN_DEFINES) $(SOCK_DEFINES))
-SpecialCObjectRule(transport,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES))
+SpecialCLibObjectRule(fsio,$(ICONFIGFILES),$(CONN_DEFINES) $(SOCK_DEFINES))
+SpecialCLibObjectRule(transport,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES))
 LinkSourceFile(transport.c,$(TRANSCOMMSRC))
 
 NormalLintTarget($(SRCS))
Index: xc/lib/font/fontfile/Imakefile
--- xc.xf335/lib/font/fontfile/Imakefile	Thu Dec 26 12:41:32 1996
+++ xc/lib/font/fontfile/Imakefile	Tue Sep  7 12:17:09 1999
@@ -27,11 +27,18 @@
               defaults.o bitsource.o register.o renderers.o bufio.o \
               decompress.o filewr.o printerfont.o ffcheck.o $(GUNZIP_OBJ)
 
-SpecialCObjectRule(fileio,$(ICONFIGFILES),$(GZIP_DEFS))
+#define DoNormalLib NormalLibFont
+#define DoSharedLib SharedLibFont
+#define DoDebugLib DebugLibFont
+#define DoProfileLib ProfileLibFont
+#include <Library.tmpl>
+LibraryObjectRule()
+
+SpecialCLibObjectRule(fileio,$(ICONFIGFILES),$(GZIP_DEFS))
+SpecialCLibObjectRule(ffcheck,$(ICONFIGFILES),$(FREETYPE_DEFS))
+SpecialCLibObjectRule(register,$(ICONFIGFILES),$(FREETYPE_DEFS))
 
 SubdirLibraryRule($(OBJS))
-NormalLibraryObjectRule()
 NormalLintTarget($(SRCS))
 
 DependTarget()
-
Index: xc/lib/font/stubs/Imakefile
--- xc.xf335/lib/font/stubs/Imakefile	Thu Sep 16 23:28:34 1999
+++ xc/lib/font/stubs/Imakefile	Tue Sep  7 12:17:09 1999
@@ -0,0 +1,22 @@
+/*
+ */
+
+#include <Server.tmpl>
+
+INCLUDES = -I$(FONTINCSRC) -I../include
+SRCS = cauthgen.c csignal.c delfntcid.c errorf.c fatalerror.c \
+       findoldfnt.c getcres.c getdefptsize.c getnewfntcid.c \
+       initfshdl.c regfpefunc.c rmfshdl.c setfntauth.c \
+       stfntcfnt.c xpstubs.c
+OBJS = cauthgen.o csignal.o delfntcid.o errorf.o fatalerror.o \
+       findoldfnt.o getcres.o getdefptsize.o getnewfntcid.o \
+       initfshdl.o regfpefunc.o rmfshdl.o setfntauth.o \
+       stfntcfnt.o xpstubs.o
+
+NormalLibraryObjectRule()
+NormalLibraryTarget(fntstubs,$(OBJS))
+LintLibraryTarget(fntstubs,$(SRCS))
+NormalLintTarget($(SRCS))
+DependTarget()
+
+/* end of file */
Index: xc/lib/font/stubs/cauthgen.c
--- xc.xf335/lib/font/stubs/cauthgen.c	Thu Sep 16 23:28:34 1999
+++ xc/lib/font/stubs/cauthgen.c	Tue Sep  7 12:17:09 1999
@@ -0,0 +1,9 @@
+#include "stubs.h"
+
+int
+client_auth_generation(ClientPtr client)
+{
+    return 0;
+}
+
+/* end of file */
Index: xc/lib/font/stubs/csignal.c
--- xc.xf335/lib/font/stubs/csignal.c	Thu Sep 16 23:28:34 1999
+++ xc/lib/font/stubs/csignal.c	Tue Sep  7 12:17:09 1999
@@ -0,0 +1,9 @@
+#include "stubs.h"
+
+Bool
+ClientSignal(ClientPtr client)
+{
+    return True;
+}
+
+/* end of file */
Index: xc/lib/font/stubs/delfntcid.c
--- xc.xf335/lib/font/stubs/delfntcid.c	Thu Sep 16 23:28:34 1999
+++ xc/lib/font/stubs/delfntcid.c	Tue Sep  7 12:17:09 1999
@@ -0,0 +1,8 @@
+#include "stubs.h"
+
+void
+DeleteFontClientID(Font id)
+{
+}
+
+/* end of file */
Index: xc/lib/font/stubs/errorf.c
--- xc.xf335/lib/font/stubs/errorf.c	Thu Sep 16 23:28:34 1999
+++ xc/lib/font/stubs/errorf.c	Tue Sep  7 12:17:09 1999
@@ -0,0 +1,8 @@
+#include "stubs.h"
+
+void
+ErrorF(char *f)
+{
+}
+
+/* end of file */
Index: xc/lib/font/stubs/fatalerror.c
--- xc.xf335/lib/font/stubs/fatalerror.c	Thu Sep 16 23:28:34 1999
+++ xc/lib/font/stubs/fatalerror.c	Tue Sep  7 12:17:09 1999
@@ -0,0 +1,8 @@
+#include "stubs.h"
+
+void
+FatalError(char *f)
+{
+}
+
+/* end of file */
Index: xc/lib/font/stubs/findoldfnt.c
--- xc.xf335/lib/font/stubs/findoldfnt.c	Thu Sep 16 23:28:34 1999
+++ xc/lib/font/stubs/findoldfnt.c	Tue Sep  7 12:17:09 1999
@@ -0,0 +1,9 @@
+#include "stubs.h"
+
+FontPtr
+find_old_font(FSID id)
+{
+    return (FontPtr)NULL;
+}
+
+/* end of file */
Index: xc/lib/font/stubs/getcres.c
--- xc.xf335/lib/font/stubs/getcres.c	Thu Sep 16 23:28:34 1999
+++ xc/lib/font/stubs/getcres.c	Tue Sep  7 12:17:09 1999
@@ -0,0 +1,9 @@
+#include "stubs.h"
+
+FontResolutionPtr
+GetClientResolutions(int *num)
+{
+  return (FontResolutionPtr) 0;
+}
+
+/* end of file */
Index: xc/lib/font/stubs/getdefptsize.c
--- xc.xf335/lib/font/stubs/getdefptsize.c	Thu Sep 16 23:28:34 1999
+++ xc/lib/font/stubs/getdefptsize.c	Tue Sep  7 12:17:09 1999
@@ -0,0 +1,9 @@
+#include "stubs.h"
+
+int
+GetDefaultPointSize(void)
+{
+    return 0;
+}
+
+/* end of file */
Index: xc/lib/font/stubs/getnewfntcid.c
--- xc.xf335/lib/font/stubs/getnewfntcid.c	Thu Sep 16 23:28:34 1999
+++ xc/lib/font/stubs/getnewfntcid.c	Tue Sep  7 12:17:09 1999
@@ -0,0 +1,9 @@
+#include "stubs.h"
+
+Font
+GetNewFontClientID(void)
+{
+    return (Font)0;
+}
+
+/* end of file */
Index: xc/lib/font/stubs/initfshdl.c
--- xc.xf335/lib/font/stubs/initfshdl.c	Thu Sep 16 23:28:34 1999
+++ xc/lib/font/stubs/initfshdl.c	Tue Sep  7 12:17:09 1999
@@ -0,0 +1,10 @@
+#include "stubs.h"
+
+int
+init_fs_handlers(FontPathElementPtr fpe,
+                 void (*block_handler)())
+{
+  return Successful;
+}
+
+/* end of file */
Index: xc/lib/font/stubs/regfpefunc.c
--- xc.xf335/lib/font/stubs/regfpefunc.c	Thu Sep 16 23:28:34 1999
+++ xc/lib/font/stubs/regfpefunc.c	Tue Sep  7 12:17:09 1999
@@ -0,0 +1,23 @@
+#include "stubs.h"
+
+int
+RegisterFPEFunctions(Bool (*name_func)(),
+                     int  (*init_func)(),
+                     int  (*free_func)(),
+                     int  (*reset_func)(),
+                     int  (*open_func)(),
+                     int  (*close_func)(),
+                     int  (*list_func)(),
+                     int  (*start_lfwi_func)(),
+                     int  (*next_lfwi_func)(),
+                     int  (*wakeup_func)(),
+                     int  (*client_died)(),
+                     int  (*load_glyphs)(),
+                     int  (*start_list_alias_func)(),
+                     int  (*next_list_alias_func)(),
+                     void (*set_path_func)())
+{
+    return 0;
+}
+
+/* end of file */
Index: xc/lib/font/stubs/rmfshdl.c
--- xc.xf335/lib/font/stubs/rmfshdl.c	Thu Sep 16 23:28:34 1999
+++ xc/lib/font/stubs/rmfshdl.c	Tue Sep  7 12:17:09 1999
@@ -0,0 +1,10 @@
+#include "stubs.h"
+
+void 
+remove_fs_handlers(FontPathElementPtr fpe,
+                   void (*block_handler) (),
+                   Bool all)
+{
+}
+
+/* end of file */
Index: xc/lib/font/stubs/setfntauth.c
--- xc.xf335/lib/font/stubs/setfntauth.c	Thu Sep 16 23:28:34 1999
+++ xc/lib/font/stubs/setfntauth.c	Tue Sep  7 12:17:09 1999
@@ -0,0 +1,9 @@
+#include "stubs.h"
+
+int
+set_font_authorizations(char **authorizations, int *authlen, ClientPtr client)
+{
+    return 0;
+}
+
+/* end of file */
Index: xc/lib/font/stubs/stfntcfnt.c
--- xc.xf335/lib/font/stubs/stfntcfnt.c	Thu Sep 16 23:28:34 1999
+++ xc/lib/font/stubs/stfntcfnt.c	Tue Sep  7 12:17:09 1999
@@ -0,0 +1,9 @@
+#include "stubs.h"
+
+int
+StoreFontClientFont(FontPtr pfont, Font id)
+{
+    return 0;
+}
+
+/* end of file */
Index: xc/lib/font/stubs/stubs.h
--- xc.xf335/lib/font/stubs/stubs.h	Thu Sep 16 23:28:34 1999
+++ xc/lib/font/stubs/stubs.h	Tue Sep  7 12:17:09 1999
@@ -0,0 +1,15 @@
+/* This directory includes dummy entry for bdftopcf and mkfontdir */
+
+#include <stdio.h>
+#include "fntfilst.h"
+#include "font.h"
+
+typedef char *ClientPtr ;
+#ifndef True
+#define True (-1)
+#endif
+#ifndef False
+#define False (0)
+#endif
+
+/* end of file */
Index: xc/lib/font/stubs/xpstubs.c
--- xc.xf335/lib/font/stubs/xpstubs.c	Thu Sep 16 23:28:34 1999
+++ xc/lib/font/stubs/xpstubs.c	Tue Sep  7 12:17:09 1999
@@ -0,0 +1,19 @@
+/*
+  stub for XpClient* functions.
+*/
+
+#include "stubs.h"
+
+Bool
+XpClientIsBitmapClient(ClientPtr client)
+{
+    return True;
+}
+
+Bool
+XpClientIsPrintClient(ClientPtr client, FontPathElementPtr fpe)
+{
+    return False;
+}
+
+/* end of file */
Index: xc/lib/font/util/Imakefile
--- xc.xf335/lib/font/util/Imakefile	Wed Apr 27 16:10:09 1994
+++ xc/lib/font/util/Imakefile	Tue Sep  7 12:17:09 1999
@@ -12,8 +12,14 @@
             OBJS = utilbitmap.o fontnames.o fontutil.o fontxlfd.o format.o \
 		   fontaccel.o atom.o miscutil.o private.o patcache.o
 
+#define DoNormalLib NormalLibFont
+#define DoSharedLib SharedLibFont
+#define DoDebugLib DebugLibFont
+#define DoProfileLib ProfileLibFont
+#include <Library.tmpl>
+LibraryObjectRule()
+
 SubdirLibraryRule($(OBJS))
-NormalLibraryObjectRule()
 NormalLintTarget($(SRCS))
 
 DependTarget()
Index: xc/lib/font/Imakefile
--- xc.xf335/lib/font/Imakefile	Sun May 11 14:04:09 1997
+++ xc/lib/font/Imakefile	Tue Sep  7 12:17:10 1999
@@ -4,9 +4,33 @@
 
 #define	IHaveSubdirs
 
-SUBDIRS = bitmap fontfile fc Speedo Type1 util
-OBJS = bitmap/?*.o fontfile/?*.o fc/?*.o Speedo/?*.o Type1/?*.o util/?*.o
-DONES = bitmap/DONE fontfile/DONE fc/DONE Speedo/DONE Type1/DONE util/DONE
+#ifndef SeparateSharedCompile
+#define SeparateSharedCompile YES
+#endif
+#if NormalLibFont && SharedLibFont && SeparateSharedCompile
+STATIC_OBJSDIR = unshared/
+#else
+STATIC_OBJSDIR =
+#endif
+
+
+SUBDIRS       = bitmap fontfile fc Speedo Type1 util stubs
+
+SHARED_OBJS   = bitmap/?*.o fontfile/?*.o fc/?*.o Speedo/?*.o Type1/?*.o \
+		util/?*.o
+
+STATIC_OBJS   = bitmap/$(STATIC_OBJSDIR)?*.o fontfile/$(STATIC_OBJSDIR)?*.o \
+		fc/$(STATIC_OBJSDIR)?*.o Speedo/$(STATIC_OBJSDIR)?*.o \
+		Type1/$(STATIC_OBJSDIR)?*.o util/$(STATIC_OBJSDIR)?*.o
+
+DEBUG_OBJS    = bitmap/debugger/?*.o fontfile/debugger/?*.o fc/debugger/?*.o \
+		Speedo/debugger/?*.o Type1/debugger/?*.o util/debugger/?*.o
+
+PROFILE_OBJS  = bitmap/profiled/?*.o fontfile/profiled/?*.o fc/profiled/?*.o \
+		Speedo/profiled/?*.o Type1/profiled/?*.o util/profiled/?*.o
+
+DONES         = bitmap/DONE fontfile/DONE fc/DONE Speedo/DONE Type1/DONE \
+		util/DONE
 
 #if HasParallelMake
 MakeMutex($(SUBDIRS) $(DONES))
@@ -19,16 +43,53 @@
 #undef _LinkBuildLibrary
 #define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)
 
+#if NormalLibFont
 #ifndef OS2Architecture
-NormalDepLibraryTarget(font,$(SUBDIRS) $(DONES),$(OBJS))
+NormalDepLibraryTarget(font,$(SUBDIRS) $(DONES),$(STATIC_OBJS))
 #else
 all:: DONE
-	cp $(OBJS) .
+	cp $(STATIC_OBJS) .
 
 NormalDepLibraryTarget(font,$(DONES),?*.o)
-#endif
-
+#endif /* of OS2Architecture */
+InstallLibrary(font,$(USRLIBDIR))
+#if !SharedLibFont
 InstallLinkKitLibrary(font,$(LINKKITDIR)/lib)
+#endif /* of !SharedLibFont */
+#endif /* of NormalLibFont */
+
+#if SharedLibFont && (!(Win32Architecture || OS2Architecture || i386Sco324Architecture || i386Sco325Architecture))
+SharedDepLibraryTarget(font,$(SOFONTREV),$(SUBDIRS) $(DONES),$(SHARED_OBJS),.,.)
+InstallSharedLibrary(font,$(SOFONTREV),$(SHLIBDIR))
+#endif /* of SharedLibFont */
+
+#if DebugLibFont
+#ifndef OS2Architecture
+DebuggedDepLibraryTarget(font,$(SUBDIRS) $(DONES),$(DEBUG_OBJS))
+#else
+all:: DONE
+	rm -rf debugged
+	mkdir debugged
+	cp $(DEBUG_OBJS) debugged
+
+DebuggedDepLibraryTarget(font,$(DONES),?*.o)
+#endif /* of OS2Architecture */
+InstallLibrary(font_d,$(USRLIBDIR))
+#endif /* of DebugLibFont */
+
+#if ProfileLibFont
+#ifndef OS2Architecture
+ProfiledDepLibraryTarget(font,$(SUBDIRS) $(DONES),$(PROFILE_OBJS))
+#else
+all:: DONE
+	rm -rf profiled
+	mkdir profiled
+	cp $(PROFILE_OBJS) profiled
+
+ProfiledDepLibraryTarget(font,$(DONES),?*.o)
+#endif /* of OS2Architecture */
+InstallLibrary(font_p,$(USRLIBDIR))
+#endif /* of ProfileLibFont */
 
 ForceSubdirs($(SUBDIRS))
 
Index: xc/programs/bdftopcf/Imakefile
--- xc.xf335/programs/bdftopcf/Imakefile	Sun Jul  6 00:55:47 1997
+++ xc/programs/bdftopcf/Imakefile	Tue Sep  7 12:17:10 1999
@@ -4,8 +4,10 @@
 #if GzipFontCompression
 ZLIB = GzipLibrary
 #endif
-LOCAL_LIBRARIES = $(FONTLIB) $(ZLIB)
-DEPLIBS = $(DEPFONTLIB)
+DEPSTUBS = ../../lib/font/stubs/libfntstubs.a
+STUBS= -L../../lib/font/stubs -lfntstubs
+LOCAL_LIBRARIES = MathLibrary $(FONTLIB) $(ZLIB) $(STUBS)
+DEPLIBS = $(DEPFONTLIB) $(DEPSTUBS)
 INCLUDES = -I$(FONTINCSRC) -I$(FONTLIBSRC)/include
 SRCS = bdftopcf.c
 OBJS = bdftopcf.o
Index: xc/programs/bdftopcf/bdftopcf.c
--- xc.xf335/programs/bdftopcf/bdftopcf.c	Wed Apr 27 16:12:47 1994
+++ xc/programs/bdftopcf/bdftopcf.c	Tue Sep  7 12:17:10 1999
@@ -37,6 +37,8 @@
 #include <stdio.h>
 #include <X11/Xos.h>
 
+pointer serverClient;		/* KLUDGE */
+
 main (argc, argv)
     char    **argv;
 {
Index: xc/programs/mkfontdir/Imakefile
--- xc.xf335/programs/mkfontdir/Imakefile	Sun Jul  6 00:55:49 1997
+++ xc/programs/mkfontdir/Imakefile	Tue Sep  7 12:17:10 1999
@@ -1,12 +1,14 @@
 XCOMM $TOG: Imakefile /main/11 1997/05/25 15:12:09 kaleb $
 XCOMM $XFree86: xc/programs/mkfontdir/Imakefile,v 3.5.2.1 1997/07/05 15:55:49 dawes Exp $
 LOCAL_LIBRARIES = $(FONTLIB)
-DEPLIBS = $(DEPFONTLIB)
+DEPSTUBS = ../../lib/font/stubs/libfntstubs.a
+STUBS= -L../../lib/font/stubs -lfntstubs
+DEPLIBS = $(DEPFONTLIB) $(DEPSTUBS)
 INCLUDES = -I$(FONTINCSRC) -I$(FONTLIBSRC)/include
 #if GzipFontCompression
 ZLIB = GzipLibrary
 #endif
-SYS_LIBRARIES = MathLibrary $(ZLIB)
+SYS_LIBRARIES = MathLibrary $(ZLIB) $(STUBS)
 SRCS = mkfontdir.c
 OBJS = mkfontdir.o
 
Index: xc/programs/mkfontdir/mkfontdir.c
--- xc.xf335/programs/mkfontdir/mkfontdir.c	Wed Nov 25 01:45:14 1998
+++ xc/programs/mkfontdir/mkfontdir.c	Tue Sep  7 12:17:10 1999
@@ -121,6 +121,7 @@
 #define  XK_LATIN1
 #include <X11/keysymdef.h>
 
+pointer serverClient;		/* KLUDGE */
 char *progName;
 
 static Bool
Index: xc/programs/xfs/Imakefile
--- xc.xf335/programs/xfs/Imakefile	Mon Sep  6 20:18:29 1999
+++ xc/programs/xfs/Imakefile	Tue Sep  7 12:20:59 1999
@@ -6,6 +6,8 @@
 
 OSDIR = os
 DIFSDIR = difs
+DEPFONTLIB = ../../lib/font/libfont.a
+FONTLIB = -L../../lib/font -lfont
 
 OSLIB = $(OSDIR)/LibraryTargetName(os)
 DIFSLIB = $(DIFSDIR)/LibraryTargetName(difs)
@@ -20,7 +22,8 @@
 #endif
 
 FSDIRS = $(OSDIR) $(DIFSDIR) $(PCFDIRS)
-FSLIBS = $(DIFSLIB) $(DEPFONTLIB) $(DIFSLIB) $(OSLIB) $(BSDEMUL)
+FSLIBS = $(DIFSLIB) $(DIFSLIB) $(OSLIB) $(BSDEMUL)
+FSSYSLIBS = $(LDPRELIBS) $(FONTLIB) $(SYSLIBS) $(ZLIB)
 
 SUBDIRS = $(FSDIRS)
 
@@ -40,9 +43,9 @@
 all:: config
 
 #if !defined(LynxOSArchitecture) && !defined(QNXArchitecture)
-ServerTarget(xfs,$(FSDIRS),NullParameter,$(FSLIBS),$(SYSLIBS) $(ZLIB))
+ServerTarget(xfs,$(FSDIRS),NullParameter,$(FSLIBS),$(FSSYSLIBS))
 #else
-ServerTarget(xfs,$(FSDIRS),difs/main.o,$(FSLIBS),$(SYSLIBS) $(ZLIB))
+ServerTarget(xfs,$(FSDIRS),difs/main.o,$(FSLIBS),$(FSSYSLIBS))
 #endif
 
 LinkVarDirectory(fs,.,fs,.)
--- xc/programs/Xserver/Imakefile~	Wed Feb  9 13:51:20 2000
+++ xc/programs/Xserver/Imakefile	Wed Feb  9 16:22:45 2000
@@ -11,7 +11,7 @@
 INSTPGMFLAGS = 
 #endif
 
-#define PreFbLibs $(DIX) $(OS) $(FONT) $(XPDDX)
+#define PreFbLibs $(DIX) $(OS) $(XPDDX)
 #define BarePostFbLibs $(MFB) $(XPFBLIBS) $(MI)
 #define PostFbLibs BarePostFbLibs $(EXTENSIONS)
 #define NoMfbBarePostFbLibs $(XPFBLIBS) $(MI)
@@ -151,7 +151,7 @@
           CFB32 = cfb/LibraryTargetName(cfb) cfb32/LibraryTargetName(cfb)
              MI = mi/LibraryTargetName(mi)
             DIX = dix/LibraryTargetName(dix)
-           FONT = $(DEPFONTLIB)
+           FONT = $(FONTLIB) $(XPFBLIBS)
 #if UsbMouseSupport 
 #if !HasLibUsb
             USB = $(XF86OSSRC)/libusb/LibraryTargetName(usb)
@@ -217,7 +217,8 @@
 DECDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
 DECOBJS = hw/dec/ws/init.o hw/dec/ws/sdepthinit.o
 DECLIBS = hw/dec/ws/LibraryTargetName(dec) CFB8Libs
-ServerTarget(Xdec,$(DECDIRS),$(DECOBJS),$(DECLIBS),$(SYSLIBS))
+DECSYSLIBS = $(LDPRELIBS) $(FONT)
+ServerTarget(Xdec,$(DECDIRS),$(DECOBJS),$(DECLIBS),$(DECSYSLIBS))
 #ifndef ServerToInstall
 #define ServerToInstall Xdec
 #endif
@@ -238,7 +239,8 @@
 DECDIRS1 = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
 DECOBJS1 = hw/dec/ws/init.o hw/dec/ws/mdepthinit.o
 DECLIBS1 = hw/dec/ws/LibraryTargetName(dec) CFBLibs
-ServerTarget(Xdec_md,$(DECDIRS1),$(DECOBJS1),$(DECLIBS1),$(SYSLIBS))
+DECSYSLIBS1 = $(LDPRELIBS) $(FONT)
+ServerTarget(Xdec_md,$(DECDIRS1),$(DECOBJS1),$(DECLIBS1),$(DECSYSLIBS1))
 #ifndef ServerToInstall
 #define ServerToInstall Xdec_md
 #endif
@@ -267,7 +269,7 @@
 #endif
 SUNDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) hw/sun $(DEPDIRS)
 SUNLIBS = hw/sun/LibraryTargetName(sun) CFB8Libs
-SUNSYSLIBS = $(WIDECHARSYSLIB) $(SYSLIBS)
+SUNSYSLIBS = $(LDPRELIBS) $(FONT) $(WIDECHARSYSLIB) $(SYSLIBS)
 SetUIDServerTarget(Xsun,$(SUNDIRS),$(SUNOBJS),$(SUNLIBS),$(SUNSYSLIBS))
 #ifndef ServerToInstall
 #define ServerToInstall Xsun
@@ -297,7 +299,8 @@
 SUN24OBJS = hw/sun/sunInitMulti.o hw/sun/sunGX.o hw/sun/sunCfb.o hw/sun/sunCfb24.o
 #endif
 SUN24LIBS = hw/sun/LibraryTargetName(sun) hw/sun/FFB/LibraryTargetName(FFB) hw/sun/LEO/LibraryTargetName(LEO) CFBLibs
-SetUIDServerTarget(Xsun24,$(SUN24DIRS),$(SUN24OBJS),$(SUN24LIBS),$(SYSLIBS))
+SUN24SYSLIBS = $(LDPRELIBS) $(FONT) $(WIDECHARSYSLIB) $(SYSLIBS)
+SetUIDServerTarget(Xsun24,$(SUN24DIRS),$(SUN24OBJS),$(SUN24LIBS),$(SUN24SYSLIBS))
 #ifndef ServerToInstall
 #define ServerToInstall Xsun24
 #endif
@@ -321,7 +324,8 @@
 SUNMOBJS = hw/sun/sunInitMono.o hw/sun/sunInExMono.o
 #endif
 SUNMLIBS = hw/sun/LibraryTargetName(sun) MFBBareLibs $(OTHEREXTS)
-SetUIDServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS),$(SUNMLIBS),$(SYSLIBS))
+SUNMSYSLIBS = $(LDPRELIBS) $(FONT) $(WIDECHARSYSLIB) $(SYSLIBS)
+SetUIDServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS),$(SUNMLIBS),$(SUNMSYSLIBS))
 #ifndef ServerToInstall
 #define ServerToInstall XsunMono
 #endif
@@ -338,7 +342,8 @@
 SUNDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
 SUNOBJS = hw/sunAmoeba/sunInitColor.o
 SUNLIBS = hw/sunAmoeba/LibraryTargetName(sun) CFB8Libs
-ServerTarget(Xsun,$(SUNDIRS),$(SUNOBJS),$(SUNLIBS),$(SYSLIBS))
+SUNSYSLIBS = $(LDPRELIBS) $(FONT)
+ServerTarget(Xsun,$(SUNDIRS),$(SUNOBJS),$(SUNLIBS),$(SUNSYSLIBS))
 #ifndef ServerToInstall
 #define ServerToInstall Xsun
 #endif
@@ -354,7 +359,8 @@
 SUNMDIRS = $(STDDIRS) $(MFBDIR) $(DDXDIR1) $(DEPDIRS)
 SUNMOBJS = hw/sunAmoeba/sunInitMono.o hw/sunAmoeba/sunInExMono.o
 SUNMLIBS = hw/sunAmoeba/LibraryTargetName(sun) MFBBareLibs $(OTHEREXTS)
-ServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS),$(SUNMLIBS),$(SYSLIBS))
+SUNMSYSLIBS = $(LDPRELIBS) $(FONT)
+ServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS),$(SUNMLIBS),$(SUNMSYSLIBS))
 #ifndef ServerToInstall
 #define ServerToInstall XsunMono
 #endif
@@ -371,7 +377,8 @@
 SUNDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
 SUNOBJS = hw/sunLynx/sunLyInit.o
 SUNLIBS = hw/sunLynx/libsun.a CFB8Libs
-ServerTarget(Xsun,$(SUNDIRS),$(SUNOBJS),$(SUNLIBS),$(SYSLIBS))
+SUNSYSLIBS = $(LDPRELIBS) $(FONT)
+ServerTarget(Xsun,$(SUNDIRS),$(SUNOBJS),$(SUNLIBS),$(SUNSYSLIBS))
 #ifndef ServerToInstall
 #define ServerToInstall Xsun
 #endif
@@ -387,7 +394,8 @@
 SUNMDIRS = $(STDDIRS) $(MFBDIR) $(DDXDIR1) $(DEPDIRS)
 SUNMOBJS = hw/sunLynx/sunInitMono.o hw/sunLynx/sunInExMono.o
 SUNMLIBS = hw/sunLynx/libsun.a MFBBareLibs $(OTHEREXTS)
-ServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS),$(SUNMLIBS),$(SYSLIBS))
+SUNMSYSLIBS = $(LDPRELIBS) $(FONT)
+ServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS),$(SUNMLIBS),$(SUNMSYSLIBS))
 #ifndef ServerToInstall
 #define ServerToInstall XsunMono
 #endif
@@ -409,7 +417,8 @@
 IBMDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
 IBMOBJS = hw/ibm/common/ibmcomm.o hw/ibm/common/ibmDate.o
 IBMLIBS = hw/ibm/AIX/hft.o hw/ibm/LibraryTargetName(ibm) $(IBMALLOCLIB) CFB8Libs
-ServerTarget(Xibm,$(IBMDIRS),$(IBMOBJS),$(IBMLIBS),$(SYSLIBS))
+IBMSYSLIBS = $(LDPRELIBS) $(FONT)
+ServerTarget(Xibm,$(IBMDIRS),$(IBMOBJS),$(IBMLIBS),$(IBMSYSLIBS))
 #ifndef ServerToInstall
 #define ServerToInstall Xibm
 #endif
@@ -427,7 +436,7 @@
 HPOBJS = hw/hp/hp.o
 HPSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
 HPLIBS = CFB32Libs
-HPSYSLIBS = $(CBRT) $(SYSLIBS)
+HPSYSLIBS = $(LDPRELIBS) $(FONT) $(CBRT) $(SYSLIBS)
 ServerTarget(Xhp,$(HPSUBDIRS),$(HPOBJS),$(HPLIBS),$(HPSYSLIBS))
 #ifndef ServerToInstall
 #define ServerToInstall Xhp
@@ -445,7 +454,7 @@
 SVGASUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
 SVGAOBJS = hw/svga/svga.o
 SVGALIBS = CFB8Libs
-SVGASYSLIBS = $(CBRT) -lm -lmalloc
+SVGASYSLIBS = $(LDPRELIBS) $(FONT) $(CBRT) -lm -lmalloc
 SetUIDServerTarget(Xsvga,$(SVGASUBDIRS),$(SVGAOBJS),$(SVGALIBS),$(SVGASYSLIBS))
 #ifndef ServerToInstall
 #define ServerToInstall Xsvga
@@ -657,7 +666,7 @@
                $(XF86SRC)/xaa/LibraryTargetName(xaa) \
                $(XF86SRC)/vga256/LibraryTargetName(vga256) \
                $(XF86LIBS) CFBLibs
-XF86SVGASYSLIBS = $(SYSLIBS)
+XF86SVGASYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF86SVGASUBDIRS) $(XF86SVGAOBJS) $(XF86SVGALIBS) $(XF86SVGASYSLIBS))
 #endif
@@ -692,7 +701,7 @@
 XF86VGA16LIBS = $(VGA16DRIVERSRC)/LibraryTargetName(driver16) \
                 $(XF86SRC)/vga16/LibraryTargetName(vga16) \
                 $(XF86VGA16MONOLIBS) $(XF86MLIBS) NoMFBBareLibs $(OTHEREXTS)
-XF86VGA16SYSLIBS = $(SYSLIBS)
+XF86VGA16SYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF86VGA16SUBDIRS) $(XF86VGA16OBJS) $(XF86VGA16LIBS) $(XF86VGA16SYSLIBS))
 #endif
@@ -725,7 +734,7 @@
               $(XF86ACCELSRC)/et4000w32/w32/LibraryTargetName(w32) \
               $(XF86ACCELSRC)/et4000w32/asm/LibraryTargetName(asm) \
               $(XF86LIBS) CFB8Libs
-XF86W32SYSLIBS = $(SYSLIBS)
+XF86W32SYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF86W32SUBDIRS) $(XF86W32OBJS) $(XF86W32LIBS) $(XF86W32SYSLIBS))
 #endif
@@ -760,7 +769,7 @@
 XF86MONOLIBS = $(VGA2DRIVERSRC)/LibraryTargetName(driver2) \
                $(XF86SRC)/vga2/LibraryTargetName(vga2) \
 	       $(XF86MONOMONOLIBS) $(XF86MLIBS) NoMFBBareLibs $(OTHEREXTS)
-XF86MONOSYSLIBS = $(SYSLIBS)
+XF86MONOSYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF86MONOSUBDIRS) $(XF86MONOOBJS) $(XF86MONOLIBS) $(XF86MONOSYSLIBS))
 #endif
@@ -799,7 +808,7 @@
              $(XF86ACCELSRC)/s3/s3newmmio/LibraryTargetName(s3newmmio) \
              $(XF86ACCELSRC)/s3/s3mmio/LibraryTargetName(s3mmio) $(XF86LIBS) \
              CFBLibs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF86S3SYSLIBS = $(SYSLIBS)
+XF86S3SYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF86S3SUBDIRS) $(XF86S3OBJS) $(XF86S3LIBS) $(XF86S3SYSLIBS))
 #endif
@@ -830,7 +839,7 @@
              $(S3VDRIVERSRC)/s3_virge/s3_virge.o
 XF86S3VLIBS = $(XF86ACCELSRC)/s3_virge/LibraryTargetName(s3v) $(XF86LIBS) \
              CFBLibs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF86S3VSYSLIBS = $(SYSLIBS)
+XF86S3VSYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF86S3VSUBDIRS) $(XF86S3VOBJS) $(XF86S3VLIBS) $(XF86S3VSYSLIBS))
 #endif
@@ -860,7 +869,7 @@
 XF868514OBJS = $(XF86COMSRC)/XF86_8514.o
 XF868514LIBS = $(XF86ACCELSRC)/ibm8514/LibraryTargetName(8514) $(XF86LIBS) \
                CFB8Libs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF868514SYSLIBS = $(SYSLIBS)
+XF868514SYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF868514SUBDIRS) $(XF868514OBJS) $(XF868514LIBS) $(XF868514SYSLIBS))
 #endif
@@ -890,7 +899,7 @@
 XF86MACH8OBJS = $(XF86COMSRC)/XF86_Mach8.o
 XF86MACH8LIBS = $(XF86ACCELSRC)/mach8/LibraryTargetName(mach8) $(XF86LIBS) \
                 CFB8Libs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF86MACH8SYSLIBS = $(SYSLIBS)
+XF86MACH8SYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF86MACH8SUBDIRS) $(XF86MACH8OBJS) $(XF86MACH8LIBS) $(XF86MACH8SYSLIBS))
 #endif
@@ -922,7 +931,7 @@
 XF86MACH32OBJS = $(XF86COMSRC)/XF86_Mach32.o
 XF86MACH32LIBS = $(XF86ACCELSRC)/mach32/LibraryTargetName(mach32) $(XF86LIBS) \
                  CFB16Libs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF86MACH32SYSLIBS = $(SYSLIBS)
+XF86MACH32SYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF86MACH32SUBDIRS) $(XF86MACH32OBJS) $(XF86MACH32LIBS) $(XF86MACH32SYSLIBS))
 #endif
@@ -956,7 +965,7 @@
 XF86MACH64OBJS = $(XF86COMSRC)/XF86_Mach64.o
 XF86MACH64LIBS = $(XF86ACCELSRC)/mach64/LibraryTargetName(mach64) \
 		 $(XF86LIBS) CFBLibs
-XF86MACH64SYSLIBS = $(SYSLIBS)
+XF86MACH64SYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF86MACH64SUBDIRS) $(XF86MACH64OBJS) $(XF86MACH64LIBS) $(XF86MACH64SYSLIBS))
 #endif
@@ -990,7 +999,7 @@
 XF86P9000OBJS = $(XF86COMSRC)/XF86_P9000.o
 XF86P9000LIBS = $(XF86ACCELSRC)/p9000/LibraryTargetName(p9000) \
                 $(XF86LIBS) CFBLibs
-XF86P9000SYSLIBS = $(SYSLIBS)
+XF86P9000SYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF86P9000SUBDIRS) $(XF86P9000OBJS) $(XF86P9000LIBS) $(XF86P9000SYSLIBS))
 #endif
@@ -1023,7 +1032,7 @@
 		 $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
 XF86AGXOBJS = $(XF86COMSRC)/XF86_AGX.o
 XF86AGXLIBS = $(XF86ACCELSRC)/agx/LibraryTargetName(agx) $(XF86LIBS) CFBLibs
-XF86AGXSYSLIBS = $(SYSLIBS)
+XF86AGXSYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF86AGXSUBDIRS) $(XF86AGXOBJS) $(XF86AGXLIBS) $(XF86AGXSYSLIBS))
 #endif
@@ -1059,7 +1068,7 @@
 		  $(XF98SRC)/xaa/LibraryTargetName(xaa) \
 		  $(XF98SRC)/vga256/LibraryTargetName(ganbwap) $(XF98LIBS) \
 		  CFBLibs
-XF98GANBWAPSYSLIBS = $(SYSLIBS)
+XF98GANBWAPSYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF98GANBWAPSUBDIRS) $(XF98GANBWAPOBJS) $(XF98GANBWAPLIBS) $(XF98GANBWAPSYSLIBS))
 #endif
@@ -1091,7 +1100,7 @@
 		 $(XF98SRC)/xaa/LibraryTargetName(xaa) \
 		 $(XF98SRC)/vga256/LibraryTargetName(nec480) $(XF98LIBS) \
 		 CFBLibs
-XF98NEC480SYSLIBS = $(SYSLIBS)
+XF98NEC480SYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF98NEC480SUBDIRS) $(XF98NEC480OBJS) $(XF98NEC480LIBS) $(XF98NEC480SYSLIBS))
 #endif
@@ -1123,7 +1132,7 @@
 		 $(XF98SRC)/xaa/LibraryTargetName(xaa) \
 		 $(XF98SRC)/vga256/LibraryTargetName(nkvnec) $(XF98LIBS) \
 		 CFBLibs
-XF98NKVNECSYSLIBS = $(SYSLIBS)
+XF98NKVNECSYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF98NKVNECSUBDIRS) $(XF98NKVNECOBJS) $(XF98NKVNECLIBS) $(XF98NKVNECSYSLIBS))
 #endif
@@ -1154,7 +1163,7 @@
 XF98WABSLIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(driverwabs) \
 	       $(XF98SRC)/xaa/LibraryTargetName(xaa) \
 	       $(XF98SRC)/vga256/LibraryTargetName(wabs) $(XF98LIBS) CFBLibs
-XF98WABSSYSLIBS = $(SYSLIBS)
+XF98WABSSYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF98WABSSUBDIRS) $(XF98WABSOBJS) $(XF98WABSLIBS) $(XF98WABSSYSLIBS))
 #endif
@@ -1185,7 +1194,7 @@
 XF98WABEPLIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(driverwabep) \
 	       $(XF98SRC)/xaa/LibraryTargetName(xaa) \
 	       $(XF98SRC)/vga256/LibraryTargetName(wabep) $(XF98LIBS) CFBLibs
-XF98WABEPSYSLIBS = $(SYSLIBS)
+XF98WABEPSYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF98WABEPSUBDIRS) $(XF98WABEPOBJS) $(XF98WABEPLIBS) $(XF98WABEPSYSLIBS))
 #endif
@@ -1216,7 +1225,7 @@
 XF98WSNALIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(driverwsna) \
 	       $(XF98SRC)/xaa/LibraryTargetName(xaa) \
 	       $(XF98SRC)/vga256/LibraryTargetName(wsna) $(XF98LIBS) CFBLibs
-XF98WSNASYSLIBS = $(SYSLIBS)
+XF98WSNASYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF98WSNASUBDIRS) $(XF98WSNAOBJS) $(XF98WSNALIBS) $(XF98WSNASYSLIBS))
 #endif
@@ -1247,7 +1256,7 @@
 XF98TGUILIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(drivertrident) \
 	       $(XF98SRC)/xaa/LibraryTargetName(xaa) \
 	       $(XF98SRC)/vga256/LibraryTargetName(trident) $(XF98LIBS) CFBLibs
-XF98TGUISYSLIBS = $(SYSLIBS)
+XF98TGUISYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF98TGUISUBDIRS) $(XF98TGUIOBJS) $(XF98TGUILIBS) $(XF98TGUISYSLIBS))
 #endif
@@ -1278,7 +1287,7 @@
 XF98MGALIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(drivermga) \
 	       $(XF98SRC)/xaa/LibraryTargetName(xaa) \
 	       $(XF98SRC)/vga256/LibraryTargetName(mga) $(XF98LIBS) CFBLibs
-XF98MGASYSLIBS = $(SYSLIBS)
+XF98MGASYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF98MGASUBDIRS) $(XF98MGAOBJS) $(XF98MGALIBS) $(XF98MGASYSLIBS))
 #endif
@@ -1309,7 +1318,7 @@
 XF98SVGALIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(driversvga) \
 	       $(XF98SRC)/xaa/LibraryTargetName(xaa) \
 	       $(XF98SRC)/vga256/LibraryTargetName(vga256) $(XF98LIBS) CFBLibs
-XF98SVGASYSLIBS = $(SYSLIBS)
+XF98SVGASYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF98SVGASUBDIRS) $(XF98SVGAOBJS) $(XF98SVGALIBS) $(XF98SVGASYSLIBS))
 #endif
@@ -1335,7 +1344,7 @@
 XF98EGCLIBS = $(XF98VGA16DRIVERSRC)/LibraryTargetName(driver16) \
 		$(XF98SRC)/vga16/LibraryTargetName(vga16) $(XF98MLIBS) \
 		NoMFBBareLibs $(OTHEREXTS)
-XF98EGCSYSLIBS = $(SYSLIBS)
+XF98EGCSYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF98EGCSUBDIRS) $(XF98EGCOBJS) $(XF98EGCLIBS) $(XF98EGCSYSLIBS))
 #endif
@@ -1371,7 +1380,7 @@
                 $(XF98ACCELSRC)/s3nec/s3mmio/LibraryTargetName(s3necmmio) \
                 $(XF98LIBSNEC) CFBLibs \
                 $(XF98ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF98NECS3SYSLIBS = $(SYSLIBS)
+XF98NECS3SYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF98NECS3SUBDIRS) $(XF98NECS3OBJS) $(XF98NECS3LIBS) $(XF98NECS3SYSLIBS))
 #endif
@@ -1407,7 +1416,7 @@
                 $(XF98ACCELSRC)/s3pwskb/s3mmio/LibraryTargetName(s3pwskbmmio) \
                 $(XF98LIBSPWSKB) CFBLibs \
                 $(XF98ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF98PWSKBSYSLIBS = $(SYSLIBS)
+XF98PWSKBSYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF98PWSKBSUBDIRS) $(XF98PWSKBOBJS) $(XF98PWSKBLIBS) $(XF98PWSKBSYSLIBS))
 #endif
@@ -1443,7 +1452,7 @@
                $(XF98ACCELSRC)/s3pwlb/s3mmio/LibraryTargetName(s3pwlbmmio) \
                $(XF98LIBSPWLB) CFBLibs \
                $(XF98ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF98PWLBSYSLIBS = $(SYSLIBS)
+XF98PWLBSYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF98PWLBSUBDIRS) $(XF98PWLBOBJS) $(XF98PWLBLIBS) $(XF98PWLBSYSLIBS))
 #endif
@@ -1479,7 +1488,7 @@
                 $(XF98ACCELSRC)/s3ga968/s3mmio/LibraryTargetName(s3ga968mmio) \
                 $(XF98LIBSGA968) CFBLibs \
                 $(XF98ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF98GA968SYSLIBS = $(SYSLIBS)
+XF98GA968SYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF98GA968SUBDIRS) $(XF98GA968OBJS) $(XF98GA968LIBS) $(XF98GA968SYSLIBS))
 #endif
@@ -1512,7 +1521,7 @@
 XF86I128LIBS = $(XF86ACCELSRC)/i128/LibraryTargetName(i128) \
 	       $(XF86SRC)/xaa/LibraryTargetName(xaa) $(XF86LIBS) \
                CFBLibs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF86I128SYSLIBS = $(SYSLIBS)
+XF86I128SYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF86I128SUBDIRS) $(XF86I128OBJS) $(XF86I128LIBS) $(XF86I128SYSLIBS))
 #endif
@@ -1548,7 +1557,7 @@
 XF86GLINTLIBS = $(XF86ACCELSRC)/glint/LibraryTargetName(glint) \
 	       $(XF86SRC)/xaa/LibraryTargetName(xaa) $(XF86LIBS) \
                CFBLibs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF86GLINTSYSLIBS = $(SYSLIBS)
+XF86GLINTSYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF86GLINTSUBDIRS) $(XF86GLINTOBJS) $(XF86GLINTLIBS) $(XF86GLINTSYSLIBS))
 #endif
@@ -1584,7 +1593,7 @@
 XF86TGALIBS = $(XF86ACCELSRC)/tga/LibraryTargetName(tga) \
 	      $(XF86SRC)/xaa/LibraryTargetName(xaa) $(XF86LIBS) \
                CFBLibs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF86TGASYSLIBS = $(SYSLIBS)
+XF86TGASYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF86TGASUBDIRS) $(XF86TGAOBJS) $(XF86TGALIBS) $(XF86TGASYSLIBS))
 #endif
@@ -1628,7 +1637,7 @@
 XF68FBDevOBJS = $(XF86COMSRC)/XF68_FBDev.o
 XF68FBDevLIBS = $(XF86SRC)/fbdev/LibraryTargetName(fbdev) $(XF86LIBS) \
                 PreFbLibs $(FBDEVFBLIBS) PostFbLibs
-XF68FBDevSYSLIBS = $(SYSLIBS)
+XF68FBDevSYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF68FBDevSUBDIRS) $(XF68FBDevOBJS) $(XF68FBDevLIBS) $(XF68FBDevSYSLIBS))
 #endif
@@ -1709,7 +1718,7 @@
 XF68FBDevOBJS = $(XF68COMSRC)/XF68_FBDev.o
 XF68FBDevLIBS = $(XF68SRC)/fbdev/LibraryTargetName(fbdev) $(XF68LIBS) \
                 PreFbLibs $(FBDEVFBLIBS) PostFbLibs
-XF68FBDevSYSLIBS = $(SYSLIBS)
+XF68FBDevSYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XF68FBDevSUBDIRS) $(XF68FBDevOBJS) $(XF68FBDevLIBS) $(XF68FBDevSYSLIBS))
 #endif
@@ -1779,9 +1788,9 @@
 XPLIBS = PreFbLibs PostFbLibs
 #endif
 #if (defined(SunArchitecture) || defined(SparcArchitecture)) && defined(SVR4Architecture)
-XPSYSLIBS = $(CBRT) $(SYSLIBS) -lw
+XPSYSLIBS = $(LDPRELIBS) $(FONT) $(CBRT) $(SYSLIBS) -lw
 #else
-XPSYSLIBS = $(CBRT) $(SYSLIBS)
+XPSYSLIBS = $(LDPRELIBS) $(FONT) $(CBRT) $(SYSLIBS)
 #endif
 #if HasParallelMake
 MakeMutex($(XPSUBDIRS) $(XPOBJS) $(XPLIBS) $(XPSYSLIBS))
@@ -1811,9 +1820,9 @@
 XNEST = hw/xnest/LibraryTargetName(xnest)
 XNESTLIBS = PreFbLibs $(XNEST) NoMfbPostFbLibs $(XNEST)
 #if defined(QNXArchitecture)
-XNESTSYSLIBS = -Wl,"op undefsok" $(LDPRELIBS) $(XLIB) $(SYSLIBS)
+XNESTSYSLIBS = -Wl,"op undefsok" $(LDPRELIBS) $(FONT) $(XLIB) $(SYSLIBS)
 #else
-XNESTSYSLIBS = $(LDPRELIBS) $(XLIB) $(SYSLIBS)
+XNESTSYSLIBS = $(LDPRELIBS) $(FONT) $(XLIB) $(SYSLIBS)
 #endif
 #if HasParallelMake
 MakeMutex($(XNESTDIRS) $(XNESTOBJS) $(XNESTLIBS) $(XNESTSYSLIBS))
@@ -1866,7 +1875,7 @@
 #endif
 XVFB = hw/vfb/LibraryTargetName(vfb)
 XVFBLIBS = PreFbLibs $(XVFB) $(CFB) PostFbLibs
-XVFBSYSLIBS = $(SYSLIBS)
+XVFBSYSLIBS = $(LDPRELIBS) $(FONT) $(SYSLIBS)
 #if HasParallelMake
 MakeMutex($(XVFBDIRS) $(XVFBOBJS) $(XVFB) $(XVFBLIBS) $(XVFBSYSLIBS))
 #endif