strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use LIBXML_CFLAGS if SYSTEM_LIBXML

Browse source
This commit is contained in:
Tor Lillqvist 2011-06-17 03:05:26 +03:00
parent a07e97c48f
commit c9e3885ea7
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
filter/source/config/fragments/makefile.mk
View file

@ -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 :=

4
filter/source/xsltfilter/makefile.mk
View file

@ -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