RepositoryExternal.mk | 15 +++++++++++++++
extensions/Library_scn.mk | 7 ++++---
2 files changed, 19 insertions(+), 3 deletions(-)
New commits:
commit eafaec9539882ca4a8e4260ad01931a0e8905e8c
Author: David Tardon <dtar...@redhat.com>
Date: Fri Dec 21 14:08:27 2012 +0100
use external for sane headers
Change-Id: I6fc53e185254a37df7d03ab6f91210b8e397db2e
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e22d219..a982882 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -126,6 +126,21 @@ endef
endif
+ifeq (SANEUNX,$(filter SANE,$(BUILD_TYPE))$(GUI))
+
+define gb_LinkTarget__use_sane_headers
+$(call gb_Library_use_packages,$(1),\
+ sane_inc \
+)
+
+endef
+
+else
+
+gb_LinkTarget__use_sane_headers :=
+
+endif
+
# External libraries
ifeq ($(SYSTEM_CPPUNIT),YES)
diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk
index df976e6..ac173bf 100644
--- a/extensions/Library_scn.mk
+++ b/extensions/Library_scn.mk
@@ -28,6 +28,10 @@
$(eval $(call gb_Library_Library,scn))
+$(eval $(call gb_Library_use_externals,scn,\
+ sane_headers \
+))
+
$(eval $(call gb_Library_set_componentfile,scn,extensions/source/scanner/scn))
$(eval $(call gb_Library_use_sdk_api,scn))
@@ -56,9 +60,6 @@ $(eval $(call gb_Library_add_exception_objects,scn,\
))
else
ifeq ($(GUI),UNX)
-ifneq (,$(filter SANE,$(BUILD_TYPE)))
-$(eval $(call gb_Library_use_packages,scn,sane_inc))
-endif
$(eval $(call gb_Library_add_exception_objects,scn,\
extensions/source/scanner/grid \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
