*** xlib/makefile.orig	Mon Mar  1 09:24:36 1993
--- xlib/makefile	Fri Dec 30 17:08:43 1994
***************
*** 1,5 ****
  .SUFFIXES:
! .SUFFIXES: .sc .cdecl .o .c
  
  CDECL = ../cdecl/cdecl
  SIZEOF = ../cdecl/sizeof
--- 1,5 ----
  .SUFFIXES:
! .SUFFIXES: .sc .cdecl .o .c .so
  
  CDECL = ../cdecl/cdecl
  SIZEOF = ../cdecl/sizeof
***************
*** 58,63 ****
--- 58,73 ----
  	xvisualinfo.o xwindowattributes.o xwindowchanges.o xwmhints.o \
  	xpixmapformatvalues.o xtextproperty.o
  
+ sxdo =  depth.so screen.so visual.so xarc.so xchar2b.so xcharstruct.so \
+         xclasshint.so xcomposestatus.so xcolor.so xlibCONSTANTS.so xevent.so \
+         xfontprop.so xfontstruct.so xgcvalues.so xhostaddress.so xiconsize.so \
+         ximage.so xkeyboardcontrol.so xkeyboardstate.so xmodifierkeymap.so \
+         xpoint.so xrectangle.so xrmoptiondescrec.so xrmvalue.so xsegment.so \
+         xsetwindowattributes.so xsizehints.so xstandardcolormap.so \
+         xlibSTUBS.so xtextitem.so xtextitem16.so xtimecoord.so xlibTYPES.so \
+         xvisualinfo.so xwindowattributes.so xwindowchanges.so xwmhints.so \
+         xpixmapformatvalues.so xtextproperty.so
+ 
  xdpsc = xws2.sc xws3.sc xws4.sc xws5.sc xws6.sc xws7.sc \
  	xws8.sc xws9.sc xws10.sc xwsr4.sc
  
***************
*** 76,81 ****
--- 86,95 ----
  xwso = xwss.o xws2.o xws3.o xws4.o xws5.o xws6.o xws7.o xws8.o xws9.o xws10.o \
         xlib.o xwsr4.o
  
+ sxwso = xwss.so xws2.so xws3.so xws4.so xws5.so xws6.so xws7.so xws8.so \
+ 	xws9.so xws10.so xlib.so xwsr4.so
+ 
+ 
  sizeof.cdecl:
  	${SIZEOF} > sizeof.cdecl
  
***************
*** 101,114 ****
  .c.o:
  	${SCC}  -c ${XLIBCFLAGS} $*.c
  
  scixl:	xlibTYPES.o ${xwssc} ${xwsc} ${xwso}
  	${SCC} -o scixl -i -m xlib ${xwso} ${xdo} ${XLIB}
  	
  scxl.a:	xlibTYPES.o ${xwssc} ${xwsc} ${xwso}	
  	rm -f scxl.a
! 	ar q scxl.a ${xdo} ${xwso}
  	${RANLIB} scxl.a
  
  clear:
  	${SCC} -o clear clear.sc scxl.a ${XLIB}
  
--- 115,152 ----
  .c.o:
  	${SCC}  -c ${XLIBCFLAGS} $*.c
  
+ .c.so:  
+ 	${CC} ${PICFLAGS} ${CFLAGS} -c ${XLIBCFLAGS} -I../scrt ${.IMPSRC} -o ${.TARGET}
+ 
  scixl:	xlibTYPES.o ${xwssc} ${xwsc} ${xwso}
  	${SCC} -o scixl -i -m xlib ${xwso} ${xdo} ${XLIB}
  	
  scxl.a:	xlibTYPES.o ${xwssc} ${xwsc} ${xwso}	
  	rm -f scxl.a
! 	mv -f xmodifierkeymap.o xmodifier.o
! 	mv -f xstandardcolormap.o xstandard.o
! 	mv -f xwindowattributes.o xwindowatt.o
! 	mv -f xpixmapformatvalues.o xpixmap.o
! 	ar q scxl.a depth.o screen.o visual.o xarc.o xchar2b.o xcharstruct.o \
! 	xclasshint.o xcomposestatus.o xcolor.o xlibCONSTANTS.o xevent.o \
! 	xfontprop.o xfontstruct.o xgcvalues.o xhostaddress.o xiconsize.o \
! 	ximage.o xkeyboardcontrol.o xkeyboardstate.o xmodifier.o \
! 	xpoint.o xrectangle.o xrmoptiondescrec.o xrmvalue.o xsegment.o \
! 	xsetwindowattributes.o xsizehints.o xstandard.o \
! 	xlibSTUBS.o xtextitem.o xtextitem16.o xtimecoord.o xlibTYPES.o \
! 	xvisualinfo.o xwindowatt.o xwindowchanges.o xwmhints.o \
! 	xpixmap.o xtextproperty.o \
! 	xwss.o xws2.o xws3.o xws4.o xws5.o xws6.o xws7.o xws8.o \
! 	xws9.o xws10.o xlib.o xwsr4.o 
  	${RANLIB} scxl.a
  
+ Xlibscxl.so.1.0: xlibTYPES.so ${xwssc} ${xwsc} ${xwso} ${sxdo} ${sxwso}
+ 	rm -f libscxl.so.1.0
+ 	ld -Bshareable -Bforcearchive -o libscxl.so.1.0 ${sxdo} ${sxwso}
+ 
+ libscxl.so.1.0:
+ 	make Xlibscxl.so.1.0
+ 
  clear:
  	${SCC} -o clear clear.sc scxl.a ${XLIB}
  
***************
*** 132,138 ****
  		puzzle.c npuzzle.c
  
  all:
! 	make scixl scxl.a
  
  gensource:
  	make ${xwssc} ${xwsc}
--- 170,182 ----
  		puzzle.c npuzzle.c
  
  all:
! 	make scixl scxl.a libscxl.so.1.0
! 
! install:	
! 	cp scxl.a ${LIBDIR}/schemetoc/scxl.a
! 	${RANLIB} ${LIBDIR}/schemetoc/scxl.a
! 	cp scixl ${BINDIR}/scixl
! 	cp libscxl.so.1.0 ${LIBDIR}
  
  gensource:
  	make ${xwssc} ${xwsc}