install SDK headers from filelists

... which allows us to drop gb_ZipPackage.

Change-Id: Ib19f774c63d9b83ec07e99f963533eee431cc53a

4 files changed, 15 insertions, 11 deletions

diff --git a/sal/CustomTarget_sal_allheaders.mk b/sal/CustomTarget_sal_allheaders.mk
index 337456844d5e..3beeb299093a 100644
--- a/sal/CustomTarget_sal_allheaders.mk
+++ b/sal/CustomTarget_sal_allheaders.mk
@@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_target,sal/allheaders) : \
 
 # dependency on Package_inc.mk should ensure this is updated whenever a new public header is added
 $(sal_allheaders_DIR)/sal_allheaders.hxx : $(SRCDIR)/sal/CustomTarget_sal_allheaders.mk \
-			  $(SRCDIR)/sal/ZipPackage_sal_odk_headers.mk \
+			  $(SRCDIR)/sal/Package_sal_odk_headers.mk \
               $(SRCDIR)/sal/Package_inc.mk \
             | $(sal_allheaders_DIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index b5c84b1e0270..59a40a73cffc 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -41,8 +41,8 @@ $(eval $(call gb_Module_add_targets,sal,\
 		Library_uwinapi) \
 	Package_inc \
 	StaticLibrary_salcpprt \
-	ZipPackage_sal_generated \
-	ZipPackage_sal_odk_headers \
+	Package_sal_generated \
+	Package_sal_odk_headers \
 ))
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
diff --git a/sal/ZipPackage_sal_generated.mk b/sal/Package_sal_generated.mk
index 0cd7442f445e..86578dac954f 100644
--- a/sal/ZipPackage_sal_generated.mk
+++ b/sal/Package_sal_generated.mk
@@ -25,8 +25,10 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_ZipPackage_ZipPackage,sal_generated,$(BUILDDIR)/config_$(gb_Side)))
+$(eval $(call gb_Package_Package,sal_generated,$(BUILDDIR)/config_$(gb_Side)))
 
-$(eval $(call gb_ZipPackage_add_file,sal_generated,inc/sal/typesizes.h,include/sal/typesizes.h,config_typesizes.h))
+$(eval $(call gb_Package_set_outdir,sal_generated,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,sal_generated,$(gb_Package_SDKDIRNAME)/include/sal/typesizes.h,config_typesizes.h))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sal/ZipPackage_sal_odk_headers.mk b/sal/Package_sal_odk_headers.mk
index 696bc60c899a..613eebc9866e 100644
--- a/sal/ZipPackage_sal_odk_headers.mk
+++ b/sal/Package_sal_odk_headers.mk
@@ -7,9 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ZipPackage_ZipPackage,sal_odk_headers,$(SRCDIR)/sal/inc))
+$(eval $(call gb_Package_Package,sal_odk_headers,$(SRCDIR)/sal/inc))
 
-$(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/sal,include/sal,\
+$(eval $(call gb_Package_set_outdir,sal_odk_headers,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,sal_odk_headers,$(gb_Package_SDKDIRNAME)/include/sal,\
 	sal/alloca.h \
 	sal/ByteBufferWrapper.hxx \
 	sal/config.h \
@@ -21,11 +23,11 @@ $(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/sal,include/sal,\
 	sal/types.h \
 ))
 
-$(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/sal/detail,include/sal/detail,\
+$(eval $(call gb_Package_add_files,sal_odk_headers,$(gb_Package_SDKDIRNAME)/include/sal/detail,\
 	sal/detail/log.h \
 ))
 
-$(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/rtl,include/rtl,\
+$(eval $(call gb_Package_add_files,sal_odk_headers,$(gb_Package_SDKDIRNAME)/include/rtl,\
 	rtl/allocator.hxx \
 	rtl/alloc.h \
 	rtl/bootstrap.h \
@@ -65,7 +67,7 @@ $(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/rtl,include/rtl,\
 	rtl/uuid.h \
 ))
 
-$(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/osl,include/osl,\
+$(eval $(call gb_Package_add_files,sal_odk_headers,$(gb_Package_SDKDIRNAME)/include/osl,\
 	osl/conditn.h \
 	osl/conditn.hxx \
 	osl/diagnose.h \
@@ -100,7 +102,7 @@ $(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/osl,include/osl,\
 	osl/util.h \
 ))
 
-$(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/systools/win32,include/systools/win32,\
+$(eval $(call gb_Package_add_files,sal_odk_headers,$(gb_Package_SDKDIRNAME)/include/systools/win32,\
 	systools/win32/snprintf.h \
 ))