source: trunk/third/wcl/ESIX @ 8837

Revision 8837, 4.0 KB checked in by ghudson, 28 years ago (diff)
This commit was generated by cvs2svn to compensate for changes in r8836, which included commits to RCS files with non-trunk default branches.
Line 
1From ddc@druwa.att.com Tue Dec 22 18:14:29 1992
2Received: by breslau.ap.mchp.sni.de;
3        Tue, 22 Dec 92 18:14:27 +0100
4Received: from thoth.mchp.sni.de by horus with SMTP id AA04666
5  (5.65c/IDA-1.4.4 for <David.Smyth@ap.mchp.sni.de>); Tue, 22 Dec 1992 18:02:11 +0100
6Received: from att.att.com ([192.20.239.131]) by thoth.mchp.sni.de with SMTP id AA27883
7  (5.65c/IDA-1.4.4 for <David.Smyth@ap.mchp.sni.de>); Tue, 22 Dec 1992 17:48:06 +0100
8Message-Id: <199212221648.AA27883@thoth.mchp.sni.de>
9From: ddc@druwa.att.com
10Date: Tue, 22 Dec 92 09:41 MST
11To: David.Smyth@ap.mchp.sni.de, ddc@druwa
12Status: OR
13
14To: David.Smyth@ap.mchp.sni.de me
15
16Subject: Wcl ESIX R4.0.4 context diffs
17
18Attached are the context diff files.  Aparently ESIX Imake stuff is buggy.
19Instead of trying to fix the files in /usr/lib/X11/config (I know nothing
20about Imake) I manually edited the Makefiles in Mri, Wc, and Xmp.
21
22========================================================================
23cd Mri
24========================================================================
25*** MakefileO   Tue Dec  8 08:25:24 1992
26--- Makefile    Tue Dec  8 08:48:48 1992
27***************
28*** 382,388 ****
29 
30  all:: $(CLIENT)
31 
32! $(CLIENT): $(OBJS) $(DEPLIBS)
33        $(RM) $@; if [ -f $@ ]; then $(MV) $@ $@~; fi
34        $(CC) -o $@ $(OBJS) $(LDOPTIONS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS)
35        strip $@
36--- 382,388 ----
37 
38  all:: $(CLIENT)
39 
40! $(CLIENT): $(OBJS)
41        $(RM) $@; if [ -f $@ ]; then $(MV) $@ $@~; fi
42        $(CC) -o $@ $(OBJS) $(LDOPTIONS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS)
43        strip $@
44***************
45*** 472,478 ****
46        $(RM) $@
47        $(CC) -c $(CFLAGS) $(DEBUG_CLIENT_OPTIONS) $*.c
48 
49! Test: Test.o $(DEPLIBS)
50        $(RM) $@; if [ -f $@ ]; then $(MV) $@ $@~; fi
51        $(CC) -o $@ Test.o $(LDOPTIONS) $(DEBUG_LIBRARIES) $(LDLIBS)  $(EXTRA_LOAD_FLAGS)
52        strip $@
53--- 472,478 ----
54        $(RM) $@
55        $(CC) -c $(CFLAGS) $(DEBUG_CLIENT_OPTIONS) $*.c
56 
57! Test: Test.o
58        $(RM) $@; if [ -f $@ ]; then $(MV) $@ $@~; fi
59        $(CC) -o $@ Test.o $(LDOPTIONS) $(DEBUG_LIBRARIES) $(LDLIBS)  $(EXTRA_LOAD_FLAGS)
60        strip $@
61========================================================================
62cd Wc
63========================================================================
64*** MakefileO   Tue Dec  8 08:22:53 1992
65--- Makefile    Tue Dec  8 08:07:44 1992
66***************
67*** 423,429 ****
68        -@if [ -d debugger ]; then echo "       $(RM) debugger/?*.o"; \
69        $(RM) debugger/?*.o; else exit 0; fi
70 
71! all:: lib$(LIBRARY_NAME).so.$(SOWCREV)
72 
73  lib$(LIBRARY_NAME).so.$(SOWCREV): $(OBJS)
74        $(RM) $@~
75--- 423,429 ----
76        -@if [ -d debugger ]; then echo "       $(RM) debugger/?*.o"; \
77        $(RM) debugger/?*.o; else exit 0; fi
78 
79! all:: lib$(LIBRARY_NAME).so.$(SOWCREV) lib$(LIBRARY_NAME).so
80 
81  lib$(LIBRARY_NAME).so.$(SOWCREV): $(OBJS)
82        $(RM) $@~
83***************
84*** 430,435 ****
85--- 430,438 ----
86        (cd shared; $(LD) -G -o ../$@~ $(OBJS))
87        $(RM) $@
88        $(MV) $@~ $@
89+
90+ lib$(LIBRARY_NAME).so:        lib$(LIBRARY_NAME).so.$(SOWCREV)
91+       $(CP) lib$(LIBRARY_NAME).so.$(SOWCREV) $@
92       
93  clean::
94        $(RM) lib$(LIBRARY_NAME).so.$(SOWCREV)
95========================================================================
96cd Xmp
97========================================================================
98*** MakefileO   Tue Dec  8 08:22:05 1992
99--- Makefile    Tue Dec  8 07:32:40 1992
100***************
101*** 379,385 ****
102        -@if [ -d debugger ]; then echo "       $(RM) debugger/?*.o"; \
103        $(RM) debugger/?*.o; else exit 0; fi
104 
105! all:: lib$(LIBRARY_NAME).so.$(SOWCREV)
106 
107  lib$(LIBRARY_NAME).so.$(SOWCREV): $(OBJS)
108        $(RM) $@~
109--- 379,385 ----
110        -@if [ -d debugger ]; then echo "       $(RM) debugger/?*.o"; \
111        $(RM) debugger/?*.o; else exit 0; fi
112 
113! all:: lib$(LIBRARY_NAME).so.$(SOWCREV) lib$(LIBRARY_NAME).so
114 
115  lib$(LIBRARY_NAME).so.$(SOWCREV): $(OBJS)
116        $(RM) $@~
117***************
118*** 386,391 ****
119--- 386,394 ----
120        (cd shared; $(LD) -G -o ../$@~ $(OBJS))
121        $(RM) $@
122        $(MV) $@~ $@
123+
124+ lib$(LIBRARY_NAME).so:        lib$(LIBRARY_NAME).so.$(SOWCREV)
125+       $(CP) lib$(LIBRARY_NAME).so.$(SOWCREV) $@
126 
127  clean::
128        $(RM) lib$(LIBRARY_NAME).so.$(SOWCREV)
129
Note: See TracBrowser for help on using the repository browser.