From ddc@druwa.att.com Tue Dec 22 18:14:29 1992
Received: by breslau.ap.mchp.sni.de;
	Tue, 22 Dec 92 18:14:27 +0100
Received: from thoth.mchp.sni.de by horus with SMTP id AA04666
  (5.65c/IDA-1.4.4 for <David.Smyth@ap.mchp.sni.de>); Tue, 22 Dec 1992 18:02:11 +0100
Received: from att.att.com ([192.20.239.131]) by thoth.mchp.sni.de with SMTP id AA27883
  (5.65c/IDA-1.4.4 for <David.Smyth@ap.mchp.sni.de>); Tue, 22 Dec 1992 17:48:06 +0100
Message-Id: <199212221648.AA27883@thoth.mchp.sni.de>
From: ddc@druwa.att.com
Date: Tue, 22 Dec 92 09:41 MST
To: David.Smyth@ap.mchp.sni.de, ddc@druwa
Status: OR

To: David.Smyth@ap.mchp.sni.de me

Subject: Wcl ESIX R4.0.4 context diffs

Attached are the context diff files.  Aparently ESIX Imake stuff is buggy.
Instead of trying to fix the files in /usr/lib/X11/config (I know nothing
about Imake) I manually edited the Makefiles in Mri, Wc, and Xmp.

========================================================================
cd Mri
========================================================================
*** MakefileO	Tue Dec  8 08:25:24 1992
--- Makefile	Tue Dec  8 08:48:48 1992
***************
*** 382,388 ****
  
  all:: $(CLIENT)
  
! $(CLIENT): $(OBJS) $(DEPLIBS)
  	$(RM) $@; if [ -f $@ ]; then $(MV) $@ $@~; fi
  	$(CC) -o $@ $(OBJS) $(LDOPTIONS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS)
  	strip $@
--- 382,388 ----
  
  all:: $(CLIENT)
  
! $(CLIENT): $(OBJS)
  	$(RM) $@; if [ -f $@ ]; then $(MV) $@ $@~; fi
  	$(CC) -o $@ $(OBJS) $(LDOPTIONS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS)
  	strip $@
***************
*** 472,478 ****
  	$(RM) $@
  	$(CC) -c $(CFLAGS) $(DEBUG_CLIENT_OPTIONS) $*.c
  
! Test: Test.o $(DEPLIBS)
  	$(RM) $@; if [ -f $@ ]; then $(MV) $@ $@~; fi
  	$(CC) -o $@ Test.o $(LDOPTIONS) $(DEBUG_LIBRARIES) $(LDLIBS)  $(EXTRA_LOAD_FLAGS)
  	strip $@
--- 472,478 ----
  	$(RM) $@
  	$(CC) -c $(CFLAGS) $(DEBUG_CLIENT_OPTIONS) $*.c
  
! Test: Test.o
  	$(RM) $@; if [ -f $@ ]; then $(MV) $@ $@~; fi
  	$(CC) -o $@ Test.o $(LDOPTIONS) $(DEBUG_LIBRARIES) $(LDLIBS)  $(EXTRA_LOAD_FLAGS)
  	strip $@
========================================================================
cd Wc
========================================================================
*** MakefileO	Tue Dec  8 08:22:53 1992
--- Makefile	Tue Dec  8 08:07:44 1992
***************
*** 423,429 ****
  	-@if [ -d debugger ]; then echo "	$(RM) debugger/?*.o"; \
  	$(RM) debugger/?*.o; else exit 0; fi
  
! all:: lib$(LIBRARY_NAME).so.$(SOWCREV)
  
  lib$(LIBRARY_NAME).so.$(SOWCREV): $(OBJS)
  	$(RM) $@~
--- 423,429 ----
  	-@if [ -d debugger ]; then echo "	$(RM) debugger/?*.o"; \
  	$(RM) debugger/?*.o; else exit 0; fi
  
! all:: lib$(LIBRARY_NAME).so.$(SOWCREV) lib$(LIBRARY_NAME).so
  
  lib$(LIBRARY_NAME).so.$(SOWCREV): $(OBJS)
  	$(RM) $@~
***************
*** 430,435 ****
--- 430,438 ----
  	(cd shared; $(LD) -G -o ../$@~ $(OBJS))
  	$(RM) $@
  	$(MV) $@~ $@
+ 
+ lib$(LIBRARY_NAME).so: 	lib$(LIBRARY_NAME).so.$(SOWCREV)
+ 	$(CP) lib$(LIBRARY_NAME).so.$(SOWCREV) $@
  	
  clean::
  	$(RM) lib$(LIBRARY_NAME).so.$(SOWCREV)
========================================================================
cd Xmp
========================================================================
*** MakefileO	Tue Dec  8 08:22:05 1992
--- Makefile	Tue Dec  8 07:32:40 1992
***************
*** 379,385 ****
  	-@if [ -d debugger ]; then echo "	$(RM) debugger/?*.o"; \
  	$(RM) debugger/?*.o; else exit 0; fi
  
! all:: lib$(LIBRARY_NAME).so.$(SOWCREV)
  
  lib$(LIBRARY_NAME).so.$(SOWCREV): $(OBJS)
  	$(RM) $@~
--- 379,385 ----
  	-@if [ -d debugger ]; then echo "	$(RM) debugger/?*.o"; \
  	$(RM) debugger/?*.o; else exit 0; fi
  
! all:: lib$(LIBRARY_NAME).so.$(SOWCREV) lib$(LIBRARY_NAME).so
  
  lib$(LIBRARY_NAME).so.$(SOWCREV): $(OBJS)
  	$(RM) $@~
***************
*** 386,391 ****
--- 386,394 ----
  	(cd shared; $(LD) -G -o ../$@~ $(OBJS))
  	$(RM) $@
  	$(MV) $@~ $@
+ 
+ lib$(LIBRARY_NAME).so: 	lib$(LIBRARY_NAME).so.$(SOWCREV)
+ 	$(CP) lib$(LIBRARY_NAME).so.$(SOWCREV) $@
  
  clean::
  	$(RM) lib$(LIBRARY_NAME).so.$(SOWCREV)

