Index: solenv/inc/unxirgm.mk
===================================================================
RCS file: /cvs/oo/tools/solenv/inc/unxirgm.mk,v
retrieving revision 1.3.2.1
diff -u -r1.3.2.1 unxirgm.mk
--- solenv/inc/unxirgm.mk       2002/09/27 12:51:15     1.3.2.1
+++ solenv/inc/unxirgm.mk       2002/10/10 23:05:31
@@ -11,16 +11,12 @@
 #              couldn't be instantiated.
 #              (ts&sdo/10.06.98)
 #
-#cc=                   cc -KPIC -c -n32 -ansi
-CC=                    gcc                     ## remove this to configure
-#CC=           CC -KPIC -c -n32 -ptused -OPT:Olimit=20523 
-CXX=           g++ -c          ## remove this to configure -c should be in cflags
+CC=                    gcc -c
+CXX=                   g++
 CFLAGS=                $(INCLUDE)
-CDEFS+=        -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
-# CFLAGS+=     -D__STL_NATIVE_INCLUDE_PATH=/usr/include -D__STL_NATIVE_C_INCLUDE_PATH=/usr/include
-# CFLAGS+=     -D_STL_NATIVE_INCLUDE_PATH=/usr/include -D_STL_NATIVE_C_INCLUDE_PATH=/usr/include
-CFLAGSCC=       -c
-CFLAGSCXX=     -fno-for-scope -fpermissive
+CDEFS+=        -DVCL -D_PTHREADS -DSTLPORT_VERSION=0x450  -D_USE_NAMESPACE=1 -DHAVE_UNISTD_H
+CFLAGSCC=       -c -fpermissive
+CFLAGSCXX=     -fno-for-scope -fpermissive  -c
 CFLAGSOBJGUIST=
 CFLAGSOBJCUIST=
 CFLAGSOBJGUIMT=
@@ -29,9 +25,9 @@
 CFLAGSSLOCUIMT= -fpic
 CFLAGSPROF=
 CFLAGSDEBUG=   -g
-CFLAGSDBGUTIL=
+CFLAGSDBGUTIL= 
 CFLAGSOPT=             -O2
-CFLAGSNOOPT=           -O
+CFLAGSNOOPT=           -O0
 CFLAGSOUTOBJ=  -o
 STATIC=                        -Wl,-Bstatic
@@ -43,22 +39,36 @@
 # -update_registry <file> :    Is needed to link several shared libraries
 #                              **VALID MECHANISM SOMETIMES MISSING FOR LOCAL STANDS**
 #
-LINK=                  g++
-LINKFLAGS=     -L/usr/lib32    
-LINKFLAGSAPPGUI= -Wl,-multigot
-LINKFLAGSAPPCUI= -Wl,-multigot
-
-LINKFLAGSSHLGUI= -shared
-LINKFLAGSSHLCUI= -shared
+# To use the map files, you need to have a gcc_specs file which contains:
+# *linker:
+# /path/to/bin/ld.sh
+# where ld.sh is a wrapper script that does some conversion of the map files on the fly.
+
+#LINK=                 g++ -specs=/projects/sise/openoffice/devel/workpits/STABLE_1/gcc_specs
+LINK=                  g++ 
+LINKFLAGS=     -L/usr/lib32 -Wl,-no_unresolved
+LINKVERSIONMAPFLAG= -Wl,-exports_file
+
+.IF "$(TARGETTHREAD)"=="MT"
+LINKFLAGSAPPGUI= $(THREADLIB) -Wl,-multigot -nodefaultlibs
+LINKFLAGSAPPCUI= $(THREADLIB) -Wl,-multigot -nodefaultlibs
+LINKFLAGSSHLGUI= $(THREADLIB) -shared -nodefaultlibs
+LINKFLAGSSHLCUI= $(THREADLIB) -shared -nodefaultlibs
+.ELSE
+LINKFLAGSAPPGUI= -Wl,-multigot -nodefaultlibs
+LINKFLAGSAPPCUI= -Wl,-multigot -nodefaultlibs
+LINKFLAGSSHLGUI= -shared -nodefaultlibs
+LINKFLAGSSHLCUI= -shared -nodefaultlibs
+.ENDIF
 
 LINKFLAGSTACK=
 LINKFLAGSPROF=
 LINKFLAGSDEBUG= -g
 LINKFLAGSOPT=
 
-LINKFLAGSSHLGUI += -Wl,-Bsymbolic
-LINKFLAGSSHLCUI += -Wl,-Bsymbolic
-
+#LINKFLAGSSHLGUI += -Wl,-Bsymbolic -Wl,-soname -Wl,$(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOST) $(DYNAMIC)
+#LINKFLAGSSHLCUI += -Wl,-Bsymbolic -Wl,-soname -Wl,$(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOST) $(DYNAMIC)
+SONAME_SWITCH = -Wl,-soname -Wl,
 APPLINKSTATIC=-Bstatic
 APPLINKSHARED=-Bsymbolic
 
@@ -67,17 +77,17 @@
 STDSLOGUI=
 STDOBJCUI=
 STDSLOCUI=
-# STDLIBGUIST= $(DYNAMIC) -lX11 -lc -lm
 STDLIBGUIST=   $(DYNAMIC) -lX11 -lc -lm
-STDLIBCUIST=   $(DYNAMIC) -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) -lX11 -lc -lm
-STDSHLGUIMT=   -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
-STDSHLCUIMT=   -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lc -lm
+STDLIBCUIST=   $(DYNAMIC) -lgcc -lc
+STDLIBGUIMT=   $(THREADLIB) $(DYNAMIC) -lX11 -lm -lgcc -lc
+STDLIBCUIMT=   $(THREADLIB) $(DYNAMIC) -lgcc -lc -lm
+STDSHLGUIMT=   -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lm -lgcc -lc
+STDSHLCUIMT=   -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lm -lgcc -lc
 THREADLIB=             -lpthread
 
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+LIBSTLPORTST= -lstlport_gcc
+
 LIBMGR=                        ar
 LIBFLAGS=              -r
 # LIBEXT=              .so
@@ -102,7 +112,7 @@
 DLLPOST=               .so
 
 
-LDUMP=
+LDUMP=c++filt
 
 STDLIBCPP = -lstdc++