diff options
25 files changed, 130 insertions, 102 deletions
diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index 160d9c61c36c..cfc0caffe691 100644 --- a/bean/Library_officebean.mk +++ b/bean/Library_officebean.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Library_Library,officebean)) ifneq ($(OS),WNT) $(eval $(call gb_Library_use_packages,officebean,\ sal_generated \ - sal_inc \ + sal_odk_headers \ )) $(eval $(call gb_Library_use_externals,officebean,\ diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk index 510b2c569b41..d967c07d385d 100644 --- a/codemaker/StaticLibrary_codemaker.mk +++ b/codemaker/StaticLibrary_codemaker.mk @@ -33,7 +33,7 @@ $(eval $(call gb_StaticLibrary_use_packages,codemaker,\ codemaker_inc \ registry_inc \ sal_generated \ - sal_inc \ + sal_odk_headers \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker,\ diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk index 2ee9c4ecb4bd..aa01e786eddd 100644 --- a/codemaker/StaticLibrary_codemaker_cpp.mk +++ b/codemaker/StaticLibrary_codemaker_cpp.mk @@ -33,7 +33,7 @@ $(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\ codemaker_inc \ registry_inc \ sal_generated \ - sal_inc \ + sal_odk_headers \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_cpp,\ diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk index 1bcdb2552a89..810f07135db5 100644 --- a/codemaker/StaticLibrary_codemaker_java.mk +++ b/codemaker/StaticLibrary_codemaker_java.mk @@ -33,7 +33,7 @@ $(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\ codemaker_inc \ registry_inc \ sal_generated \ - sal_inc \ + sal_odk_headers \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_java,\ diff --git a/cosv/StaticLibrary_cosv.mk b/cosv/StaticLibrary_cosv.mk index 666da6b2bac7..a2bef2b75177 100644 --- a/cosv/StaticLibrary_cosv.mk +++ b/cosv/StaticLibrary_cosv.mk @@ -12,7 +12,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,cosv)) $(eval $(call gb_StaticLibrary_use_packages,cosv,\ cosv_inc \ sal_generated \ - sal_inc \ + sal_odk_headers \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,cosv,\ diff --git a/cppuhelper/StaticLibrary_findsofficepath.mk b/cppuhelper/StaticLibrary_findsofficepath.mk index a33c13afc11a..4b97bcd930a7 100644 --- a/cppuhelper/StaticLibrary_findsofficepath.mk +++ b/cppuhelper/StaticLibrary_findsofficepath.mk @@ -11,7 +11,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,findsofficepath)) $(eval $(call gb_StaticLibrary_use_packages,findsofficepath,\ cppuhelper_inc \ - sal_inc \ + sal_odk_headers \ )) $(eval $(call gb_StaticLibrary_add_cobjects,findsofficepath,\ diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk index d04bce86d6d6..32011b048763 100644 --- a/embedserv/Library_inprocserv.mk +++ b/embedserv/Library_inprocserv.mk @@ -43,7 +43,7 @@ $(eval $(call gb_Library_use_libraries,inprocserv,\ )) $(eval $(call gb_Library_use_packages,inprocserv,\ - sal_inc \ + sal_odk_headers \ )) ifeq ($(COM),MSC) diff --git a/extensions/StaticLibrary_npsoenv.mk b/extensions/StaticLibrary_npsoenv.mk index 96c3ce37577f..8786f375906e 100644 --- a/extensions/StaticLibrary_npsoenv.mk +++ b/extensions/StaticLibrary_npsoenv.mk @@ -28,7 +28,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,npsoenv)) $(eval $(call gb_StaticLibrary_use_packages,npsoenv,\ - sal_inc \ + sal_odk_headers \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,npsoenv,\ diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk index 316caa276240..af15ade6e364 100644 --- a/jurt/Library_jpipe.mk +++ b/jurt/Library_jpipe.mk @@ -40,7 +40,7 @@ $(eval $(call gb_Library_add_cobjects,jpipe,\ )) $(eval $(call gb_Library_use_packages,jpipe,\ - sal_inc \ + sal_odk_headers \ )) else diff --git a/l10ntools/StaticLibrary_transex.mk b/l10ntools/StaticLibrary_transex.mk index e5cad80a6df7..a6f4d2176dd7 100644 --- a/l10ntools/StaticLibrary_transex.mk +++ b/l10ntools/StaticLibrary_transex.mk @@ -29,7 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,transex)) $(eval $(call gb_StaticLibrary_use_packages,transex,\ sal_generated \ - sal_inc \ + sal_odk_headers \ )) $(eval $(call gb_StaticLibrary_set_include,transex,\ diff --git a/np_sdk/StaticLibrary_nputils.mk b/np_sdk/StaticLibrary_nputils.mk index 264ea0382166..327be43eb100 100644 --- a/np_sdk/StaticLibrary_nputils.mk +++ b/np_sdk/StaticLibrary_nputils.mk @@ -29,7 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,nputils)) $(eval $(call gb_StaticLibrary_use_packages,nputils,\ sal_generated \ - sal_inc \ + sal_odk_headers \ )) $(eval $(call gb_StaticLibrary_use_externals,nputils,\ diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk index d31ab03b79e8..5e472f2fef52 100644 --- a/odk/CustomTarget_doxygen.mk +++ b/odk/CustomTarget_doxygen.mk @@ -20,7 +20,7 @@ DOXY_WORKDIR := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(odk_WORKDIR)/docs/ DOXY_STRIP_PATH := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(OUTDIR)/inc),$(OUTDIR)/inc) DOXY_DEPS := $(SRCDIR)/odk/pack/gendocu/Doxyfile \ $(SRCDIR)/odk/pack/gendocu/main.dox \ - $(call gb_Package_get_target,sal_inc) \ + $(call gb_Package_get_target,sal_odk_headers) \ $(call gb_Package_get_target,salhelper_inc) \ $(call gb_Package_get_target,cppu_inc) \ $(call gb_Package_get_target,cppuhelper_inc) \ diff --git a/pyuno/Library_pyuno_wrapper.mk b/pyuno/Library_pyuno_wrapper.mk index 2384bafb409e..507c8f46e8eb 100644 --- a/pyuno/Library_pyuno_wrapper.mk +++ b/pyuno/Library_pyuno_wrapper.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,pyuno_wrapper)) $(eval $(call gb_Library_use_packages,pyuno_wrapper,\ sal_generated \ - sal_inc \ + sal_odk_headers \ )) $(eval $(call gb_Library_set_include,pyuno_wrapper,\ diff --git a/registry/StaticLibrary_registry_helper.mk b/registry/StaticLibrary_registry_helper.mk index 07469dff98ff..56550742145e 100644 --- a/registry/StaticLibrary_registry_helper.mk +++ b/registry/StaticLibrary_registry_helper.mk @@ -29,7 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,registry_helper)) $(eval $(call gb_StaticLibrary_use_packages,registry_helper,\ sal_generated \ - sal_inc \ + sal_odk_headers \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,registry_helper,\ diff --git a/sal/CustomTarget_sal_allheaders.mk b/sal/CustomTarget_sal_allheaders.mk index dfef1eadb010..337456844d5e 100644 --- a/sal/CustomTarget_sal_allheaders.mk +++ b/sal/CustomTarget_sal_allheaders.mk @@ -34,7 +34,9 @@ $(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 \ - | $(sal_allheaders_DIR)/.dir $(SRCDIR)/sal/Package_inc.mk + $(SRCDIR)/sal/ZipPackage_sal_odk_headers.mk \ + $(SRCDIR)/sal/Package_inc.mk \ + | $(sal_allheaders_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) printf '// Generated list of all sal/ includes\n' > $@ printf '#ifdef WNT\n' >> $@ diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 62f9ce3f3a11..0d19b3f70182 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_set_precompiled_header,sal,$(SRCDIR)/sal/inc/pch/precom $(eval $(call gb_Library_use_packages,sal,\ sal_generated \ + sal_odk_headers \ sal_inc \ )) diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index 7d20fa388992..b683275eb06b 100644 --- a/sal/Module_sal.mk +++ b/sal/Module_sal.mk @@ -41,8 +41,9 @@ $(eval $(call gb_Module_add_targets,sal,\ $(if $(filter $(OS),WNT), \ Library_uwinapi) \ Package_inc \ - Package_generated \ StaticLibrary_salcpprt \ + ZipPackage_sal_generated \ + ZipPackage_sal_odk_headers \ )) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) diff --git a/sal/Package_inc.mk b/sal/Package_inc.mk index 15fb47717d35..613cf261d847 100644 --- a/sal/Package_inc.mk +++ b/sal/Package_inc.mk @@ -28,89 +28,11 @@ $(eval $(call gb_Package_Package,sal_inc,$(SRCDIR)/sal/inc)) $(eval $(call gb_Package_add_file,sal_inc,inc/protectorfactory.hxx,cppunittester/protectorfactory.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/conditn.h,osl/conditn.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/conditn.hxx,osl/conditn.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/diagnose.h,osl/diagnose.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/diagnose.hxx,osl/diagnose.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/doublecheckedlocking.h,osl/doublecheckedlocking.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/endian.h,osl/endian.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/file.h,osl/file.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/file.hxx,osl/file.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/getglobalmutex.hxx,osl/getglobalmutex.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/interlck.h,osl/interlck.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/module.h,osl/module.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/module.hxx,osl/module.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/mutex.h,osl/mutex.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/mutex.hxx,osl/mutex.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/nlsupport.h,osl/nlsupport.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/pipe_decl.hxx,osl/pipe_decl.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/pipe.h,osl/pipe.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/pipe.hxx,osl/pipe.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/process.h,osl/process.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/profile.h,osl/profile.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/profile.hxx,osl/profile.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/security_decl.hxx,osl/security_decl.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/security.h,osl/security.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/security.hxx,osl/security.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/signal.h,osl/signal.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/socket_decl.hxx,osl/socket_decl.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/socket.h,osl/socket.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/socket.hxx,osl/socket.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/thread.h,osl/thread.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/thread.hxx,osl/thread.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/time.h,osl/time.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/util.h,osl/util.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/osl/detail/file.h,osl/detail/file.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/osl/detail/android-bootstrap.h,osl/detail/android-bootstrap.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/osl/detail/ios-bootstrap.h,osl/detail/ios-bootstrap.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/osl/detail/component-mapping.h,osl/detail/component-mapping.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/allocator.hxx,rtl/allocator.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/alloc.h,rtl/alloc.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/bootstrap.h,rtl/bootstrap.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/bootstrap.hxx,rtl/bootstrap.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/byteseq.h,rtl/byteseq.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/byteseq.hxx,rtl/byteseq.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/cipher.h,rtl/cipher.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/crc.h,rtl/crc.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/digest.h,rtl/digest.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/instance.hxx,rtl/instance.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/locale.h,rtl/locale.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/logfile.h,rtl/logfile.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/logfile.hxx,rtl/logfile.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/malformeduriexception.hxx,rtl/malformeduriexception.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/math.h,rtl/math.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/math.hxx,rtl/math.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/process.h,rtl/process.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/random.h,rtl/random.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/ref.hxx,rtl/ref.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/strbuf.h,rtl/strbuf.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/strbuf.hxx,rtl/strbuf.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/string.h,rtl/string.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/string.hxx,rtl/string.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/stringconcat.hxx,rtl/stringconcat.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/stringutils.hxx,rtl/stringutils.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/tencinfo.h,rtl/tencinfo.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/textcvt.h,rtl/textcvt.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/textenc.h,rtl/textenc.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/unload.h,rtl/unload.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/uri.h,rtl/uri.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/uri.hxx,rtl/uri.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/ustrbuf.h,rtl/ustrbuf.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/ustrbuf.hxx,rtl/ustrbuf.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/ustring.h,rtl/ustring.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/ustring.hxx,rtl/ustring.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/uuid.h,rtl/uuid.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/sal/alloca.h,sal/alloca.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/sal/ByteBufferWrapper.hxx,sal/ByteBufferWrapper.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/sal/config.h,sal/config.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/sal/log-areas.dox,sal/log-areas.dox)) -$(eval $(call gb_Package_add_file,sal_inc,inc/sal/log.hxx,sal/log.hxx)) -$(eval $(call gb_Package_add_file,sal_inc,inc/sal/macros.h,sal/macros.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/sal/main.h,sal/main.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/sal/mathconf.h,sal/mathconf.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/sal/saldllapi.h,sal/saldllapi.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/sal/types.h,sal/types.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/sal/detail/log.h,sal/detail/log.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/systools/win32/comptr.hxx,systools/win32/comptr.hxx)) $(eval $(call gb_Package_add_file,sal_inc,inc/systools/win32/comtools.hxx,systools/win32/comtools.hxx)) $(eval $(call gb_Package_add_file,sal_inc,inc/systools/win32/qswin32.h,systools/win32/qswin32.h)) diff --git a/sal/StaticLibrary_salcpprt.mk b/sal/StaticLibrary_salcpprt.mk index f86043de65a2..51e76b29c8f0 100644 --- a/sal/StaticLibrary_salcpprt.mk +++ b/sal/StaticLibrary_salcpprt.mk @@ -29,7 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,salcpprt)) $(eval $(call gb_StaticLibrary_use_packages,salcpprt,\ sal_generated \ - sal_inc \ + sal_odk_headers \ )) $(eval $(call gb_StaticLibrary_add_defs,salcpprt, \ diff --git a/sal/Package_generated.mk b/sal/ZipPackage_sal_generated.mk index 5bc43dc5412d..dd9af97e6b84 100644 --- a/sal/Package_generated.mk +++ b/sal/ZipPackage_sal_generated.mk @@ -25,12 +25,12 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_Package_Package,sal_generated,$(call gb_CustomTarget_get_workdir,sal/generated))) +$(eval $(call gb_ZipPackage_ZipPackage,sal_generated,$(call gb_CustomTarget_get_workdir,sal/generated))) -$(eval $(call gb_Package_add_file,sal_generated,inc/sal/udkversion.h,sal/udkversion.h)) +$(eval $(call gb_ZipPackage_add_files,sal_generated,inc/sal,include/sal,sal/udkversion.h)) ifneq ($(COM),MSC) -$(eval $(call gb_Package_add_file,sal_generated,inc/sal/typesizes.h,sal/typesizes.h)) +$(eval $(call gb_ZipPackage_add_files,sal_generated,inc/sal,include/sal,sal/typesizes.h)) endif # vim: set noet sw=4 ts=4: diff --git a/sal/ZipPackage_sal_odk_headers.mk b/sal/ZipPackage_sal_odk_headers.mk new file mode 100644 index 000000000000..56c9d881e216 --- /dev/null +++ b/sal/ZipPackage_sal_odk_headers.mk @@ -0,0 +1,102 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# 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_ZipPackage_add_files,sal_odk_headers,inc/sal,include/sal,\ + sal/alloca.h \ + sal/ByteBufferWrapper.hxx \ + sal/config.h \ + sal/log.hxx \ + sal/macros.h \ + sal/main.h \ + sal/mathconf.h \ + sal/saldllapi.h \ + sal/types.h \ +)) + +$(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/sal/detail,include/sal/detail,\ + sal/detail/log.h \ +)) + +$(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/rtl,include/rtl,\ + rtl/allocator.hxx \ + rtl/alloc.h \ + rtl/bootstrap.h \ + rtl/bootstrap.hxx \ + rtl/byteseq.h \ + rtl/byteseq.hxx \ + rtl/cipher.h \ + rtl/crc.h \ + rtl/digest.h \ + rtl/instance.hxx \ + rtl/locale.h \ + rtl/logfile.h \ + rtl/logfile.hxx \ + rtl/malformeduriexception.hxx \ + rtl/math.h \ + rtl/math.hxx \ + rtl/process.h \ + rtl/random.h \ + rtl/ref.hxx \ + rtl/strbuf.h \ + rtl/strbuf.hxx \ + rtl/string.h \ + rtl/string.hxx \ + rtl/stringconcat.hxx \ + rtl/stringutils.hxx \ + rtl/tencinfo.h \ + rtl/textcvt.h \ + rtl/textenc.h \ + rtl/unload.h \ + rtl/uri.h \ + rtl/uri.hxx \ + rtl/ustrbuf.h \ + rtl/ustrbuf.hxx \ + rtl/ustring.h \ + rtl/ustring.hxx \ + rtl/uuid.h \ +)) + +$(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/osl,include/osl,\ + osl/conditn.h \ + osl/conditn.hxx \ + osl/diagnose.h \ + osl/diagnose.hxx \ + osl/doublecheckedlocking.h \ + osl/endian.h \ + osl/file.h \ + osl/file.hxx \ + osl/getglobalmutex.hxx \ + osl/interlck.h \ + osl/module.h \ + osl/module.hxx \ + osl/mutex.h \ + osl/mutex.hxx \ + osl/nlsupport.h \ + osl/pipe_decl.hxx \ + osl/pipe.h \ + osl/pipe.hxx \ + osl/process.h \ + osl/profile.h \ + osl/profile.hxx \ + osl/security_decl.hxx \ + osl/security.h \ + osl/security.hxx \ + osl/signal.h \ + osl/socket_decl.hxx \ + osl/socket.h \ + osl/socket.hxx \ + osl/thread.h \ + osl/thread.hxx \ + osl/time.h \ + osl/util.h \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sdext/Executable_xpdfimport.mk b/sdext/Executable_xpdfimport.mk index fa9ab933b526..c5f8b904bb3c 100644 --- a/sdext/Executable_xpdfimport.mk +++ b/sdext/Executable_xpdfimport.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Executable_Executable,xpdfimport)) $(eval $(call gb_Executable_use_packages,xpdfimport,\ sal_generated \ - sal_inc \ + sal_odk_headers \ )) $(eval $(call gb_Executable_use_externals,xpdfimport,\ diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk index 18a7bbcf6cd5..ca50785202c0 100644 --- a/svx/AllLangResTarget_svx.mk +++ b/svx/AllLangResTarget_svx.mk @@ -29,7 +29,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/res)) $(eval $(call gb_SrsTarget_use_packages,svx/res,\ editeng_inc \ - sal_inc \ + sal_odk_headers \ sfx2_inc \ svl_inc \ svtools_inc \ diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk index 79948e9dce98..d9299f81fa53 100644 --- a/tools/StaticLibrary_ooopathutils.mk +++ b/tools/StaticLibrary_ooopathutils.mk @@ -20,7 +20,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,ooopathutils)) $(eval $(call gb_StaticLibrary_use_packages,ooopathutils,\ - sal_inc \ + sal_odk_headers \ tools_inc \ )) diff --git a/udm/StaticLibrary_udm.mk b/udm/StaticLibrary_udm.mk index 8b43c8f88152..3d1b0527b747 100644 --- a/udm/StaticLibrary_udm.mk +++ b/udm/StaticLibrary_udm.mk @@ -12,7 +12,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,udm)) $(eval $(call gb_StaticLibrary_use_packages,udm,\ cosv_inc \ sal_generated \ - sal_inc \ + sal_odk_headers \ udm_inc \ )) |