#92403# remove Xt/Xm/Xaw/Xmu from office

13 files changed, 43 insertions, 43 deletions

diff --git a/solenv/inc/unxbsdi.mk b/solenv/inc/unxbsdi.mk
index d6f4239d0fde..f2fd6ff48fe7 100644
--- a/solenv/inc/unxbsdi.mk
+++ b/solenv/inc/unxbsdi.mk
@@ -52,7 +52,7 @@ LINKFLAGSDEBUG=
 LINKFLAGSOPT=
 
 _SYSLIBS= -lpthread -lgcc -lc -lm 
-_X11LIBS= -L/usr/X11R6/lib -lXext -lXt -lX11
+_X11LIBS= -L/usr/X11R6/lib -lXext -lX11
 
 STDLIBCPP= -lstdc++
 
diff --git a/solenv/inc/unxbsds.mk b/solenv/inc/unxbsds.mk
index bf72fd443021..57e5c3e21daf 100644
--- a/solenv/inc/unxbsds.mk
+++ b/solenv/inc/unxbsds.mk
@@ -3,9 +3,9 @@
 #
 #   $RCSfile: unxbsds.mk,v $
 #
-#   $Revision: 1.4 $
+#   $Revision: 1.5 $
 #
-#   last change: $Author: hr $ $Date: 2001-05-02 15:05:51 $
+#   last change: $Author: pl $ $Date: 2001-10-24 17:21:47 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -168,11 +168,11 @@ STDSLOCUI=
 
 # libraries for linking applications
 STDLIBCUIST=-lm
-STDLIBGUIMT=-lXaw -lXt -lX11 -lpthread -lm
+STDLIBGUIMT=-lX11 -lpthread -lm
 STDLIBCUIMT=-lpthread -lm
-STDLIBGUIST=-lXaw -lXt -lX11 -lm
+STDLIBGUIST=-lX11 -lm
 # libraries for linking shared libraries
-STDSHLGUIMT=-lXaw -lXt -lX11 -lXext -lpthread -lm
+STDSHLGUIMT=-lX11 -lXext -lpthread -lm
 STDSHLCUIMT=-lpthread -lm
 
 # STLport always needs pthread. This may yield some redundant -lpthread
diff --git a/solenv/inc/unxfbsdi.mk b/solenv/inc/unxfbsdi.mk
index 29c0d0ab3718..1c40b2230cb2 100644
--- a/solenv/inc/unxfbsdi.mk
+++ b/solenv/inc/unxfbsdi.mk
@@ -61,7 +61,7 @@ LINKVERSIONMAPFLAG=-Wl,--version-script
 STDLIBCPP=-lstdc++
 
 # _SYSLIBS= -L/usr/lib -lm
-# _X11LIBS= -L/usr/X11R6/lib -lXext -lXt -lX11
+# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11
 # _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib
 
 STDOBJGUI=
@@ -70,10 +70,10 @@ STDOBJCUI=
 STDSLOCUI=
 
 STDLIBCUIST=-lm
-STDLIBGUIST==-lXaw -lXt -lX11 -lm
-STDLIBGUIMT=-pthread -lm -lstlport_gcc
+STDLIBGUIST=-lX11 -lm
+STDLIBGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc
 STDLIBCUIMT=-pthread -lm -lstlport_gcc
-STDSHLGUIMT=-lXaw -lXt -lX11 -lXext -pthread -lm -lstlport_gcc
+STDSHLGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc
 STDSHLCUIMT=-pthread -lm -lstlport_gcc
 
 LIBMGR=			ar
diff --git a/solenv/inc/unxhpgr.mk b/solenv/inc/unxhpgr.mk
index 86783ed36dc6..4b8f64a21efa 100644
--- a/solenv/inc/unxhpgr.mk
+++ b/solenv/inc/unxhpgr.mk
@@ -61,12 +61,12 @@ STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
 STDSLOCUI=
-STDLIBGUIST= -lX11 -lXt -lXmu -lXext -lsec -lcxx -ldld -lm
+STDLIBGUIST= -lX11 -lXext -lsec -lcxx -ldld -lm
 STDLIBCUIST= -lsec -lcxx -ldld -lm
-#STDLIBGUIMT= -lX11 -lXt -lXmu -lXext -lcma -lsec -lcxx -ldld -lc_r -lm
-STDLIBGUIMT= -lX11 -lXt -lXmu -lXext -ldce
+#STDLIBGUIMT= -lX11 -lXext -lcma -lsec -lcxx -ldld -lc_r -lm
+STDLIBGUIMT= -lX11 -lXext -ldce
 STDLIBCUIMT= -lc_r -lgcc -ldce
-#STDSHLGUIMT= -lX11 -lXt -lXmu -lXext -lcma -lsec -lcxx -ldld -lc_r
+#STDSHLGUIMT= -lX11 -lXext -lcma -lsec -lcxx -ldld -lc_r
 STDSHLGUIMT= -lcma -lsec -ldld -lc_r
 STDSHLCUIMT=
 # -L/opt/dce/lib -ldce -lsec -lcxx
diff --git a/solenv/inc/unxhpxr.mk b/solenv/inc/unxhpxr.mk
index 41467137939c..3742ba1d75c9 100644
--- a/solenv/inc/unxhpxr.mk
+++ b/solenv/inc/unxhpxr.mk
@@ -56,12 +56,12 @@ STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
 STDSLOCUI=
-STDLIBGUIST= -lX11 -lXt -lXmu -lXext -lsec -lcxx -ldld -lm
+STDLIBGUIST= -lX11 -lXext -lsec -lcxx -ldld -lm
 STDLIBCUIST= -lsec -lcxx -ldld -lm
-#STDLIBGUIMT= -lX11 -lXt -lXmu -lXext -lcma -lsec -lcxx -ldld -lc_r -lm
-STDLIBGUIMT= -lX11 -lXt -lXmu -lXext -lpthread
+#STDLIBGUIMT= -lX11 -lXext -lcma -lsec -lcxx -ldld -lc_r -lm
+STDLIBGUIMT= -lX11 -lXext -lpthread
 STDLIBCUIMT= -lcma
-#STDSHLGUIMT= -lX11 -lXt -lXmu -lXext -lcma -lsec -lcxx -ldld -lc_r
+#STDSHLGUIMT= -lX11 -lXext -lcma -lsec -lcxx -ldld -lc_r
 STDSHLCUIMT=
 # -L/opt/dce/lib -ldce -lsec -lcxx
 
diff --git a/solenv/inc/unxirgm.mk b/solenv/inc/unxirgm.mk
index 10221fae6169..03abe265d977 100644
--- a/solenv/inc/unxirgm.mk
+++ b/solenv/inc/unxirgm.mk
@@ -68,13 +68,13 @@ STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
 STDSLOCUI=
-# STDLIBGUIST=	$(DYNAMIC) -lXt -lXmu -lX11 -lc -lm
+# STDLIBGUIST=	$(DYNAMIC) -lX11 -lc -lm
 STDLIBGUIST=	$(DYNAMIC) -lX11 -lc -lm
 STDLIBCUIST=	$(DYNAMIC) -lc -lm
