Skip to content
Snippets Groups Projects
Commit 915e7b8c authored by duane's avatar duane
Browse files

see 4.3.2.pre-alpha.114 changelog entry for Thu Oct 17 06:43:30 1996

parent e11bee60
No related branches found
No related tags found
No related merge requests found
*******************************************************************************
4.3.2.pre-alpha.114
Thu Oct 17 06:43:30 1996 Duane Rettig <duane@beta>
* Makefile.cobjs:
* Makefile.generic:
* Makefile.cobjs: Add shared-lib support for HP
* tk/resources.lisp: Work around SGI Motif bug (per smh spr15174)
******************************************************************************* *******************************************************************************
Tue Jul 23 14:29:37 PDT 1996 Colin Meldrum (colin@vapor) Tue Jul 23 14:29:37 PDT 1996 Colin Meldrum (colin@vapor)
......
...@@ -58,12 +58,24 @@ climxm.so: xlibsupport.o xtsupport.o xmsupport.o ...@@ -58,12 +58,24 @@ climxm.so: xlibsupport.o xtsupport.o xmsupport.o
xlibsupport.o xtsupport.o xmsupport.o \ xlibsupport.o xtsupport.o xmsupport.o \
$(IMPORTS) $(TKLIB) $(XTLIB) $(XLIB) $(MOTIFXTRAS)) $(IMPORTS) $(TKLIB) $(XTLIB) $(XLIB) $(MOTIFXTRAS))
climxm.sl: xlibsupport.o xtsupport.o xmsupport.o
(eval '$(SET_LIBRARY_PATH)' ; \
$(MAKE_SHARED) $(SHAREFLAGS) -o climxm.sl \
xlibsupport.o xtsupport.o xmsupport.o \
$(IMPORTS) $(TKLIB) $(XTLIB) $(XLIB) $(MOTIFXTRAS))
climol.so: xlibsupport.o xtsupport.o olsupport.o climol.so: xlibsupport.o xtsupport.o olsupport.o
(eval '$(SET_LIBRARY_PATH)' ; \ (eval '$(SET_LIBRARY_PATH)' ; \
$(MAKE_SHARED) $(SHAREFLAGS) -o climol.so \ $(MAKE_SHARED) $(SHAREFLAGS) -o climol.so \
xlibsupport.o xtsupport.o olsupport.o \ xlibsupport.o xtsupport.o olsupport.o \
$(IMPORTS) $(TKLIB) $(XTLIB) $(XLIB)) $(IMPORTS) $(TKLIB) $(XTLIB) $(XLIB))
climol.sl: xlibsupport.o xtsupport.o olsupport.o
(eval '$(SET_LIBRARY_PATH)' ; \
$(MAKE_SHARED) $(SHAREFLAGS) -o climol.sl \
xlibsupport.o xtsupport.o olsupport.o \
$(IMPORTS) $(TKLIB) $(XTLIB) $(XLIB))
# mainxm.o contains foreign code from the libraries X11,Xt and Xm # mainxm.o contains foreign code from the libraries X11,Xt and Xm
# required by Motif version of CLIM statically linked # required by Motif version of CLIM statically linked
......
...@@ -198,7 +198,7 @@ cleanobjs: ...@@ -198,7 +198,7 @@ cleanobjs:
clean: clean:
find . -name '*.fasl' -print | xargs rm -f find . -name '*.fasl' -print | xargs rm -f
rm -f *.o *.so *.a slim slim.ol \ rm -f *.o *.so *.sl *.a slim slim.ol \
stub-motif.c stub-olit.c stub-xt.c stub-x.c stub-wnn.c stub-motif.c stub-olit.c stub-xt.c stub-x.c stub-wnn.c
rm -f *.z *.Z *.gz *.ilt *.out rm -f *.z *.Z *.gz *.ilt *.out
......
...@@ -14,10 +14,14 @@ CFLAGS= -O -D_NO_PROTO -DSTRINGS_ALIGNED -DNO_REGEX -DNO_ISDIR \ ...@@ -14,10 +14,14 @@ CFLAGS= -O -D_NO_PROTO -DSTRINGS_ALIGNED -DNO_REGEX -DNO_ISDIR \
STD_DEFINES = -DSYSV STD_DEFINES = -DSYSV
AR = ar clq AR = ar clq
TKLIB=/usr/lib/Motif1.2/libXm.a TKLIB=-lXm
XTLIB=/usr/lib/X11R5/libXt.a XTLIB=-lXt
XLIB=/usr/lib/X11R5/libX11.a XLIB=-lX11
XINCLUDES= -I/usr/include/Motif1.2 -I/usr/include/X11R5 XINCLUDES= -I/usr/include/Motif1.2 -I/usr/include/X11R5
PICFLAGS = +z
SHAREFLAGS = -b
MAKE_SHARED = ld
include Makefile.generic include Makefile.generic
...@@ -392,7 +392,11 @@ ...@@ -392,7 +392,11 @@
(int nil) (int nil)
(short nil) (short nil)
(function nil) (function nil)
(top-item-position nil) ;; SGI has a bug or oddity in it Motif. The top-item-position
;; resource on a XmList returns a null type. It is an integer
;; doesn't need any conversion, so this papers over the issue.
;; spr15174
(|| nil)
(t t))) (t t)))
(defmethod resource-type-set-conversion-p (type) (defmethod resource-type-set-conversion-p (type)
...@@ -415,7 +419,7 @@ ...@@ -415,7 +419,7 @@
(short nil) (short nil)
(int nil) (int nil)
(function nil) (function nil)
(top-item-position nil) (|| nil) ; spr15174 see above
(t t))) (t t)))
(defmethod resource-type-get-memref-type (type) (defmethod resource-type-get-memref-type (type)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment