diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-20 13:09:23 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-20 13:09:23 +0000 |
| commit | 42a93d359f28adb36d0aa7a2d6f71109f5435b34 (patch) | |
| tree | 56fbbb568f869dc7e7c4024385746982763b1941 /xpdf | |
| parent | INTEGRATION: CWS presenterscreen (1.1.2); FILE ADDED (diff) | |
| download | core-42a93d359f28adb36d0aa7a2d6f71109f5435b34.tar.gz core-42a93d359f28adb36d0aa7a2d6f71109f5435b34.zip | |
INTEGRATION: CWS obo27 (1.3.4); FILE MERGED
2008/05/02 07:47:36 obo 1.3.4.3: #i88875# Build problems for unxmacxi in SO environment
2008/04/30 08:30:06 obo 1.3.4.2: new try
2008/04/24 09:13:28 obo 1.3.4.1: #i10000# build problem for SO environment
Diffstat (limited to 'xpdf')
| -rw-r--r-- | xpdf/makefile.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk index 8d244318766e..fc808ff62d5f 100644 --- a/xpdf/makefile.mk +++ b/xpdf/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # # This file is part of OpenOffice.org. # @@ -50,6 +50,14 @@ PATCH_FILE_NAME=$(TARFILE_NAME).patch CONFIGURE_DIR= BUILD_DIR=$(CONFIGURE_DIR) +.IF "$(SYSBASE)"!="" +.IF "$(EXTRA_CFLAGS)"!="" +CFLAGS:=$(EXTRA_CFLAGS) +CXXFLAGS:=$(EXTRA_CFLAGS) +.EXPORT : CFLAGS CXXFLAGS +.ENDIF # "$(EXTRA_CFLAGS)"!="" +.ENDIF # "$(SYSBASE)"!="" + .IF "$(GUI)"=="UNX" #CONFIGURE_ACTION=./configure #CONFIGURE_ACTION=./configure --without-x --enable-multithreaded --enable-exceptions CFLAGS="-g -O0" CXXFLAGS="-g -O0" |