summaryrefslogtreecommitdiff
path: root/xpdf/makefile.mk
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2009-09-16 14:49:32 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2009-09-16 14:49:32 +0000
commit969b32ae5a5aa9be89a8b8d30d533d9f91bbf587 (patch)
tree2c5e0d8344c1704dba48bec584ac84b0dc8603e6 /xpdf/makefile.mk
parentac6f47bc425abc041c11f80644ba31bef87cd7bf (diff)
CWS-TOOLING: integrate CWS cloph13
2009-09-01 #i104566# also use syslibroot/isysroot for external components 2009-08-28 #i104568# clean up duplicated definitions of OBJCXXFLAGS 2009-08-28 #i104567# add ccache-detection to configure (to skip to objcxx-flags) 2009-08-28 #i104566# use Mac OS X 10.4-SDK to ensure backwards compatibility use MACOSX_DEPLOYMENT_TARGET and sysroot/syslibroot switches ignore "-isysroot /Developer/..." arguments for OOo's cpp
Diffstat (limited to 'xpdf/makefile.mk')
-rw-r--r--xpdf/makefile.mk23
1 files changed, 14 insertions, 9 deletions
diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk
index 8ed25433f083..c65fa6938533 100644
--- a/xpdf/makefile.mk
+++ b/xpdf/makefile.mk
@@ -44,8 +44,8 @@ TARGET=xpdflib
.IF "$(SYSTEM_POPPLER)" == "YES"
dummy:
- @echo "An already available installation of poppler should exist on your system."
- @echo "Therefore xpdf provided here does not need to be built in addition."
+ @echo "An already available installation of poppler should exist on your system."
+ @echo "Therefore xpdf provided here does not need to be built in addition."
.ENDIF
# --- Files --------------------------------------------------------
@@ -62,7 +62,11 @@ CFLAGS:=$(EXTRA_CFLAGS)
CXXFLAGS:=$(EXTRA_CFLAGS)
.EXPORT : CFLAGS CXXFLAGS
.ENDIF # "$(EXTRA_CFLAGS)"!=""
-.ENDIF # "$(SYSBASE)"!=""
+.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!=""
+CFLAGS:=$(EXTRA_CDEFS)
+CXXFLAGS+:=$(EXTRA_CDEFS)
+.EXPORT: CFLAGS CXXFLAGS
+.ENDIF
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="SOLARIS"
@@ -76,12 +80,13 @@ LDFLAGS:=$(ARCH_FLAGS)
.EXPORT : CFLAGS CXXFLAGS LDFLAGS
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
-CONFIGURE_ACTION=./configure --without-x --enable-multithreaded --enable-exceptions CXXFLAGS="-malign-natural"
-.ELSE
-#CONFIGURE_ACTION=./configure
-#CONFIGURE_ACTION=./configure --without-x --enable-multithreaded --enable-exceptions CFLAGS="-g -O0" CXXFLAGS="-g -O0"
-CONFIGURE_ACTION=./configure --without-libpaper-library --without-t1-library --without-x --enable-multithreaded --enable-exceptions
+.IF "$(OS)"=="MACOSX"
+CONFIGURE_ACTION=configure
+CONFIGURE_FLAGS+=--without-x --without-libpaper-library --without-t1-library --enable-multithreaded --enable-exceptions
+.IF "$(CPU)"=="P"
+CXXFLAGS+=-malign-natural
+.EXPORT: CXXFLAGS
+.ENDIF
.ENDIF
BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)