-# STDLIBGUIMT=	$(THREADLIB) $(DYNAMIC) -lXt -lXmu -lX11 -lc -lm
+# STDLIBGUIMT=	$(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
 STDLIBGUIMT=	$(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
 STDLIBCUIMT=	$(THREADLIB) $(DYNAMIC) -lc -lm
-# STDSHLGUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lXt -lXmu -lX11 -lc -lm
+# STDSHLGUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
 STDSHLGUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
 STDSHLCUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lc -lm
 THREADLIB=		-lpthread
diff --git a/solenv/inc/unxirxm.mk b/solenv/inc/unxirxm.mk
index b585a156be31..16398e5b2e29 100644
--- a/solenv/inc/unxirxm.mk
+++ b/solenv/inc/unxirxm.mk
@@ -76,13 +76,13 @@ STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
 STDSLOCUI=
-# STDLIBGUIST=	$(DYNAMIC) -lXt -lXmu -lX11 -lc -lm
+# STDLIBGUIST=	$(DYNAMIC) -lX11 -lc -lm
 STDLIBGUIST=	$(DYNAMIC) -lX11 -lc -lm
 STDLIBCUIST=	$(DYNAMIC) -lc -lm
-# STDLIBGUIMT=	$(THREADLIB) $(DYNAMIC) -lXt -lXmu -lX11 -lc -lm
+# STDLIBGUIMT=	$(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
 STDLIBGUIMT=	$(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
 STDLIBCUIMT=	$(THREADLIB) $(DYNAMIC) -lc -lm
-# STDSHLGUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lXt -lXmu -lX11 -lc -lm
+# STDSHLGUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
 STDSHLGUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
 STDSHLCUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lc -lm
 THREADLIB=		-lpthread
diff --git a/solenv/inc/unxirxm3.mk b/solenv/inc/unxirxm3.mk
index b741db76cbda..92c70028acd9 100644
--- a/solenv/inc/unxirxm3.mk
+++ b/solenv/inc/unxirxm3.mk
@@ -78,13 +78,13 @@ STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
 STDSLOCUI=
-# STDLIBGUIST=	$(DYNAMIC) -lXt -lXmu -lX11 -lc -lm
+# STDLIBGUIST=	$(DYNAMIC) -lX11 -lc -lm
 STDLIBGUIST=	$(DYNAMIC) -lX11 -lc -lm
 STDLIBCUIST=	$(DYNAMIC) -lc -lm
-# STDLIBGUIMT=	$(THREADLIB) $(DYNAMIC) -lXt -lXmu -lX11 -lc -lm
+# STDLIBGUIMT=	$(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
 STDLIBGUIMT=	$(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
 STDLIBCUIMT=	$(THREADLIB) $(DYNAMIC) -lc -lm
-# STDSHLGUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lXt -lXmu -lX11 -lc -lm
+# STDSHLGUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
 STDSHLGUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
 STDSHLCUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lc -lm
 THREADLIB=		-lpthread
diff --git a/solenv/inc/unxlngi4.mk b/solenv/inc/unxlngi4.mk
index a45e914e8ffd..7dd0f7e5200b 100644
--- a/solenv/inc/unxlngi4.mk
+++ b/solenv/inc/unxlngi4.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: unxlngi4.mk,v $
 #
-#   $Revision: 1.6 $
+#   $Revision: 1.7 $
 #
-#   last change: $Author: hr $ $Date: 2001-10-23 11:09:18 $
+#   last change: $Author: pl $ $Date: 2001-10-24 17:21:47 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -178,11 +178,11 @@ STDSLOCUI=
 
 # libraries for linking applications
 STDLIBCUIST=-ldl -lm
-STDLIBGUIMT=-lXaw -lXt -lX11 -ldl -lpthread -lm
+STDLIBGUIMT=-lX11 -ldl -lpthread -lm
 STDLIBCUIMT=-ldl -lpthread -lm
-STDLIBGUIST=-lXaw -lXt -lX11 -ldl -lm
+STDLIBGUIST=-lX11 -ldl -lm
 # libraries for linking shared libraries
-STDSHLGUIMT=-lXaw -lXt -lX11 -lXext -ldl -lpthread -lm
+STDSHLGUIMT=-lX11 -lXext -ldl -lpthread -lm
 STDSHLCUIMT=-ldl -lpthread -lm
 
 LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++
diff --git a/solenv/inc/unxlngppc.mk b/solenv/inc/unxlngppc.mk
index 7b0b0fe1c46d..aec20b8bf1c9 100644
--- a/solenv/inc/unxlngppc.mk
+++ b/solenv/inc/unxlngppc.mk
@@ -120,11 +120,11 @@ STDSLOCUI=
 
 # libraries for linking applications
 STDLIBCUIST=-ldl -lm
-STDLIBGUIMT=-lXaw -lXt -lX11 -ldl -lpthread -lm
+STDLIBGUIMT=-lX11 -ldl -lpthread -lm
 STDLIBCUIMT=-ldl -lpthread -lm
-STDLIBGUIST=-lXaw -lXt -lX11 -ldl -lm
+STDLIBGUIST=-lX11 -ldl -lm
 # libraries for linking shared libraries 
-STDSHLGUIMT=-lXaw -lXt -lX11 -lXext -ldl -lpthread -lm
+STDSHLGUIMT=-lX11 -lXext -ldl -lpthread -lm
 STDSHLCUIMT=-ldl -lpthread -lm
 
 LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
diff --git a/solenv/inc/unxlngr.mk b/solenv/inc/unxlngr.mk
index 79def300e438..c33d1dbf67c9 100644
--- a/solenv/inc/unxlngr.mk
+++ b/solenv/inc/unxlngr.mk
@@ -126,9 +126,9 @@ STDSLOCUI=
 STDLIBCUIST=-ldl -lm -lstlport_gcc
 STDLIBGUIMT=-ldl -lpthread -lm -lstlport_gcc
 STDLIBCUIMT=-ldl -lpthread -lm -lstlport_gcc
-STDLIBGUIST=-lXaw -lXt -lX11 -ldl -lm
+STDLIBGUIST=-lX11 -ldl -lm
 # libraries for linking shared libraries
-STDSHLGUIMT=-lXaw -lXt -lX11 -lXext -ldl -lpthread -lm -lstlport_gcc
+STDSHLGUIMT=-lX11 -lXext -ldl -lpthread -lm -lstlport_gcc
 STDSHLCUIMT=-ldl -lpthread -lm -lstlport_gcc
 
 # name of library manager
diff --git a/solenv/inc/unxscoi.mk b/solenv/inc/unxscoi.mk
index c66b5a1d9bd8..e23ad96e8b5c 100644
--- a/solenv/inc/unxscoi.mk
+++ b/solenv/inc/unxscoi.mk
@@ -63,16 +63,16 @@ STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
 STDSLOCUI=
-STDLIBGUIST=-lXt -lXext -lXmu -lX11 -ldl -lsocket -lm
+STDLIBGUIST=-lXext -lX11 -ldl -lsocket -lm
 STDLIBCUIST=-ldl -lsocket -lm
 .IF "$(PRJNAME)"=="rsc"
-STDLIBGUIMT=-lXt -lXext -lXmu -lX11 $(STATIC) -lpthread $(DYNAMIC) -ldl -lsocket -lm
+STDLIBGUIMT=-lXext -lX11 $(STATIC) -lpthread $(DYNAMIC) -ldl -lsocket -lm
 STDLIBCUIMT=$(STATIC) -lpthread $(DYNAMIC) -ldl -lsocket -lm 
 .ELSE
-STDLIBGUIMT=-lXt -lXext -lXmu -lX11 -lpthread -ldl -lsocket -lm
+STDLIBGUIMT=-lXext -lX11 -lpthread -ldl -lsocket -lm
 STDLIBCUIMT=-lpthread -ldl -lsocket -lm 
 .ENDIF
-#STDSHLGUIMT=-lXt -lXext -lXmu -lX11 -lpthread -ldl -lsocket -lm
+#STDSHLGUIMT=-lXext -lX11 -lpthread -ldl -lsocket -lm
 #STDSHLCUIMT=-lpthread -ldl -lsocket -lm 
 
 STDLIBCPP= -lstdc++
diff --git a/solenv/inc/unxsogs.mk b/solenv/inc/unxsogs.mk
index ca9f2e827259..13a734066d82 100644
--- a/solenv/inc/unxsogs.mk
+++ b/solenv/inc/unxsogs.mk
@@ -78,8 +78,8 @@ STDLIBCUIMT=-lpthread -ldl -lm
 STDSHLGUIMT=-lpthread -lnsl -lsocket -ldl -lm
 STDSHLCUIMT=-lpthread -ldl -lm
 
-STDLIBGUIST+=-lXm -lXt -lX11
-STDLIBGUIMT+=-lXm -lXt -lX11
+STDLIBGUIST+=-lX11
+STDLIBGUIMT+=-lX11
 
 LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
 LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)