Merge changes from OpenOffice609-FU into the main trunk

This commit is contained in:
Sander Vesik 2000-12-07 12:08:16 +00:00
parent 599deb3466
commit 19921f2d40

View file

@ -12,7 +12,7 @@ CFLAGS+=-w -c $(INCLUDE)
CFLAGSCC=-pipe
CFLAGSEXCEPTIONS=-fexceptions
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
CFLAGSCXX=-pipe -fguiding-decls -frtti
CFLAGSCXX=-pipe -fguiding-decls -fno-for-scope -frtti -fpermissive
CFLAGSOBJGUIST=
CFLAGSOBJCUIST=
@ -31,8 +31,8 @@ CFLAGSOPT=-O -fcse-follow-jumps -fcse-skip-blocks -fexpensive-optimizations -fst
CFLAGSNOOPT=-O
CFLAGSOUTOBJ=-o
STATIC= -Bstatic
DYNAMIC= -Bdynamic
STATIC= -Wl,-Bstatic
DYNAMIC= -Wl,-Bdynamic
THREADLIB=
LINK= gcc
@ -90,4 +90,3 @@ DLLPOST= .so.1.0
LDUMP=