From 0f8a90cff1106e5df7d56d9677e547b84d52cfe8 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 24 May 2013 13:49:11 +0200 Subject: [PATCH] stop delivering libodfgen headers Change-Id: I6402ef93bec9bf996089dcef702081b9853b9a0c --- RepositoryExternal.mk | 4 ++++ libodfgen/ExternalPackage_libodfgen.mk | 7 ------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 1e16b2af6014..0ae508db9268 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1418,6 +1418,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_odfgen +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,libodfgen)/inc \ + $$(INCLUDE) \ +) $(call gb_LinkTarget_use_package,$(1),\ libodfgen \ ) diff --git a/libodfgen/ExternalPackage_libodfgen.mk b/libodfgen/ExternalPackage_libodfgen.mk index bfa163fdb657..ad7a3d1dd501 100644 --- a/libodfgen/ExternalPackage_libodfgen.mk +++ b/libodfgen/ExternalPackage_libodfgen.mk @@ -9,13 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,libodfgen,libodfgen)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,libodfgen,inc/external/libodfgen,\ - inc/libodfgen/libodfgen.hxx \ - inc/libodfgen/OdfDocumentHandler.hxx \ - inc/libodfgen/OdtGenerator.hxx \ - inc/libodfgen/OdgGenerator.hxx \ -)) - $(eval $(call gb_ExternalPackage_use_external_project,libodfgen,libodfgen)) ifeq ($(COM),MSC)