[Libreoffice-commits] .: 2 commits - filter/prj filter/source

[Tor Lillqvist]

 filter/prj/d.lst                           |    1 +
 filter/source/config/fragments/makefile.mk |   10 ++++++++++
 filter/source/xsltfilter/makefile.mk       |    4 ++++
 3 files changed, 15 insertions(+)

New commits:
commit b140adcdb8c113e390cd4f7f6dc5c5055852b44a
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Jun 17 03:06:11 2011 +0300

    Deliver also static libraries

diff --git a/filter/prj/d.lst b/filter/prj/d.lst
index 7b7bfc5..53b7a14 100644
--- a/filter/prj/d.lst
+++ b/filter/prj/d.lst
@@ -3,6 +3,7 @@ mkdir: %COMMON_DEST%\bin\hid
 ..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
 ..\%__SRC%\lib\lib*.so %_DEST%\lib
 ..\%__SRC%\lib\lib*.dylib %_DEST%\lib
+..\%__SRC%\lib\lib*.a %_DEST%\lib
 ..\%__SRC%\lib\imsfilter.lib %_DEST%\lib\imsfilter.lib
 ..\%__SRC%\class\*.jar %_DEST%\bin\*.jar
 ..\%__SRC%\class\XSLTFilter\*.jar %_DEST%\bin\*.jar
commit 585e884602ea8f8dd1e13e1ab595344605739e7c
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Jun 17 03:05:26 2011 +0300

    Use LIBXML_CFLAGS if SYSTEM_LIBXML

diff --git a/filter/source/config/fragments/makefile.mk b/filter/source/config/fragments/makefile.mk
index 716c318..6ad9025 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 539469f..567b37f 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