INTEGRATION: CWS hr51 (1.3.10); FILE MERGED

2008/06/16 09:43:15 hr 1.3.10.3: #i88947#: enable Solaris 64 bit builds
2008/06/06 16:20:13 hr 1.3.10.2: RESYNC: (1.3-1.4); FILE MERGED
2008/06/06 13:59:16 hr 1.3.10.1: #i88947#: Solaris 64 bit support

xpdf/makefile.mk

@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.5 $
+# $Revision: 1.6 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -59,6 +59,12 @@ CXXFLAGS:=$(EXTRA_CFLAGS)
 .ENDIF # "$(SYSBASE)"!=""
 
 .IF "$(GUI)"=="UNX"
+.IF "$(OS)"=="SOLARIS"
+CFLAGS:=-O $(ARCH_FLAGS)
+CXXFLAGS:=-O $(ARCH_FLAGS)
+LDFLAGS:=$(ARCH_FLAGS)
+.EXPORT : CFLAGS CXXFLAGS LDFLAGS
+.ENDIF
 #CONFIGURE_ACTION=./configure
 #CONFIGURE_ACTION=./configure --without-x --enable-multithreaded --enable-exceptions CFLAGS="-g -O0" CXXFLAGS="-g -O0"
 CONFIGURE_ACTION=./configure --without-x --enable-multithreaded --enable-exceptions