From f8afd6e28232a02eace0fda3a34b4edc8dc667fe Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 21 Sep 2012 16:53:52 +0200 Subject: [PATCH] update ext. projects to use ExternalPackage Change-Id: Ia66854f21446fff9a04b1708964286c566333ab0 --- clucene/ExternalPackage_clucene.mk | 123 +++++++++++++++++ clucene/Module_clucene.mk | 2 +- clucene/Package_source.mk | 125 ------------------ ...ge_libcdr.mk => ExternalPackage_libcdr.mk} | 6 +- libcdr/Module_libcdr.mk | 2 +- ..._libcmis.mk => ExternalPackage_libcmis.mk} | 6 +- libcmis/Module_libcmis.mk | 2 +- ...ibmspub.mk => ExternalPackage_libmspub.mk} | 6 +- libmspub/Module_libmspub.mk | 2 +- ...ge_libpng.mk => ExternalPackage_libpng.mk} | 6 +- libpng/Module_libpng.mk | 2 +- ...ibvisio.mk => ExternalPackage_libvisio.mk} | 12 +- libvisio/Module_libvisio.mk | 2 +- ...ge_libwpd.mk => ExternalPackage_libwpd.mk} | 8 +- libwpd/Module_libwpd.mk | 2 +- ...ge_libwpg.mk => ExternalPackage_libwpg.mk} | 6 +- libwpg/Module_libwpg.mk | 2 +- ...ge_libwps.mk => ExternalPackage_libwps.mk} | 6 +- libwps/Module_libwps.mk | 2 +- 19 files changed, 152 insertions(+), 170 deletions(-) create mode 100644 clucene/ExternalPackage_clucene.mk delete mode 100644 clucene/Package_source.mk rename libcdr/{Package_libcdr.mk => ExternalPackage_libcdr.mk} (65%) rename libcmis/{Package_libcmis.mk => ExternalPackage_libcmis.mk} (72%) rename libmspub/{Package_libmspub.mk => ExternalPackage_libmspub.mk} (64%) rename libpng/{Package_libpng.mk => ExternalPackage_libpng.mk} (65%) rename libvisio/{Package_libvisio.mk => ExternalPackage_libvisio.mk} (55%) rename libwpd/{Package_libwpd.mk => ExternalPackage_libwpd.mk} (66%) rename libwpg/{Package_libwpg.mk => ExternalPackage_libwpg.mk} (65%) rename libwps/{Package_libwps.mk => ExternalPackage_libwps.mk} (63%) diff --git a/clucene/ExternalPackage_clucene.mk b/clucene/ExternalPackage_clucene.mk new file mode 100644 index 000000000000..e09c47763bf4 --- /dev/null +++ b/clucene/ExternalPackage_clucene.mk @@ -0,0 +1,123 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., Caolán McNamara +# (initial developer) +# Copyright (C) 2012 Red Hat, Inc., David Tardon +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_ExternalPackage_ExternalPackage,clucene_inc,clucene)) + +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene.h,src/core/CLucene.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/clucene-config.h,src/shared/CLucene/clucene-config.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/SharedHeader.h,src/shared/CLucene/SharedHeader.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/document/DateField.h,src/core/CLucene/document/DateField.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/document/DateTools.h,src/core/CLucene/document/DateTools.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/document/Document.h,src/core/CLucene/document/Document.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/document/Field.h,src/core/CLucene/document/Field.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/document/NumberTools.h,src/core/CLucene/document/NumberTools.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/DirectoryIndexReader.h,src/core/CLucene/index/DirectoryIndexReader.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/Terms.h,src/core/CLucene/index/Terms.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/IndexDeletionPolicy.h,src/core/CLucene/index/IndexDeletionPolicy.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/MultipleTermPositions.h,src/core/CLucene/index/MultipleTermPositions.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/Term.h,src/core/CLucene/index/Term.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/IndexModifier.h,src/core/CLucene/index/IndexModifier.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/Payload.h,src/core/CLucene/index/Payload.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/MultiReader.h,src/core/CLucene/index/MultiReader.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/MergeScheduler.h,src/core/CLucene/index/MergeScheduler.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/TermVector.h,src/core/CLucene/index/TermVector.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/MergePolicy.h,src/core/CLucene/index/MergePolicy.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/IndexReader.h,src/core/CLucene/index/IndexReader.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/index/IndexWriter.h,src/core/CLucene/index/IndexWriter.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/BooleanClause.h,src/core/CLucene/search/BooleanClause.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/BooleanQuery.h,src/core/CLucene/search/BooleanQuery.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/DateFilter.h,src/core/CLucene/search/DateFilter.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/Explanation.h,src/core/CLucene/search/Explanation.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/Hits.h,src/core/CLucene/search/Hits.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/IndexSearcher.h,src/core/CLucene/search/IndexSearcher.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/FilteredTermEnum.h,src/core/CLucene/search/FilteredTermEnum.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/FuzzyQuery.h,src/core/CLucene/search/FuzzyQuery.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/MultiSearcher.h,src/core/CLucene/search/MultiSearcher.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/MultiTermQuery.h,src/core/CLucene/search/MultiTermQuery.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/Searchable.h,src/core/CLucene/search/Searchable.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/SearchHeader.h,src/core/CLucene/search/SearchHeader.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/Similarity.h,src/core/CLucene/search/Similarity.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/Sort.h,src/core/CLucene/search/Sort.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/spans/SpanTermQuery.h,src/core/CLucene/search/spans/SpanTermQuery.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/spans/SpanQuery.h,src/core/CLucene/search/spans/SpanQuery.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/spans/SpanNotQuery.h,src/core/CLucene/search/spans/SpanNotQuery.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/spans/SpanScorer.h,src/core/CLucene/search/spans/SpanScorer.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/spans/SpanFirstQuery.h,src/core/CLucene/search/spans/SpanFirstQuery.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/spans/SpanNearQuery.h,src/core/CLucene/search/spans/SpanNearQuery.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/spans/SpanOrQuery.h,src/core/CLucene/search/spans/SpanOrQuery.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/spans/Spans.h,src/core/CLucene/search/spans/Spans.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/spans/SpanWeight.h,src/core/CLucene/search/spans/SpanWeight.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/Filter.h,src/core/CLucene/search/Filter.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/FieldSortedHitQueue.h,src/core/CLucene/search/FieldSortedHitQueue.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/PhraseQuery.h,src/core/CLucene/search/PhraseQuery.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/PrefixQuery.h,src/core/CLucene/search/PrefixQuery.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/Query.h,src/core/CLucene/search/Query.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/RangeQuery.h,src/core/CLucene/search/RangeQuery.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/SpanQueryFilter.h,src/core/CLucene/search/SpanQueryFilter.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/TermQuery.h,src/core/CLucene/search/TermQuery.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/MultiPhraseQuery.h,src/core/CLucene/search/MultiPhraseQuery.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/search/WildcardQuery.h,src/core/CLucene/search/WildcardQuery.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/CLConfig.h,src/core/CLucene/CLConfig.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/util/VoidList.h,src/core/CLucene/util/VoidList.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/util/Reader.h,src/core/CLucene/util/Reader.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/util/VoidMap.h,src/core/CLucene/util/VoidMap.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/util/CLStreams.h,src/core/CLucene/util/CLStreams.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/util/Array.h,src/core/CLucene/util/Array.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/util/PriorityQueue.h,src/core/CLucene/util/PriorityQueue.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/util/BitSet.h,src/core/CLucene/util/BitSet.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/util/Equators.h,src/core/CLucene/util/Equators.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/queryParser/QueryParserConstants.h,src/core/CLucene/queryParser/QueryParserConstants.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/queryParser/QueryToken.h,src/core/CLucene/queryParser/QueryToken.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/queryParser/legacy/QueryToken.h,src/core/CLucene/queryParser/legacy/QueryToken.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/queryParser/legacy/MultiFieldQueryParser.h,src/core/CLucene/queryParser/legacy/MultiFieldQueryParser.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/queryParser/legacy/QueryParser.h,src/core/CLucene/queryParser/legacy/QueryParser.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/queryParser/MultiFieldQueryParser.h,src/core/CLucene/queryParser/MultiFieldQueryParser.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/queryParser/QueryParserTokenManager.h,src/core/CLucene/queryParser/QueryParserTokenManager.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/queryParser/QueryParser.h,src/core/CLucene/queryParser/QueryParser.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/LuceneThreads.h,src/shared/CLucene/LuceneThreads.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/store/LockFactory.h,src/core/CLucene/store/LockFactory.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/store/Lock.h,src/core/CLucene/store/Lock.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/store/Directory.h,src/core/CLucene/store/Directory.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/store/RAMDirectory.h,src/core/CLucene/store/RAMDirectory.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/store/IndexInput.h,src/core/CLucene/store/IndexInput.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/store/FSDirectory.h,src/core/CLucene/store/FSDirectory.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/store/IndexOutput.h,src/core/CLucene/store/IndexOutput.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/StdHeader.h,src/core/CLucene/StdHeader.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/debug/error.h,src/core/CLucene/debug/error.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/debug/mem.h,src/core/CLucene/debug/mem.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/debug/lucenebase.h,src/core/CLucene/debug/lucenebase.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/analysis/CachingTokenFilter.h,src/core/CLucene/analysis/CachingTokenFilter.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/analysis/AnalysisHeader.h,src/core/CLucene/analysis/AnalysisHeader.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/analysis/Analyzers.h,src/core/CLucene/analysis/Analyzers.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/analysis/standard/StandardTokenizer.h,src/core/CLucene/analysis/standard/StandardTokenizer.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/analysis/standard/StandardFilter.h,src/core/CLucene/analysis/standard/StandardFilter.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/analysis/standard/StandardTokenizerConstants.h,src/core/CLucene/analysis/standard/StandardTokenizerConstants.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/analysis/standard/StandardAnalyzer.h,src/core/CLucene/analysis/standard/StandardAnalyzer.h)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,clucene_inc,inc/external/CLucene/analysis/LanguageBasedAnalyzer.h,src/contribs-lib/CLucene/analysis/LanguageBasedAnalyzer.h)) + +# vim: set noet sw=4 ts=4: diff --git a/clucene/Module_clucene.mk b/clucene/Module_clucene.mk index 7228ac0122da..c6ee114d18c2 100644 --- a/clucene/Module_clucene.mk +++ b/clucene/Module_clucene.mk @@ -30,8 +30,8 @@ $(eval $(call gb_Module_Module,clucene)) ifeq ($(SYSTEM_CLUCENE),NO) ifneq ($(OS),ANDROID) $(eval $(call gb_Module_add_targets,clucene,\ + ExternalPackage_clucene \ Library_clucene \ - Package_source \ UnpackedTarball_clucene \ )) endif diff --git a/clucene/Package_source.mk b/clucene/Package_source.mk deleted file mode 100644 index 331c9e3b7153..000000000000 --- a/clucene/Package_source.mk +++ /dev/null @@ -1,125 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., Caolán McNamara -# (initial developer) -# Copyright (C) 2012 Red Hat, Inc., David Tardon -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Package_Package,clucene_source,$(call gb_UnpackedTarball_get_dir,clucene))) - -$(eval $(call gb_Package_use_unpacked,clucene_source,clucene)) - -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene.h,src/core/CLucene.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/clucene-config.h,src/shared/CLucene/clucene-config.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/SharedHeader.h,src/shared/CLucene/SharedHeader.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/document/DateField.h,src/core/CLucene/document/DateField.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/document/DateTools.h,src/core/CLucene/document/DateTools.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/document/Document.h,src/core/CLucene/document/Document.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/document/Field.h,src/core/CLucene/document/Field.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/document/NumberTools.h,src/core/CLucene/document/NumberTools.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/DirectoryIndexReader.h,src/core/CLucene/index/DirectoryIndexReader.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/Terms.h,src/core/CLucene/index/Terms.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/IndexDeletionPolicy.h,src/core/CLucene/index/IndexDeletionPolicy.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/MultipleTermPositions.h,src/core/CLucene/index/MultipleTermPositions.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/Term.h,src/core/CLucene/index/Term.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/IndexModifier.h,src/core/CLucene/index/IndexModifier.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/Payload.h,src/core/CLucene/index/Payload.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/MultiReader.h,src/core/CLucene/index/MultiReader.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/MergeScheduler.h,src/core/CLucene/index/MergeScheduler.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/TermVector.h,src/core/CLucene/index/TermVector.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/MergePolicy.h,src/core/CLucene/index/MergePolicy.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/IndexReader.h,src/core/CLucene/index/IndexReader.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/index/IndexWriter.h,src/core/CLucene/index/IndexWriter.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/BooleanClause.h,src/core/CLucene/search/BooleanClause.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/BooleanQuery.h,src/core/CLucene/search/BooleanQuery.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/DateFilter.h,src/core/CLucene/search/DateFilter.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/Explanation.h,src/core/CLucene/search/Explanation.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/Hits.h,src/core/CLucene/search/Hits.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/IndexSearcher.h,src/core/CLucene/search/IndexSearcher.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/FilteredTermEnum.h,src/core/CLucene/search/FilteredTermEnum.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/FuzzyQuery.h,src/core/CLucene/search/FuzzyQuery.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/MultiSearcher.h,src/core/CLucene/search/MultiSearcher.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/MultiTermQuery.h,src/core/CLucene/search/MultiTermQuery.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/Searchable.h,src/core/CLucene/search/Searchable.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/SearchHeader.h,src/core/CLucene/search/SearchHeader.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/Similarity.h,src/core/CLucene/search/Similarity.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/Sort.h,src/core/CLucene/search/Sort.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/spans/SpanTermQuery.h,src/core/CLucene/search/spans/SpanTermQuery.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/spans/SpanQuery.h,src/core/CLucene/search/spans/SpanQuery.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/spans/SpanNotQuery.h,src/core/CLucene/search/spans/SpanNotQuery.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/spans/SpanScorer.h,src/core/CLucene/search/spans/SpanScorer.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/spans/SpanFirstQuery.h,src/core/CLucene/search/spans/SpanFirstQuery.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/spans/SpanNearQuery.h,src/core/CLucene/search/spans/SpanNearQuery.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/spans/SpanOrQuery.h,src/core/CLucene/search/spans/SpanOrQuery.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/spans/Spans.h,src/core/CLucene/search/spans/Spans.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/spans/SpanWeight.h,src/core/CLucene/search/spans/SpanWeight.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/Filter.h,src/core/CLucene/search/Filter.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/FieldSortedHitQueue.h,src/core/CLucene/search/FieldSortedHitQueue.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/PhraseQuery.h,src/core/CLucene/search/PhraseQuery.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/PrefixQuery.h,src/core/CLucene/search/PrefixQuery.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/Query.h,src/core/CLucene/search/Query.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/RangeQuery.h,src/core/CLucene/search/RangeQuery.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/SpanQueryFilter.h,src/core/CLucene/search/SpanQueryFilter.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/TermQuery.h,src/core/CLucene/search/TermQuery.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/MultiPhraseQuery.h,src/core/CLucene/search/MultiPhraseQuery.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/search/WildcardQuery.h,src/core/CLucene/search/WildcardQuery.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/CLConfig.h,src/core/CLucene/CLConfig.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/util/VoidList.h,src/core/CLucene/util/VoidList.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/util/Reader.h,src/core/CLucene/util/Reader.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/util/VoidMap.h,src/core/CLucene/util/VoidMap.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/util/CLStreams.h,src/core/CLucene/util/CLStreams.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/util/Array.h,src/core/CLucene/util/Array.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/util/PriorityQueue.h,src/core/CLucene/util/PriorityQueue.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/util/BitSet.h,src/core/CLucene/util/BitSet.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/util/Equators.h,src/core/CLucene/util/Equators.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/queryParser/QueryParserConstants.h,src/core/CLucene/queryParser/QueryParserConstants.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/queryParser/QueryToken.h,src/core/CLucene/queryParser/QueryToken.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/queryParser/legacy/QueryToken.h,src/core/CLucene/queryParser/legacy/QueryToken.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/queryParser/legacy/MultiFieldQueryParser.h,src/core/CLucene/queryParser/legacy/MultiFieldQueryParser.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/queryParser/legacy/QueryParser.h,src/core/CLucene/queryParser/legacy/QueryParser.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/queryParser/MultiFieldQueryParser.h,src/core/CLucene/queryParser/MultiFieldQueryParser.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/queryParser/QueryParserTokenManager.h,src/core/CLucene/queryParser/QueryParserTokenManager.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/queryParser/QueryParser.h,src/core/CLucene/queryParser/QueryParser.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/LuceneThreads.h,src/shared/CLucene/LuceneThreads.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/store/LockFactory.h,src/core/CLucene/store/LockFactory.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/store/Lock.h,src/core/CLucene/store/Lock.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/store/Directory.h,src/core/CLucene/store/Directory.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/store/RAMDirectory.h,src/core/CLucene/store/RAMDirectory.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/store/IndexInput.h,src/core/CLucene/store/IndexInput.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/store/FSDirectory.h,src/core/CLucene/store/FSDirectory.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/store/IndexOutput.h,src/core/CLucene/store/IndexOutput.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/StdHeader.h,src/core/CLucene/StdHeader.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/debug/error.h,src/core/CLucene/debug/error.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/debug/mem.h,src/core/CLucene/debug/mem.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/debug/lucenebase.h,src/core/CLucene/debug/lucenebase.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/analysis/CachingTokenFilter.h,src/core/CLucene/analysis/CachingTokenFilter.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/analysis/AnalysisHeader.h,src/core/CLucene/analysis/AnalysisHeader.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/analysis/Analyzers.h,src/core/CLucene/analysis/Analyzers.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/analysis/standard/StandardTokenizer.h,src/core/CLucene/analysis/standard/StandardTokenizer.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/analysis/standard/StandardFilter.h,src/core/CLucene/analysis/standard/StandardFilter.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/analysis/standard/StandardTokenizerConstants.h,src/core/CLucene/analysis/standard/StandardTokenizerConstants.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/analysis/standard/StandardAnalyzer.h,src/core/CLucene/analysis/standard/StandardAnalyzer.h)) -$(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/analysis/LanguageBasedAnalyzer.h,src/contribs-lib/CLucene/analysis/LanguageBasedAnalyzer.h)) - -# vim: set noet sw=4 ts=4: diff --git a/libcdr/Package_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk similarity index 65% rename from libcdr/Package_libcdr.mk rename to libcdr/ExternalPackage_libcdr.mk index e7d21bcba5b6..c2c12dcf615d 100644 --- a/libcdr/Package_libcdr.mk +++ b/libcdr/ExternalPackage_libcdr.mk @@ -7,11 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,libcdr_inc,$(call gb_UnpackedTarball_get_dir,cdr/src/lib))) +$(eval $(call gb_ExternalPackage_ExternalPackage,libcdr_inc,cdr)) -$(eval $(call gb_Package_use_unpacked,libcdr_inc,cdr)) - -$(eval $(call gb_Package_add_files,libcdr_inc,inc/external/libcdr,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr_inc,inc/external/libcdr,\ libcdr.h \ CDRDocument.h \ CDRStringVector.h \ diff --git a/libcdr/Module_libcdr.mk b/libcdr/Module_libcdr.mk index 6fb369ab0eca..b02dc270cca5 100644 --- a/libcdr/Module_libcdr.mk +++ b/libcdr/Module_libcdr.mk @@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libcdr)) ifeq ($(SYSTEM_LIBCDR),NO) $(eval $(call gb_Module_add_targets,libcdr,\ - Package_libcdr \ + ExternalPackage_libcdr \ StaticLibrary_cdr \ UnpackedTarball_cdr \ )) diff --git a/libcmis/Package_libcmis.mk b/libcmis/ExternalPackage_libcmis.mk similarity index 72% rename from libcmis/Package_libcmis.mk rename to libcmis/ExternalPackage_libcmis.mk index c8c8fbefeb56..7b0ba011a43e 100644 --- a/libcmis/Package_libcmis.mk +++ b/libcmis/ExternalPackage_libcmis.mk @@ -7,11 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,libcmis_inc,$(call gb_UnpackedTarball_get_dir,cmis/src/libcmis))) +$(eval $(call gb_ExternalPackage_ExternalPackage,libcmis_inc,cmis)) -$(eval $(call gb_Package_use_unpacked,libcmis_inc,cmis)) - -$(eval $(call gb_Package_add_files,libcmis_inc,inc/external/libcmis,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,libcmis_inc,inc/external/libcmis,\ allowable-actions.hxx \ document.hxx \ exception.hxx \ diff --git a/libcmis/Module_libcmis.mk b/libcmis/Module_libcmis.mk index c2c09f0f489a..5c440092f058 100644 --- a/libcmis/Module_libcmis.mk +++ b/libcmis/Module_libcmis.mk @@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libcmis)) ifeq ($(SYSTEM_LIBCMIS),NO) $(eval $(call gb_Module_add_targets,libcmis,\ - Package_libcmis \ + ExternalPackage_libcmis \ StaticLibrary_cmis \ UnpackedTarball_cmis \ )) diff --git a/libmspub/Package_libmspub.mk b/libmspub/ExternalPackage_libmspub.mk similarity index 64% rename from libmspub/Package_libmspub.mk rename to libmspub/ExternalPackage_libmspub.mk index af25dc129c74..2b834cf3a062 100644 --- a/libmspub/Package_libmspub.mk +++ b/libmspub/ExternalPackage_libmspub.mk @@ -7,11 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,libmspub_inc,$(call gb_UnpackedTarball_get_dir,mspub/src/lib))) +$(eval $(call gb_ExternalPackage_ExternalPackage,libmspub_inc,mspub)) -$(eval $(call gb_Package_use_unpacked,libmspub_inc,mspub)) - -$(eval $(call gb_Package_add_files,libmspub_inc,inc/external/libmspub,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,libmspub_inc,inc/external/libmspub,\ libmspub.h \ MSPUBDocument.h \ MSPUBStringVector.h \ diff --git a/libmspub/Module_libmspub.mk b/libmspub/Module_libmspub.mk index d81abdd60f29..0106a9f27f71 100644 --- a/libmspub/Module_libmspub.mk +++ b/libmspub/Module_libmspub.mk @@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libmspub)) ifeq ($(SYSTEM_LIBMSPUB),NO) $(eval $(call gb_Module_add_targets,libmspub,\ - Package_libmspub \ + ExternalPackage_libmspub \ StaticLibrary_mspub \ UnpackedTarball_mspub \ )) diff --git a/libpng/Package_libpng.mk b/libpng/ExternalPackage_libpng.mk similarity index 65% rename from libpng/Package_libpng.mk rename to libpng/ExternalPackage_libpng.mk index 0bda07dcf6bd..6fb731da2b4c 100644 --- a/libpng/Package_libpng.mk +++ b/libpng/ExternalPackage_libpng.mk @@ -7,11 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,libpng_inc,$(call gb_UnpackedTarball_get_dir,png))) +$(eval $(call gb_ExternalPackage_ExternalPackage,libpng_inc,png)) -$(eval $(call gb_Package_use_unpacked,libpng_inc,png)) - -$(eval $(call gb_Package_add_files,libpng_inc,inc/external/libpng,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,libpng_inc,inc/external/libpng,\ png.h \ pngconf.h \ pnglibconf.h \ diff --git a/libpng/Module_libpng.mk b/libpng/Module_libpng.mk index a3ecb7baef64..6ee8e4cf4d58 100644 --- a/libpng/Module_libpng.mk +++ b/libpng/Module_libpng.mk @@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libpng)) ifeq ($(SYSTEM_LIBPNG),NO) $(eval $(call gb_Module_add_targets,libpng,\ - Package_libpng \ + ExternalPackage_libpng \ StaticLibrary_png \ UnpackedTarball_png \ )) diff --git a/libvisio/Package_libvisio.mk b/libvisio/ExternalPackage_libvisio.mk similarity index 55% rename from libvisio/Package_libvisio.mk rename to libvisio/ExternalPackage_libvisio.mk index 54bb8f416c0c..a876f149eee1 100644 --- a/libvisio/Package_libvisio.mk +++ b/libvisio/ExternalPackage_libvisio.mk @@ -7,14 +7,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,libvisio_inc,$(call gb_UnpackedTarball_get_dir,visio/src/lib))) +$(eval $(call gb_ExternalPackage_ExternalPackage,libvisio_inc,visio)) -$(eval $(call gb_Package_use_unpacked,libvisio_inc,visio)) - -$(eval $(call gb_Package_add_files,libvisio_inc,inc/external/libvisio,\ - libvisio.h \ - VisioDocument.h \ - VSDStringVector.h \ +$(eval $(call gb_ExternalPackage_add_unpacked_files,libvisio_inc,inc/external/libvisio,\ + src/lib/libvisio.h \ + src/lib/VisioDocument.h \ + src/lib/VSDStringVector.h \ )) # vim: set noet sw=4 ts=4: diff --git a/libvisio/Module_libvisio.mk b/libvisio/Module_libvisio.mk index 6c4190d7251f..9e1309cf5701 100644 --- a/libvisio/Module_libvisio.mk +++ b/libvisio/Module_libvisio.mk @@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libvisio)) ifeq ($(SYSTEM_LIBVISIO),NO) $(eval $(call gb_Module_add_targets,libvisio,\ - Package_libvisio \ + ExternalPackage_libvisio \ StaticLibrary_visio \ UnpackedTarball_visio \ )) diff --git a/libwpd/Package_libwpd.mk b/libwpd/ExternalPackage_libwpd.mk similarity index 66% rename from libwpd/Package_libwpd.mk rename to libwpd/ExternalPackage_libwpd.mk index 331a7d1490a3..72eb4c5e30a6 100644 --- a/libwpd/Package_libwpd.mk +++ b/libwpd/ExternalPackage_libwpd.mk @@ -7,11 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,libwpd_inc,$(call gb_UnpackedTarball_get_dir,wpd/src/lib))) +$(eval $(call gb_ExternalPackage_ExternalPackage,libwpd_inc,wpd)) -$(eval $(call gb_Package_use_unpacked,libwpd_inc,wpd)) - -$(eval $(call gb_Package_add_files,libwpd_inc,inc/external/libwpd,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd_inc,inc/external/libwpd,\ libwpd.h \ WPDocument.h \ WPXBinaryData.h \ @@ -22,7 +20,7 @@ $(eval $(call gb_Package_add_files,libwpd_inc,inc/external/libwpd,\ WPXPropertyListVector.h \ )) -$(eval $(call gb_Package_add_files,libwpd_inc,inc/external/libwpd-stream,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd_inc,inc/external/libwpd-stream,\ libwpd-stream.h \ WPXStream.h \ WPXStreamImplementation.h \ diff --git a/libwpd/Module_libwpd.mk b/libwpd/Module_libwpd.mk index fd0d0bb0685a..74ff85e19a38 100644 --- a/libwpd/Module_libwpd.mk +++ b/libwpd/Module_libwpd.mk @@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libwpd)) ifeq ($(SYSTEM_LIBWPD),NO) $(eval $(call gb_Module_add_targets,libwpd,\ - Package_libwpd \ + ExternalPackage_libwpd \ StaticLibrary_wpd \ UnpackedTarball_wpd \ )) diff --git a/libwpg/Package_libwpg.mk b/libwpg/ExternalPackage_libwpg.mk similarity index 65% rename from libwpg/Package_libwpg.mk rename to libwpg/ExternalPackage_libwpg.mk index 6a1f6a4a3b99..34cd932fcd62 100644 --- a/libwpg/Package_libwpg.mk +++ b/libwpg/ExternalPackage_libwpg.mk @@ -7,11 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,libwpg_inc,$(call gb_UnpackedTarball_get_dir,wpg/src/lib))) +$(eval $(call gb_ExternalPackage_ExternalPackage,libwpg_inc,wpg)) -$(eval $(call gb_Package_use_unpacked,libwpg_inc,wpg)) - -$(eval $(call gb_Package_add_files,libwpg_inc,inc/external/libwpg,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpg_inc,inc/external/libwpg,\ libwpg.h \ WPGPaintInterface.h \ WPGraphics.h \ diff --git a/libwpg/Module_libwpg.mk b/libwpg/Module_libwpg.mk index 9e271dc08511..e628b89cda8c 100644 --- a/libwpg/Module_libwpg.mk +++ b/libwpg/Module_libwpg.mk @@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libwpg)) ifeq ($(SYSTEM_LIBWPG),NO) $(eval $(call gb_Module_add_targets,libwpg,\ - Package_libwpg \ + ExternalPackage_libwpg \ StaticLibrary_wpg \ UnpackedTarball_wpg \ )) diff --git a/libwps/Package_libwps.mk b/libwps/ExternalPackage_libwps.mk similarity index 63% rename from libwps/Package_libwps.mk rename to libwps/ExternalPackage_libwps.mk index 6ebee913b92d..102453780f89 100644 --- a/libwps/Package_libwps.mk +++ b/libwps/ExternalPackage_libwps.mk @@ -7,11 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,libwps_inc,$(call gb_UnpackedTarball_get_dir,wps/src/lib))) +$(eval $(call gb_ExternalPackage_ExternalPackage,libwps_inc,wps)) -$(eval $(call gb_Package_use_unpacked,libwps_inc,wps)) - -$(eval $(call gb_Package_add_files,libwps_inc,inc/external/libwps,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,libwps_inc,inc/external/libwps,\ libwps.h \ WPSDocument.h \ )) diff --git a/libwps/Module_libwps.mk b/libwps/Module_libwps.mk index aacdb0e274b5..a903fa955389 100644 --- a/libwps/Module_libwps.mk +++ b/libwps/Module_libwps.mk @@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,libwps)) ifeq ($(SYSTEM_LIBWPS),NO) $(eval $(call gb_Module_add_targets,libwps,\ - Package_libwps \ + ExternalPackage_libwps \ StaticLibrary_wps \ UnpackedTarball_wps \ ))