STSF-CURRENT: xorg/xc/programs/Xserver

[jhobson]

CVS commit by jhobson: 

Committing in STSF-CURRENT
Modified Files:
Tag: STSF-CURRENT
Imakefile 
----------------------------------------------------------------------


  M +7 -3      xorg/xc/programs/Xserver/Imakefile   1.1.1.7.2.1


--- xorg/xc/programs/Xserver/Imakefile  #1.1.1.7:1.1.1.7.2.1
@@ -163,4 +163,8 @@
 #endif
 
+#if BuildXst
+      XSTDIR = Xst
+      XSTLIB = $(XSTDIR)/libxst.a
+#endif
 #if BuildRender
       RENDERDIR = render
@@ -172,5 +176,5 @@
 #endif
 #if DoLoadableServer
-     EXTENSIONS = $(OTHEREXTS) $(RANDRLIB) $(RENDERLIB)
+     EXTENSIONS = $(OTHEREXTS) $(RANDRLIB) $(RENDERLIB) $(XSTLIB)
    LOADABLEEXTS = $(MISCEXT) $(DBEEXT) $(RECORDEXT) $(GLXEXT) $(XTRAPEXT)
         MISCEXT = Xext/LibraryTargetName(ext)
@@ -178,5 +182,5 @@
                   $(LBXEXT) $(SITEEXTS)
 #else
-     EXTENSIONS = $(OTHEREXTS) $(GLXEXT) $(RANDRLIB) $(RENDERLIB)
+     EXTENSIONS = $(OTHEREXTS) $(GLXEXT) $(RANDRLIB) $(RENDERLIB) $(XSTLIB)
       OTHEREXTS = Xext/LibraryTargetName(ext) $(XKBEXT) $(XINPUTEXT) \
                   $(LBXEXT) $(DBEEXT) $(RECORDEXT) $(SITEEXTS) $(XTRAPEXT)
@@ -184,5 +188,5 @@
         EXTDIRS = Xext $(XKBDIR) $(XIDIR) $(GLXDIR) \
                   $(LBXDIRS) $(DBEDIR) $(RECORDDIR) $(SITEEXTDIRS) \
-                  $(RANDRDIR) $(RENDERDIR) $(XTRAPDIR)
+                  $(RANDRDIR) $(RENDERDIR) $(XTRAPDIR) $(XSTDIR)
 #if BuildLBX || GzipFontCompression
            ZLIB = GzipLibrary