diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-06-17 03:05:26 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-06-17 03:05:26 +0300 |
| commit | c9e3885ea7c950b4784b01ab0f42e92824a779c0 (patch) | |
| tree | 3b7a7818ae46e7551f6eb8c9e8154cd4f5547fd0 /filter | |
| parent | Replace List with std::vector< EscherConnectorListEntry* > (diff) | |
| download | core-c9e3885ea7c950b4784b01ab0f42e92824a779c0.tar.gz core-c9e3885ea7c950b4784b01ab0f42e92824a779c0.zip | |
Use LIBXML_CFLAGS if SYSTEM_LIBXML
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/config/fragments/makefile.mk | 10 | ||||
| -rw-r--r-- | filter/source/xsltfilter/makefile.mk | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/filter/source/config/fragments/makefile.mk b/filter/source/config/fragments/makefile.mk index 716c31891da8..6ad90259aa64 100644 --- a/filter/source/config/fragments/makefile.mk +++ b/filter/source/config/fragments/makefile.mk @@ -176,6 +176,15 @@ ALLTAR : $(ALL_FLAGS) $(ALL_FLAGS) : $(INCLUDE_FRAGMENTS) +.IF "$(CROSS_COMPILING)" == "YES" + +# Just assume cross-compiling from a sane system with a sane java +# command... Too bored now to start propagating all the crazy +# possibilities for Java as FOR_BUILD variants + +MERGE := java -jar $(SOLARBINDIR)$/FCFGMerge.jar + +.ELSE .IF "$(SOLAR_JAVA)"=="" #cmc, hack to workaround the java build requirement .IF "$(SYSTEM_PYTHON)" == "YES" @@ -186,6 +195,7 @@ MERGE:=$(AUGMENT_LIBRARY_PATH) PYTHONPATH=$(SOLARLIBDIR)/python $(SOLARBINDIR)/p .ELSE MERGE := $(JAVAI) $(JAVAIFLAGS) -jar $(SOLARBINDIR)$/FCFGMerge.jar .ENDIF +.ENDIF PACKLANG := $(XSLTPROC) --nonet PACKLANG_IN := diff --git a/filter/source/xsltfilter/makefile.mk b/filter/source/xsltfilter/makefile.mk index 539469f55fc7..567b37f1bb65 100644 --- a/filter/source/xsltfilter/makefile.mk +++ b/filter/source/xsltfilter/makefile.mk @@ -43,6 +43,10 @@ LIBXSLTINCDIR=external$/libxslt CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR) .ENDIF +.IF "$(SYSTEM_LIBXML)" == "YES" +CFLAGS+= $(LIBXML_CFLAGS) +.ENDIF + SLOFILES=$(SLO)$/XSLTFilter.obj $(SLO)$/LibXSLTTransformer.obj $(SLO)/OleHandler.obj LIBNAME=xsltfilter SHL1TARGETDEPN=makefile.mk |