store: new ZipPackage_store_odk_headers

Change-Id: I2d4e2853014ef30419a66c8f9b2675b92d60adb6

odk/CustomTarget_doxygen.mk

@@ -24,7 +24,7 @@ DOXY_DEPS := $(SRCDIR)/odk/pack/gendocu/Doxyfile \
 	$(call gb_Package_get_target,salhelper_odk_headers) \
 	$(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,store_odk_headers) \
 	$(call gb_Package_get_target,registry_odk_headers)
 
 

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,\

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:

store/Package_inc.mk → store/ZipPackage_store_odk_headers.mk

@@ -24,11 +24,13 @@
 # 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_ZipPackage_ZipPackage,store_odk_headers,$(SRCDIR)/store/inc/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))
+$(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: