salhelper: new ZipPackage_salhelper_odk_headers

Change-Id: I83172bd105496dd1af8090a01ebfac864958e20c

4 files changed, 18 insertions, 14 deletions

diff --git a/salhelper/CustomTarget_salhelper_allheaders.mk b/salhelper/CustomTarget_salhelper_allheaders.mk
index 2ec5a62229cd..60498aab3da0 100644
--- a/salhelper/CustomTarget_salhelper_allheaders.mk
+++ b/salhelper/CustomTarget_salhelper_allheaders.mk
@@ -32,10 +32,12 @@ salhelper_allheaders_DIR := $(call gb_CustomTarget_get_workdir,salhelper/allhead
 $(call gb_CustomTarget_get_target,salhelper/allheaders) : \
 	$(salhelper_allheaders_DIR)/salhelper_allheaders.hxx
 
-# dependency on Package_inc.mk should ensure this is updated whenever a new public header is added
+# dependency on Package_salhelper_odk_headers.mk should ensure this is
+# updated whenever a new public header is added
 $(salhelper_allheaders_DIR)/salhelper_allheaders.hxx : \
             $(SRCDIR)/salhelper/CustomTarget_salhelper_allheaders.mk \
-            | $(salhelper_allheaders_DIR)/.dir $(SRCDIR)/salhelper/Package_inc.mk
+		    $(SRCDIR)/salhelper/ZipPackage_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' >  $@
 	$(foreach file, $(wildcard $(SRCDIR)/salhelper/inc/*.h) $(wildcard $(SRCDIR)/salhelper/inc/*.hxx) \
diff --git a/salhelper/Library_salhelper.mk b/salhelper/Library_salhelper.mk
index 7c66678cbf4d..26c90dcd81c6 100644
--- a/salhelper/Library_salhelper.mk
+++ b/salhelper/Library_salhelper.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,salhelper))
 
-$(eval $(call gb_Library_use_package,salhelper,salhelper_inc))
+$(eval $(call gb_Library_use_package,salhelper,salhelper_odk_headers))
 
 $(eval $(call gb_Library_add_defs,salhelper,\
 	-DSALHELPER_DLLIMPLEMENTATION \
diff --git a/salhelper/Module_salhelper.mk b/salhelper/Module_salhelper.mk
index 699fbed11eec..31f3f22feff2 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 \
-	Package_inc \
+	ZipPackage_salhelper_odk_headers \
 ))
 
 $(eval $(call gb_Module_add_check_targets,salhelper,\
diff --git a/salhelper/Package_inc.mk b/salhelper/ZipPackage_salhelper_odk_headers.mk
index 7a30c7fc967d..8de4d5ffc1a7 100644
--- a/salhelper/Package_inc.mk
+++ b/salhelper/ZipPackage_salhelper_odk_headers.mk
@@ -25,16 +25,18 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Package_Package,salhelper_inc,$(SRCDIR)/salhelper/inc/salhelper))
+$(eval $(call gb_ZipPackage_ZipPackage,salhelper_odk_headers,$(SRCDIR)/salhelper/inc/salhelper))
 
-$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/salhelperdllapi.h,salhelperdllapi.h))
-$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/condition.hxx,condition.hxx))
-$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/dynload.hxx,dynload.hxx))
-$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/linkhelper.hxx,linkhelper.hxx))
-$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/refobj.hxx,refobj.hxx))
-$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/simplereferenceobject.hxx,simplereferenceobject.hxx))
-$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/singletonref.hxx,singletonref.hxx))
-$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/thread.hxx,thread.hxx))
-$(eval $(call gb_Package_add_file,salhelper_inc,inc/salhelper/timer.hxx,timer.hxx))
+$(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: