From b1cbf8f767ff5f120e6bb3b3adf88002ec9e919e Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 26 Feb 2013 23:43:31 +0100 Subject: salhelper: new ZipPackage_salhelper_odk_headers Change-Id: I83172bd105496dd1af8090a01ebfac864958e20c --- salhelper/CustomTarget_salhelper_allheaders.mk | 6 ++-- salhelper/Library_salhelper.mk | 2 +- salhelper/Module_salhelper.mk | 2 +- salhelper/Package_inc.mk | 40 ------------------------ salhelper/ZipPackage_salhelper_odk_headers.mk | 42 ++++++++++++++++++++++++++ 5 files changed, 48 insertions(+), 44 deletions(-) delete mode 100644 salhelper/Package_inc.mk create mode 100644 salhelper/ZipPackage_salhelper_odk_headers.mk (limited to 'salhelper') diff --git a/salhelper/CustomTarget_salhelper_allheaders.mk b/salhelper/CustomTarget_salhelper_allheaders.mk index 2ec5a62229cd..60498aab3da0 100644 --- a/salhelper/CustomTarget_salhelper_allheaders.mk +++ b/salhelper/CustomTarget_salhelper_allheaders.mk @@ -32,10 +32,12 @@ salhelper_allheaders_DIR := $(call gb_CustomTarget_get_workdir,salhelper/allhead $(call gb_CustomTarget_get_target,salhelper/allheaders) : \ $(salhelper_allheaders_DIR)/salhelper_allheaders.hxx -# dependency on Package_inc.mk should ensure this is updated whenever a new public header is added +# dependency on Package_salhelper_odk_headers.mk should ensure this is +# updated whenever a new public header is added $(salhelper_allheaders_DIR)/salhelper_allheaders.hxx : \ $(SRCDIR)/salhelper/CustomTarget_salhelper_allheaders.mk \ - | $(salhelper_allheaders_DIR)/.dir $(SRCDIR)/salhelper/Package_inc.mk + $(SRCDIR)/salhelper/ZipPackage_salhelper_odk_headers.mk \ + | $(salhelper_allheaders_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) printf '// Generated list of all salhelper/ includes\n' > $@ $(foreach file, $(wildcard $(SRCDIR)/salhelper/inc/*.h) $(wildcard $(SRCDIR)/salhelper/inc/*.hxx) \ diff --git a/salhelper/Library_salhelper.mk b/salhelper/Library_salhelper.mk index 7c66678cbf4d..26c90dcd81c6 100644 --- a/salhelper/Library_salhelper.mk +++ b/salhelper/Library_salhelper.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,salhelper)) -$(eval $(call gb_Library_use_package,salhelper,salhelper_inc)) +$(eval $(call gb_Library_use_package,salhelper,salhelper_odk_headers)) $(eval $(call gb_Library_add_defs,salhelper,\ -DSALHELPER_DLLIMPLEMENTATION \ diff --git a/salhelper/Module_salhelper.mk b/salhelper/Module_salhelper.mk index 699fbed11eec..31f3f22feff2 100644 --- a/salhelper/Module_salhelper.mk +++ b/salhelper/Module_salhelper.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Module_Module,salhelper)) $(eval $(call gb_Module_add_targets,salhelper,\ CustomTarget_salhelper_allheaders \ Library_salhelper \ - Package_inc \ + ZipPackage_salhelper_odk_headers \ )) $(eval $(call gb_Module_add_check_targets,salhelper,\ diff --git a/salhelper/Package_inc.mk b/salhelper/Package_inc.mk deleted file mode 100644 index 7a30c7fc967d..000000000000 --- a/salhelper/Package_inc.mk +++ /dev/null @@ -1,40 +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_Package_Package,salhelper_inc,$(SRCDIR)/salhelper/inc/salhelper)) - -$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/salhelperdllapi.h,salhelperdllapi.h)) -$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/condition.hxx,condition.hxx)) -$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/dynload.hxx,dynload.hxx)) -$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/linkhelper.hxx,linkhelper.hxx)) -$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/refobj.hxx,refobj.hxx)) -$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/simplereferenceobject.hxx,simplereferenceobject.hxx)) -$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/singletonref.hxx,singletonref.hxx)) -$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/thread.hxx,thread.hxx)) -$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/timer.hxx,timer.hxx)) - -# vim: set noet sw=4 ts=4: diff --git a/salhelper/ZipPackage_salhelper_odk_headers.mk b/salhelper/ZipPackage_salhelper_odk_headers.mk new file mode 100644 index 000000000000..8de4d5ffc1a7 --- /dev/null +++ b/salhelper/ZipPackage_salhelper_odk_headers.mk @@ -0,0 +1,42 @@ +# -*- 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,salhelper_odk_headers,$(SRCDIR)/salhelper/inc/salhelper)) + +$(eval $(call gb_ZipPackage_add_files,salhelper_odk_headers,inc/salhelper,include/salhelper,\ + salhelperdllapi.h \ + condition.hxx \ + dynload.hxx \ + linkhelper.hxx \ + refobj.hxx \ + simplereferenceobject.hxx \ + singletonref.hxx \ + thread.hxx \ + timer.hxx \ +)) + +# vim: set noet sw=4 ts=4: -- cgit