INTEGRATION: CWS ause076 (1.8.276); FILE MERGED
2007/03/01 16:50:00 hjs 1.8.276.1: #i75028# kick obsolete settings
This commit is contained in:
parent
6811318136
commit
f705b55108
2 changed files with 4 additions and 13 deletions
|
@ -4,9 +4,9 @@
|
|||
#
|
||||
# $RCSfile: unxhpgr.mk,v $
|
||||
#
|
||||
# $Revision: 1.8 $
|
||||
# $Revision: 1.9 $
|
||||
#
|
||||
# last change: $Author: kz $ $Date: 2006-07-05 22:01:20 $
|
||||
# last change: $Author: obo $ $Date: 2007-03-09 09:08:07 $
|
||||
#
|
||||
# The Contents of this file are made available subject to
|
||||
# the terms of GNU Lesser General Public License Version 2.1.
|
||||
|
@ -64,8 +64,6 @@ CFLAGS=-nostdinc -c
|
|||
CFLAGSCC=-pipe -fguiding-decls $(ARCH_FLAGS)
|
||||
CFLAGSCXX=-pipe -fguiding-decls $(ARCH_FLAGS)
|
||||
PICSWITCH:=-fPIC
|
||||
CFLAGSOBJGUIST=
|
||||
CFLAGSOBJCUIST=
|
||||
CFLAGSOBJGUIMT=
|
||||
CFLAGSOBJCUIMT=
|
||||
CFLAGSSLOGUIMT=$(PICSWITCH)
|
||||
|
@ -102,8 +100,6 @@ STDOBJGUI=
|
|||
STDSLOGUI=
|
||||
STDOBJCUI=
|
||||
STDSLOCUI=
|
||||
STDLIBGUIST= -lX11 -lXext -lsec -lcxx -ldld -lm
|
||||
STDLIBCUIST= -lsec -lcxx -ldld -lm
|
||||
#STDLIBGUIMT= -lX11 -lXext -lcma -lsec -lcxx -ldld -lc_r -lm
|
||||
STDLIBGUIMT= -lX11 -lXext -ldce
|
||||
STDLIBCUIMT= -lc_r -lgcc -ldce
|
||||
|
|
|
@ -4,9 +4,9 @@
|
|||
#
|
||||
# $RCSfile: unxirxm.mk,v $
|
||||
#
|
||||
# $Revision: 1.8 $
|
||||
# $Revision: 1.9 $
|
||||
#
|
||||
# last change: $Author: kz $ $Date: 2006-07-05 22:01:52 $
|
||||
# last change: $Author: obo $ $Date: 2007-03-09 09:08:41 $
|
||||
#
|
||||
# The Contents of this file are made available subject to
|
||||
# the terms of GNU Lesser General Public License Version 2.1.
|
||||
|
@ -71,8 +71,6 @@ CDEFS+= -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
|
|||
# 1682 ...is only partially overridden in class...
|
||||
CFLAGSCC= -Xcpluscomm -woff 1009,1021,1107,1110,1155,1171,1183,1185,1188,1233,1234,1257,1440,1516,1681,1682 $(ARCH_FLAGS)
|
||||
CFLAGSCXX= -woff 1009,1021,1107,1110,1155,1171,1183,1185,1188,1233,1234,1257,1440,1516,1681,1682 $(ARCH_FLAGS)
|
||||
CFLAGSOBJGUIST=
|
||||
CFLAGSOBJCUIST=
|
||||
CFLAGSOBJGUIMT=
|
||||
CFLAGSOBJCUIMT=
|
||||
CFLAGSSLOGUIMT=
|
||||
|
@ -113,9 +111,6 @@ STDOBJGUI=
|
|||
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
|
||||
|
|
Loading…
Reference in a new issue