RepositoryExternal.mk | 14 ++++++++------
configure.ac | 2 ++
lcms2/ExternalPackage_lcms2.mk | 8 ++++++--
lcms2/prj/build.lst | 3 +--
libcdr/ExternalProject_libcdr.mk | 1 +
5 files changed, 18 insertions(+), 10 deletions(-)
New commits:
commit faef2e51d0c7b74334a11400b205daf382805780
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Sun Nov 4 15:23:23 2012 -0600
fix some lcms2 gbuildification breakages...
Change-Id: Icad3132c1710c62559c35964fe5ce3f466646f13
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5db629b..bbf352f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -878,7 +878,6 @@ gb_LinkTarget__use_graphite :=
endif # SYSTEM_GRAPHITE
-
ifeq ($(SYSTEM_ICU),YES)
define gb_LinkTarget__use_icudata
@@ -910,7 +909,7 @@ else
gb_ICU_suffix:=
endif
-# icudata and icui18n is called icudt and icuin when built with MSVC :-(
+# icudata and icui18n is called icudt and icuin when built with MSVC :-/
ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
icudt \
@@ -1219,7 +1218,7 @@ ifeq ($(SYSTEM_LCMS2),YES)
define gb_LinkTarget__use_lcms2
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
- $(LCMS2_CFLAGS) \
+ $(LCMS2_CFLAGS) \
)
$(call gb_LinkTarget_add_libs,$(1),$(LCMS2_LIBS))
@@ -1257,9 +1256,12 @@ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,lcms2/include) \
$$(INCLUDE) \
)
-$(call gb_LinkTarget_use_libraries,$(1),\
- lcms2 \
-)
+$(call gb_LinkTarget_add_libs,$(1),$(LCMS2_LIBS))
+
+endef
+
+define gb_ExternalProject__use_lcms2
+$(call gb_ExternalProject_use_package,$(1),lcms2)
endef
diff --git a/configure.ac b/configure.ac
index d206c3f..e325f4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7042,6 +7042,8 @@ if test "$with_system_lcms2" = "yes"; then
else
AC_MSG_RESULT([internal])
SYSTEM_LCMS2=NO
+ LCMS2_CFLAGS="-I${OUTDIR}/inc/lcms2"
+ LCMS2_LIBS="-L${OUTDIR}/lib -llcms2"
LCMS2_TARBALL="861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz"
BUILD_TYPE="$BUILD_TYPE LCMS2"
fi
diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk
index d1c1d3c..628930f 100644
--- a/lcms2/ExternalPackage_lcms2.mk
+++ b/lcms2/ExternalPackage_lcms2.mk
@@ -10,8 +10,10 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,lcms2,lcms2))
$(eval $(call gb_ExternalPackage_use_external_project,lcms2,lcms2))
+$(eval $(call
gb_ExternalPackage_add_file,lcms2,inc/lcms2/lcms2.h,include/lcms2.h))
+
ifeq ($(OS),MACOSX)
-$(eval $(call
gb_ExternalPackage_add_file,lcms2,lib/liblcms2.2.dylib,src/.libs/liblcms2.2.dylib))
+$(eval $(call
gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dylib,src/.libs/liblcms2.2.dylib))
else ifeq ($(filter-out IOS ANDROID,$(OS)),)
$(eval $(call
gb_ExternalPackage_add_file,lcms2,lib/liblcms2.a,src/.libs/liblcms2.a))
else ifeq ($(OS),WNT)
@@ -23,6 +25,8 @@ $(eval $(call
gb_ExternalPackage_add_file,lcms2,lib/lcms2.lib,bin/lcms2.lib))
$(eval $(call gb_ExternalPackage_add_file,lcms2,bin/lcms2.dll,bin/lcms2.dll))
endif
else
-$(eval $(call
gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so,src/.libs/liblcms2.so.2.0.4))
+$(eval $(call
gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so,src/.libs/liblcms2.so))
+$(eval $(call
gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so.2,src/.libs/liblcms2.so.2))
+$(eval $(call
gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so.2.0.4,src/.libs/liblcms2.so.2.0.4))
endif
# vim: set noet sw=4 ts=4:
diff --git a/lcms2/prj/build.lst b/lcms2/prj/build.lst
index 551f0f3..e9c203e 100644
--- a/lcms2/prj/build.lst
+++ b/lcms2/prj/build.lst
@@ -1,3 +1,2 @@
lcms lcms2 : soltools ZLIB:zlib NULL
-lcms lcms2 usr1 - all lcms_mkout NULL
-lcms lcms2 nmake - all lcms_libwpd NULL
+lcms lcms2/prj nmake - all lcms_prj NULL
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index 83267dd..0f894f4 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,libcdr,\
))
$(eval $(call gb_ExternalProject_use_externals,libcdr,\
+ lcms2 \
wpd \
wpg \
))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
