From d3e93f256e5125b0948c89943b6c9bde6aa0d125 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 12 Apr 2013 12:08:03 +0200 Subject: install SDK headers from filelists ... which allows us to drop gb_ZipPackage. Change-Id: Ib19f774c63d9b83ec07e99f963533eee431cc53a --- cppu/CustomTarget_cppu_allheaders.mk | 2 +- cppu/Module_cppu.mk | 2 +- cppu/Package_cppu_odk_headers.mk | 85 ++++++++++++++++++++++++++++++++++++ cppu/ZipPackage_cppu_odk_headers.mk | 83 ----------------------------------- 4 files changed, 87 insertions(+), 85 deletions(-) create mode 100644 cppu/Package_cppu_odk_headers.mk delete mode 100644 cppu/ZipPackage_cppu_odk_headers.mk (limited to 'cppu') diff --git a/cppu/CustomTarget_cppu_allheaders.mk b/cppu/CustomTarget_cppu_allheaders.mk index 6d5ebeba49f2..f7573f7e7c38 100644 --- a/cppu/CustomTarget_cppu_allheaders.mk +++ b/cppu/CustomTarget_cppu_allheaders.mk @@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_target,cppu/allheaders) : \ # updated whenever a new public header is added $(cppu_allheaders_DIR)/cppu_allheaders.hxx : \ $(SRCDIR)/cppu/CustomTarget_cppu_allheaders.mk \ - $(SRCDIR)/cppu/ZipPackage_cppu_odk_headers.mk \ + $(SRCDIR)/cppu/Package_cppu_odk_headers.mk \ | $(cppu_allheaders_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) printf '// Generated list of all cppu/ includes\n' > $@ diff --git a/cppu/Module_cppu.mk b/cppu/Module_cppu.mk index 6a5bf3276ee8..c957320361a8 100644 --- a/cppu/Module_cppu.mk +++ b/cppu/Module_cppu.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Module_add_targets,cppu,\ Library_log_uno \ Library_purpenvhelper \ Library_unsafe_uno \ - ZipPackage_cppu_odk_headers \ + Package_cppu_odk_headers \ )) $(eval $(call gb_Module_add_check_targets,cppu,\ diff --git a/cppu/Package_cppu_odk_headers.mk b/cppu/Package_cppu_odk_headers.mk new file mode 100644 index 000000000000..3b203fc29769 --- /dev/null +++ b/cppu/Package_cppu_odk_headers.mk @@ -0,0 +1,85 @@ +# -*- Mode: makefile; 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) 2011 Matúš Kukan +# +# 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,cppu_odk_headers,$(SRCDIR)/cppu/inc)) + +$(eval $(call gb_Package_set_outdir,cppu_odk_headers,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/com/sun/star/uno,\ + com/sun/star/uno/Any.h \ + com/sun/star/uno/Any.hxx \ + com/sun/star/uno/genfunc.h \ + com/sun/star/uno/genfunc.hxx \ + com/sun/star/uno/Reference.h \ + com/sun/star/uno/Reference.hxx \ + com/sun/star/uno/Sequence.h \ + com/sun/star/uno/Sequence.hxx \ + com/sun/star/uno/Type.h \ + com/sun/star/uno/Type.hxx \ +)) + +$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/cppu,\ + cppu/cppudllapi.h \ + cppu/EnvDcp.hxx \ + cppu/Enterable.hxx \ + cppu/EnvGuards.hxx \ + cppu/macros.hxx \ + cppu/Map.hxx \ + cppu/unotype.hxx \ +)) + +$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/cppu/helper/purpenv/,\ + cppu/helper/purpenv/Environment.hxx \ + cppu/helper/purpenv/Mapping.hxx \ +)) + +$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/typelib,\ + typelib/typeclass.h \ + typelib/typedescription.h \ + typelib/typedescription.hxx \ + typelib/uik.h \ +)) + +$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/uno,\ + uno/any2.h \ + uno/current_context.h \ + uno/current_context.hxx \ + uno/data.h \ + uno/dispatcher.h \ + uno/dispatcher.hxx \ + uno/Enterable.h \ + uno/EnvDcp.h \ + uno/environment.h \ + uno/environment.hxx \ + uno/lbnames.h \ + uno/mapping.h \ + uno/mapping.hxx \ + uno/sequence2.h \ + uno/threadpool.h \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/cppu/ZipPackage_cppu_odk_headers.mk b/cppu/ZipPackage_cppu_odk_headers.mk deleted file mode 100644 index 0b7c9dca7ece..000000000000 --- a/cppu/ZipPackage_cppu_odk_headers.mk +++ /dev/null @@ -1,83 +0,0 @@ -# -*- Mode: makefile; 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) 2011 Matúš Kukan -# -# 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_ZipPackage_ZipPackage,cppu_odk_headers,$(SRCDIR)/cppu/inc)) - -$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/com/sun/star/uno,include/com/sun/star/uno,\ - com/sun/star/uno/Any.h \ - com/sun/star/uno/Any.hxx \ - com/sun/star/uno/genfunc.h \ - com/sun/star/uno/genfunc.hxx \ - com/sun/star/uno/Reference.h \ - com/sun/star/uno/Reference.hxx \ - com/sun/star/uno/Sequence.h \ - com/sun/star/uno/Sequence.hxx \ - com/sun/star/uno/Type.h \ - com/sun/star/uno/Type.hxx \ -)) - -$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/cppu,include/cppu,\ - cppu/cppudllapi.h \ - cppu/EnvDcp.hxx \ - cppu/Enterable.hxx \ - cppu/EnvGuards.hxx \ - cppu/macros.hxx \ - cppu/Map.hxx \ - cppu/unotype.hxx \ -)) - -$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/cppu/helper/purpenv/,include/cppu/helper/purpenv/,\ - cppu/helper/purpenv/Environment.hxx \ - cppu/helper/purpenv/Mapping.hxx \ -)) - -$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/typelib,include/typelib,\ - typelib/typeclass.h \ - typelib/typedescription.h \ - typelib/typedescription.hxx \ - typelib/uik.h \ -)) - -$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/uno,include/uno,\ - uno/any2.h \ - uno/current_context.h \ - uno/current_context.hxx \ - uno/data.h \ - uno/dispatcher.h \ - uno/dispatcher.hxx \ - uno/Enterable.h \ - uno/EnvDcp.h \ - uno/environment.h \ - uno/environment.hxx \ - uno/lbnames.h \ - uno/mapping.h \ - uno/mapping.hxx \ - uno/sequence2.h \ - uno/threadpool.h \ -)) - -# vim: set noet sw=4 ts=4: -- cgit