registry: new ZipPackage_registry_odk_headers

Change-Id: I0730e0a354ec952cdb67d1b22067ab59c86334c0

8 files changed, 51 insertions, 49 deletions

diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk
index d967c07d385d..9f7f6f0723ee 100644
--- a/codemaker/StaticLibrary_codemaker.mk
+++ b/codemaker/StaticLibrary_codemaker.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_StaticLibrary_use_external,codemaker,boost_headers))
 
 $(eval $(call gb_StaticLibrary_use_packages,codemaker,\
 	codemaker_inc \
-	registry_inc \
+	registry_odk_headers \
 	sal_generated \
 	sal_odk_headers \
 ))
diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk
index aa01e786eddd..4a8edaff8a7a 100644
--- a/codemaker/StaticLibrary_codemaker_cpp.mk
+++ b/codemaker/StaticLibrary_codemaker_cpp.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_StaticLibrary_use_external,codemaker_cpp,boost_headers))
 
 $(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\
 	codemaker_inc \
-	registry_inc \
+	registry_odk_headers \
 	sal_generated \
 	sal_odk_headers \
 ))
diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk
index 810f07135db5..03d9f076aa85 100644
--- a/codemaker/StaticLibrary_codemaker_java.mk
+++ b/codemaker/StaticLibrary_codemaker_java.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_StaticLibrary_use_external,codemaker_java,boost_headers))
 
 $(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\
 	codemaker_inc \
-	registry_inc \
+	registry_odk_headers \
 	sal_generated \
 	sal_odk_headers \
 ))
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index f041fc8123b3..36009e27256a 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -25,7 +25,7 @@ DOXY_DEPS := $(SRCDIR)/odk/pack/gendocu/Doxyfile \
 	$(call gb_Package_get_target,cppu_odk_headers) \
 	$(call gb_Package_get_target,cppuhelper_odk_headers) \
 	$(call gb_Package_get_target,store_inc) \
-	$(call gb_Package_get_target,registry_inc)
+	$(call gb_Package_get_target,registry_odk_headers)
 
 
 $(eval $(call gb_CustomTarget_register_target,odk/odkcommon/docs/cpp/ref,index.html))
diff --git a/registry/Library_reg.mk b/registry/Library_reg.mk
index 375f162a5a91..1c79a0048191 100644
--- a/registry/Library_reg.mk
+++ b/registry/Library_reg.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,reg))
 $(eval $(call gb_Library_set_soversion_script,reg,3,$(SRCDIR)/registry/util/reg.map))
 
 $(eval $(call gb_Library_use_packages,reg,\
-	registry_inc \
+	registry_odk_headers \
 ))
 
 $(eval $(call gb_Library_add_defs,reg,\
diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk
index 0ad522678c7c..fce6fa434594 100644
--- a/registry/Module_registry.mk
+++ b/registry/Module_registry.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_Module_Module,registry))
 
 $(eval $(call gb_Module_add_targets,registry,\
     Library_reg \
-    Package_inc \
+    ZipPackage_registry_odk_headers \
 ))
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
diff --git a/registry/Package_inc.mk b/registry/Package_inc.mk
deleted file mode 100644
index 6d67701bf73e..000000000000
--- a/registry/Package_inc.mk
+++ /dev/null
@@ -1,43 +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 <d.ostrovsky@gmx.de> (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,registry_inc,$(SRCDIR)/registry/inc/registry))
-
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/reader.h,reader.h))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/reader.hxx,reader.hxx))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/reflread.hxx,reflread.hxx))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/refltype.hxx,refltype.hxx))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/reflwrit.hxx,reflwrit.hxx))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/regdllapi.h,regdllapi.h))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/registry.h,registry.h))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/registry.hxx,registry.hxx))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/regtype.h,regtype.h))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/types.h,types.h))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/version.h,version.h))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/writer.h,writer.h))
-$(eval $(call gb_Package_add_file,registry_inc,inc/registry/writer.hxx,writer.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/registry/ZipPackage_registry_odk_headers.mk b/registry/ZipPackage_registry_odk_headers.mk
new file mode 100644
index 000000000000..ca0d7388e139
--- /dev/null
+++ b/registry/ZipPackage_registry_odk_headers.mk
@@ -0,0 +1,45 @@
+# -*- 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 <d.ostrovsky@gmx.de> (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,registry_odk_headers,$(SRCDIR)/registry/inc/registry))
+
+$(eval $(call gb_ZipPackage_add_files,registry_odk_headers,inc/registry,include/registry,\
+	reader.h \
+	reader.hxx \
+	reflread.hxx \
+	refltype.hxx \
+	reflwrit.hxx \
+	regdllapi.h \
+	registry.h \
+	registry.hxx \
+	regtype.h \
+	types.h \
+	version.h \
+	writer.h \
+	writer.hxx \
+))
+
+# vim: set noet sw=4 ts=4: