From 5c60cebafdc6d6d773c794c0a4ee58d63782df22 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 27 Feb 2013 00:23:07 +0100 Subject: store: new ZipPackage_store_odk_headers Change-Id: I2d4e2853014ef30419a66c8f9b2675b92d60adb6 --- store/Library_store.mk | 2 +- store/Module_store.mk | 2 +- store/Package_inc.mk | 34 --------------------------------- store/ZipPackage_store_odk_headers.mk | 36 +++++++++++++++++++++++++++++++++++ 4 files changed, 38 insertions(+), 36 deletions(-) delete mode 100644 store/Package_inc.mk create mode 100644 store/ZipPackage_store_odk_headers.mk (limited to 'store') diff --git a/store/Library_store.mk b/store/Library_store.mk index f66c1ebce6db..09546926fe03 100644 --- a/store/Library_store.mk +++ b/store/Library_store.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,store)) $(eval $(call gb_Library_set_soversion_script,store,3,$(SRCDIR)/store/util/store.map)) $(eval $(call gb_Library_use_packages,store,\ - store_inc \ + store_odk_headers \ )) $(eval $(call gb_Library_add_defs,store,\ diff --git a/store/Module_store.mk b/store/Module_store.mk index 9f166ac3327f..f6a9454ecfe6 100644 --- a/store/Module_store.mk +++ b/store/Module_store.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Module_Module,store)) $(eval $(call gb_Module_add_targets,store,\ Library_store \ - Package_inc \ + ZipPackage_store_odk_headers \ )) # vim:set noet sw=4 ts=4: diff --git a/store/Package_inc.mk b/store/Package_inc.mk deleted file mode 100644 index 11c3e15c7411..000000000000 --- a/store/Package_inc.mk +++ /dev/null @@ -1,34 +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 David Ostrovsky (initial developer) -# -# 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,store_inc,$(SRCDIR)/store)) - -$(eval $(call gb_Package_add_file,store_inc,inc/store/store.h,inc/store/store.h)) -$(eval $(call gb_Package_add_file,store_inc,inc/store/store.hxx,inc/store/store.hxx)) -$(eval $(call gb_Package_add_file,store_inc,inc/store/storedllapi.h,inc/store/storedllapi.h)) -$(eval $(call gb_Package_add_file,store_inc,inc/store/types.h,inc/store/types.h)) - -# vim: set noet sw=4 ts=4: diff --git a/store/ZipPackage_store_odk_headers.mk b/store/ZipPackage_store_odk_headers.mk new file mode 100644 index 000000000000..cb21dbc26085 --- /dev/null +++ b/store/ZipPackage_store_odk_headers.mk @@ -0,0 +1,36 @@ +# -*- 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 David Ostrovsky (initial developer) +# +# 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,store_odk_headers,$(SRCDIR)/store/inc/store)) + +$(eval $(call gb_ZipPackage_add_files,store_odk_headers,inc/store,include/store,\ + store.h \ + store.hxx \ + storedllapi.h \ + types.h \ +)) + +# vim: set noet sw=4 ts=4: -- cgit v1.2.3