Module_tail_build.mk | 1 +
RepositoryFixes.mk | 2 --
RepositoryModule_ooo.mk | 5 +++--
configure.ac | 1 -
jpeg/StaticLibrary_jpeg.mk | 2 ++
liborcus/Package_liborcus.mk | 1 -
solenv/gbuild/CustomTarget.mk | 11 +++++++++++
tail_build/prj/build.lst | 2 +-
8 files changed, 18 insertions(+), 7 deletions(-)
New commits:
commit 52a059349b0f1b0a933909a9ffcbabd47385902c
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Sat Nov 10 12:58:34 2012 +0100
RepositoryModule_ooo: add svgio; use more gb_Helper_optional
Change-Id: Ied60932e1a0e66b9721afbfd186f05e188edb70c
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 7145f26..63666cd 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
$(call gb_Helper_optional,BSH,beanshell) \
binaryurp \
$(call gb_Helper_optional,BLUEZ,bluez_bluetooth) \
- boost \
+ $(call gb_Helper_optional,BOOST,boost) \
bridges \
canvas \
chart2 \
@@ -109,7 +109,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
libmspub \
liborcus \
- libpng \
+ $(call gb_Helper_optional,LIBPNG,libpng) \
librelogo \
libvisio \
libwpd \
@@ -169,6 +169,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
starmath \
stoc \
store \
+ svgio \
svl \
svtools \
svx \
commit e7d9492921fb064c1b155b5f3de49ea8d2f56e6e
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Sat Nov 10 12:48:30 2012 +0100
add jpeg to tail_build
Change-Id: Id67be2a0722930094c61ad99912934ebce5a4631
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index c62c484..4f2c9e2 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -89,6 +89,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
io \
javaunohelper \
$(call gb_Helper_optional,JFREEREPORT,jfreereport) \
+ $(call gb_Helper_optional,JPEG,jpeg) \
jurt \
jvmaccess \
jvmfwk \
diff --git a/jpeg/StaticLibrary_jpeg.mk b/jpeg/StaticLibrary_jpeg.mk
index 91e3773..d3430ba 100644
--- a/jpeg/StaticLibrary_jpeg.mk
+++ b/jpeg/StaticLibrary_jpeg.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,jpeg))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,jpeg))
+$(eval $(call gb_StaticLibrary_use_package,jpeg,jpeg_inc))
+
$(eval $(call gb_StaticLibrary_use_unpacked,jpeg,jpeg))
$(eval $(call gb_StaticLibrary_add_generated_cobjects,jpeg,\
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 653adf9..39c216e 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : BERKELEYDB:berkeleydb CAIRO:cairo CPPUNIT:cppunit
EXPAT:expat ICU:icu JPEG:jpeg LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz
NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib
external solenv soltools NULL
+tb tail_build : BERKELEYDB:berkeleydb CAIRO:cairo CPPUNIT:cppunit
EXPAT:expat ICU:icu LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss
OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external
solenv soltools NULL
tb tail_build\prj nmake - all tb_prj NULL
commit cd992e621baba38c757fc1992082c06537bc8caf
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Sat Nov 10 01:08:29 2012 +0100
gbuild: add gb_CustomTarget_register_targets
Change-Id: I044bae6995f78ea70dea9da101036a6cf578d48f
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index d8b59d2..f56e262 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -47,4 +47,15 @@ $(call gb_CustomTarget_get_target,$(1)) :| $(dir $(call
gb_CustomTarget_get_targ
endef
+define gb_CustomTarget_register_target
+$(call gb_CustomTarget_get_target,$(1)) : $(call
gb_CustomTarget_get_workdir,$(1))/$(2)
+$(call gb_CustomTarget_get_workdir,$(1))/$(2) :| $(dir $(call
gb_CustomTarget_get_workdir,$(1))/$(2)).dir
+
+endef
+
+define gb_CustomTarget_register_targets
+$(foreach target,$(2),$(call gb_CustomTarget_register_target,$(1),$(target)))
+
+endef
+
# vim: set noet sw=4:
commit b8bd25548eb8d13db07ed976c47071a951ded786
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Fri Nov 9 16:49:59 2012 +0100
let's have only one orcus library in solver
Change-Id: Ida46affca95fcd582206d79ff7a5b4d48ed92e12
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 51e8241..55f5ed7 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -91,8 +91,6 @@ gb_Library_FILENAMES := $(patsubst
xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT)
gb_Library_FILENAMES := $(patsubst
xslt:ixslt%,xslt:libxslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
-gb_StaticLibrary_FILENAMES := $(patsubst
orcus:liborcus%,orcus:liborcus-0.2%,$(gb_StaticLibrary_FILENAMES))
-
# Libraries not provided by mingw(-w64), available only in the Windows
# SDK. So if these actually are liked with somewhere, we can't
# cross-compile that module then using MinGW. That needs to be fixed
diff --git a/liborcus/Package_liborcus.mk b/liborcus/Package_liborcus.mk
index bfd9b9f..57e5ea9 100644
--- a/liborcus/Package_liborcus.mk
+++ b/liborcus/Package_liborcus.mk
@@ -14,7 +14,6 @@ $(eval $(call
gb_Package_use_external_project,liborcus,liborcus))
ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call
gb_Package_add_file,liborcus,lib/orcus.lib,vsprojects/liborcus-static-nozip/Release/orcus.lib))
else
-$(eval $(call
gb_Package_add_file,liborcus,lib/liborcus-0.2.a,src/liborcus/.libs/liborcus-0.2.a))
$(eval $(call
gb_Package_add_file,liborcus,lib/liborcus.a,src/liborcus/.libs/liborcus-0.2.a))
endif
commit d106203216ca2dc741994b4275df9424e5f3466a
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Fri Nov 9 11:05:37 2012 +0100
remove duplication
Change-Id: I6a42370873708e4b016e75829064da6080acf811
diff --git a/configure.ac b/configure.ac
index 39fb2cf..4219d95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7033,7 +7033,6 @@ else
fi
AC_SUBST(SYSTEM_LCMS2)
AC_SUBST(LCMS2_CFLAGS)
-AC_SUBST(LCMS2_TARBALL)
AC_SUBST(LCMS2_LIBS)
AC_SUBST(LCMS2_TARBALL)
AC_SUBST([MINGW_LCMS2_DLL])
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
