Revert "registry: new ZipPackage_registry_odk_headers"

This reverts commit ba837244.

The "reg" library is not actually a stable URE interface.

Conflicts:
	odk/CustomTarget_doxygen.mk
	registry/Module_registry.mk

Change-Id: Ic53e1b8eecd6a12c9ec194df2f0093004db7c01b

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_odk_headers \
+	registry_inc \
 	sal_generated \
 	sal_odk_headers \
 	salhelper_odk_headers \

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_odk_headers \
+	registry_inc \
 	sal_generated \
 	sal_odk_headers \
 	salhelper_odk_headers \

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_odk_headers \
+	registry_inc \
 	sal_generated \
 	sal_odk_headers \
 	salhelper_odk_headers \

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_odk_headers \
+	registry_inc \
 ))
 
 $(eval $(call gb_Library_add_defs,reg,\

registry/Module_registry.mk

@@ -28,7 +28,7 @@ $(eval $(call gb_Module_Module,registry))
 
 $(eval $(call gb_Module_add_targets,registry,\
 	Library_reg \
-	ZipPackage_registry_odk_headers \
+	Package_inc \
 	$(if $(filter-out $(OS),IOS), \
 		Executable_regmerge \
 		Executable_regview \

registry/ZipPackage_registry_odk_headers.mk → registry/Package_inc.mk

@@ -24,22 +24,20 @@
 # 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_Package_Package,registry_inc,$(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 \
-))
+$(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: