summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2007-03-09 08:06:57 +0000
committerOliver Bolte <obo@openoffice.org>2007-03-09 08:06:57 +0000
commit8428cbdc09ab29a1e19f6e1c3eb9b9f060ebbfd1 (patch)
tree1dfc1a4d11578e86fd867c59a20858c661482b45 /solenv
parent2ada14af97db498620f6cfee6eec0d54b948f9d1 (diff)
INTEGRATION: CWS ause076 (1.6.276); FILE MERGED
2007/03/01 16:49:59 hjs 1.6.276.1: #i75028# kick obsolete settings
Diffstat (limited to 'solenv')
-rw-r--r--solenv/inc/unxaixp.mk8
-rw-r--r--solenv/inc/unxbsda.mk8
2 files changed, 4 insertions, 12 deletions
diff --git a/solenv/inc/unxaixp.mk b/solenv/inc/unxaixp.mk
index 136c5c598ee4..722e088faccc 100644
--- a/solenv/inc/unxaixp.mk
+++ b/solenv/inc/unxaixp.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: unxaixp.mk,v $
#
-# $Revision: 1.6 $
+# $Revision: 1.7 $
#
-# last change: $Author: kz $ $Date: 2006-07-05 22:00:09 $
+# last change: $Author: obo $ $Date: 2007-03-09 09:06:45 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -46,8 +46,6 @@ CDEFS+= -D_PTHREADS
CDEFS+= -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
CFLAGSCC=$(ARCH_FLAGS)
CFLAGSCXX=$(ARCH_FLAGS)
-CFLAGSOBJGUIST=
-CFLAGSOBJCUIST=
CFLAGSOBJGUIMT=
CFLAGSOBJCUIMT=
CFLAGSSLOGUIMT=
@@ -87,8 +85,6 @@ STDOBJGUI=
STDSLOGUI=
STDOBJCUI=
STDSLOCUI=
-STDLIBGUIST=
-STDLIBCUIST=
# application
STDLIBGUIMT= # -lX11 -ldl
STDLIBCUIMT= # -lX11 -ldl
diff --git a/solenv/inc/unxbsda.mk b/solenv/inc/unxbsda.mk
index e344dfa03565..d2238b2c6918 100644
--- a/solenv/inc/unxbsda.mk
+++ b/solenv/inc/unxbsda.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: unxbsda.mk,v $
#
-# $Revision: 1.6 $
+# $Revision: 1.7 $
#
-# last change: $Author: kz $ $Date: 2006-07-05 22:00:19 $
+# last change: $Author: obo $ $Date: 2007-03-09 09:06:57 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -48,8 +48,6 @@ CDEFS+= -DNO_AUDIO -DPRINTER_DUMMY
CFLAGSCC= -fsigned-char $(ARCH_FLAGS)
CFLAGSCXX= -fsigned-char $(ARCH_FLAGS)
PICSWITCH:=-fPIC
-CFLAGSOBJGUIST=
-CFLAGSOBJCUIST=
CFLAGSOBJGUIMT=
CFLAGSOBJCUIMT=
CFLAGSSLOGUIMT=$(PICSWITCH)
@@ -80,8 +78,6 @@ STDOBJGUI= /usr/lib/crt0.o
STDSLOGUI= /usr/lib/crt0.o
STDOBJCUI= /usr/lib/crt0.o
STDSLOCUI= /usr/lib/crt0.o
-STDLIBGUIST= -Bdynamic -lc -Bstatic -lg++ -lstdc++ -Bdynamic -lm -lgcc -lc -lgcc
-STDLIBCUIST= -Bdynamic -lc -Bstatic -lg++ -lstdc++ -Bdynamic -lm -lgcc -lc -lgcc
STDLIBGUIMT= -Bdynamic -lc -Bstatic -lg++ -lstdc++ -Bdynamic -lm -lgcc -lc -lgcc
STDLIBCUIMT= -Bdynamic -lc -Bstatic -lg++ -lstdc++ -Bdynamic -lm -lgcc -lc -lgcc
STDSHLGUIMT= -Bdynamic -lc -Bstatic -lg++ -lstdc++ -Bdynamic -lm -lgcc -lc -lgcc