diff options
| author | David Tardon <dtardon@redhat.com> | 2012-12-21 14:08:27 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-12-21 14:55:29 +0100 |
| commit | eafaec9539882ca4a8e4260ad01931a0e8905e8c (patch) | |
| tree | 292b97cd14e1502e2a7af204c8864955907183df | |
| parent | b91fa392bc731376cff205d6d3e5cb245dc4179c (diff) | |
use external for sane headers
Change-Id: I6fc53e185254a37df7d03ab6f91210b8e397db2e
| -rw-r--r-- | RepositoryExternal.mk | 15 | ||||
| -rw-r--r-- | extensions/Library_scn.mk | 7 |
2 files changed, 19 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index e22d2197a18a..a982882844a2 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 df976e6aa026..ac173bf1d8d5 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 \ |