diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-09-25 21:47:16 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-09-25 21:47:16 +0200 |
| commit | d381760a0bdbc403426db365fcdd79c48805a1f9 (patch) | |
| tree | 969d1f2189bb9c5d73ea358016389539c1ef23c5 /xpdf | |
| parent | e7e8d94bb6d31abc98bbeb4026481aa052f29278 (diff) | |
| parent | bbc5105d503634578685f235497b39965f528d1a (diff) | |
merge commit
Diffstat (limited to 'xpdf')
| -rw-r--r-- | xpdf/makefile.mk | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk index 8ed25433f083..337c0a28c162 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,12 @@ 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 +CONFIGURE_ACTION=configure +CONFIGURE_FLAGS+=--without-x --without-libpaper-library --without-t1-library --enable-multithreaded --enable-exceptions + +.IF "$(OS)$(CPU)"=="MACOSXP" +CXXFLAGS+=-malign-natural +.EXPORT: CXXFLAGS .ENDIF BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) |