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 --- salhelper/CustomTarget_salhelper_allheaders.mk | 2 +- salhelper/Module_salhelper.mk | 2 +- salhelper/Package_salhelper_odk_headers.mk | 44 ++++++++++++++++++++++++++ salhelper/ZipPackage_salhelper_odk_headers.mk | 42 ------------------------ 4 files changed, 46 insertions(+), 44 deletions(-) create mode 100644 salhelper/Package_salhelper_odk_headers.mk delete 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 60498aab3da0..fd2e8d076904 100644 --- a/salhelper/CustomTarget_salhelper_allheaders.mk +++ b/salhelper/CustomTarget_salhelper_allheaders.mk @@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_target,salhelper/allheaders) : \ # updated whenever a new public header is added $(salhelper_allheaders_DIR)/salhelper_allheaders.hxx : \ $(SRCDIR)/salhelper/CustomTarget_salhelper_allheaders.mk \ - $(SRCDIR)/salhelper/ZipPackage_salhelper_odk_headers.mk \ + $(SRCDIR)/salhelper/Package_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' > $@ diff --git a/salhelper/Module_salhelper.mk b/salhelper/Module_salhelper.mk index 31f3f22feff2..7ba68a90c4fa 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 \ - ZipPackage_salhelper_odk_headers \ + Package_salhelper_odk_headers \ )) $(eval $(call gb_Module_add_check_targets,salhelper,\ diff --git a/salhelper/Package_salhelper_odk_headers.mk b/salhelper/Package_salhelper_odk_headers.mk new file mode 100644 index 000000000000..89ae6148a477 --- /dev/null +++ b/salhelper/Package_salhelper_odk_headers.mk @@ -0,0 +1,44 @@ +# -*- 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_odk_headers,$(SRCDIR)/salhelper/inc/salhelper)) + +$(eval $(call gb_Package_set_outdir,salhelper_odk_headers,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,salhelper_odk_headers,$(gb_Package_SDKDIRNAME)/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: diff --git a/salhelper/ZipPackage_salhelper_odk_headers.mk b/salhelper/ZipPackage_salhelper_odk_headers.mk deleted file mode 100644 index 8de4d5ffc1a7..000000000000 --- a/salhelper/ZipPackage_salhelper_odk_headers.mk +++ /dev/null @@ -1,42 +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,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 v1.2.3