summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Library_merged.mk2
-rw-r--r--RepositoryExternal.mk16
-rw-r--r--helpcompiler/Executable_helpindexer.mk2
-rw-r--r--helpcompiler/Executable_helplinker.mk2
-rw-r--r--helpcompiler/Library_helplinker.mk2
-rw-r--r--l10ntools/Executable_helpex.mk2
-rw-r--r--sax/Library_expwrap.mk2
-rw-r--r--sax/Library_fastsax.mk2
-rw-r--r--shell/Library_ooofilt.mk2
-rw-r--r--shell/Library_ooofilt_x64.mk2
-rw-r--r--shell/Library_propertyhdl.mk2
-rw-r--r--shell/Library_propertyhdl_x64.mk2
-rw-r--r--shell/Library_recentfile.mk2
-rw-r--r--shell/Library_shlxthdl.mk2
-rw-r--r--shell/Library_shlxthdl_x64.mk2
-rw-r--r--shell/StaticLibrary_shlxthandler_common.mk2
-rw-r--r--shell/StaticLibrary_shlxthandler_common_x64.mk2
-rw-r--r--shell/StaticLibrary_xmlparser.mk2
-rw-r--r--shell/StaticLibrary_xmlparser_x64.mk2
-rw-r--r--vcl/Library_vcl.mk2
-rw-r--r--xmlhelp/Library_tvhlp1.mk2
-rw-r--r--xmlhelp/Library_ucpchelp1.mk2
22 files changed, 29 insertions, 29 deletions
diff --git a/Library_merged.mk b/Library_merged.mk
index ec83497255f6..5b501d5f4a6c 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -56,7 +56,7 @@ $(eval $(call gb_Library_use_externals,merged,\
cppunit \
cups \
curl \
- expat_utf8 \
+ expat \
hunspell \
hyphen \
icui18n \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 374fef4491ec..d4e442687c2d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -406,8 +406,8 @@ endif # SYSTEM_MYTHES
ifeq ($(SYSTEM_EXPAT),YES)
-define gb_LinkTarget__use_expat
-$(if $(2),,$(error gb_LinkTarget__use_expat needs additional parameter))
+define gb_LinkTarget__use_expat_impl
+$(if $(2),,$(error gb_LinkTarget__use_expat_impl needs additional parameter))
$(call gb_LinkTarget_add_defs,$(1),\
-DSYSTEM_EXPAT \
@@ -426,8 +426,8 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
expat_x64 \
))
-define gb_LinkTarget__use_expat
-$(if $(2),,$(error gb_LinkTarget__use_expat needs additional parameter))
+define gb_LinkTarget__use_expat_impl
+$(if $(2),,$(error gb_LinkTarget__use_expat_impl needs additional parameter))
$(call gb_LinkTarget_set_include,$(1),\
-I$(OUTDIR)/inc/external/expat \
@@ -452,13 +452,13 @@ endef
endif # SYSTEM_EXPAT
-define gb_LinkTarget__use_expat_utf8
-$(call gb_LinkTarget__use_expat,$(1),expat)
+define gb_LinkTarget__use_expat
+$(call gb_LinkTarget__use_expat_impl,$(1),expat)
endef
-define gb_LinkTarget__use_expat_utf8_x64
-$(call gb_LinkTarget__use_expat,$(1),expat_x64)
+define gb_LinkTarget__use_expat_x64
+$(call gb_LinkTarget__use_expat_impl,$(1),expat_x64)
endef
diff --git a/helpcompiler/Executable_helpindexer.mk b/helpcompiler/Executable_helpindexer.mk
index 08faae715fb7..8b723e2ced88 100644
--- a/helpcompiler/Executable_helpindexer.mk
+++ b/helpcompiler/Executable_helpindexer.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_Executable_use_libraries,HelpIndexer,\
))
$(eval $(call gb_Executable_use_externals,HelpIndexer,\
- expat_utf8 \
+ expat \
libxslt \
libxml2 \
clucene \
diff --git a/helpcompiler/Executable_helplinker.mk b/helpcompiler/Executable_helplinker.mk
index 1ab99a3bf90b..07bc9ac82444 100644
--- a/helpcompiler/Executable_helplinker.mk
+++ b/helpcompiler/Executable_helplinker.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_Executable_use_libraries,HelpLinker,\
$(eval $(call gb_Executable_use_externals,HelpLinker,\
boost_headers \
- expat_utf8 \
+ expat \
libxslt \
libxml2 \
clucene \
diff --git a/helpcompiler/Library_helplinker.mk b/helpcompiler/Library_helplinker.mk
index 9a6a989efaa8..e3bbf822cb8b 100644
--- a/helpcompiler/Library_helplinker.mk
+++ b/helpcompiler/Library_helplinker.mk
@@ -54,7 +54,7 @@ $(eval $(call gb_Library_use_internal_api,helplinker,\
$(eval $(call gb_Library_use_externals,helplinker,\
boost_headers \
- expat_utf8 \
+ expat \
libxslt \
libxml2 \
clucene \
diff --git a/l10ntools/Executable_helpex.mk b/l10ntools/Executable_helpex.mk
index 5aa2af297acd..85dcae60300e 100644
--- a/l10ntools/Executable_helpex.mk
+++ b/l10ntools/Executable_helpex.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_Executable_use_libraries,helpex,\
))
$(eval $(call gb_Executable_use_externals,helpex,\
- expat_utf8 \
+ expat \
boost_headers \
icu_headers \
libxml2 \
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index cdd9afacb353..67eeb7742e4b 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Library_set_include,expwrap,\
$(eval $(call gb_Library_use_sdk_api,expwrap))
$(eval $(call gb_Library_use_externals,expwrap,\
- expat_utf8 \
+ expat \
))
$(eval $(call gb_Library_use_libraries,expwrap,\
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
index 02c0f7c30c6e..6fa858ee3a5d 100644
--- a/sax/Library_fastsax.mk
+++ b/sax/Library_fastsax.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_Library_use_sdk_api,fastsax))
$(eval $(call gb_Library_use_externals,fastsax,\
boost_headers \
- expat_utf8 \
+ expat \
zlib \
))
diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk
index bde227fc3dfd..11adea1825cd 100644
--- a/shell/Library_ooofilt.mk
+++ b/shell/Library_ooofilt.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_defs,ooofilt,\
))
$(eval $(call gb_Library_use_externals,ooofilt,\
- expat_utf8 \
+ expat \
zlib \
))
diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk
index 68fada47ac90..f08dd74986d2 100644
--- a/shell/Library_ooofilt_x64.mk
+++ b/shell/Library_ooofilt_x64.mk
@@ -54,7 +54,7 @@ $(eval $(call gb_Library_add_defs,ooofilt_x64,\
))
$(eval $(call gb_Library_use_externals,ooofilt_x64,\
- expat_utf8_x64 \
+ expat_x64 \
zlib_x64 \
))
diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk
index 93d39823d531..2d03c661b157 100644
--- a/shell/Library_propertyhdl.mk
+++ b/shell/Library_propertyhdl.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_defs,propertyhdl,\
))
$(eval $(call gb_Library_use_externals,propertyhdl,\
- expat_utf8 \
+ expat \
zlib \
))
diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk
index 41aa8eb5fe61..3c8c9734749c 100644
--- a/shell/Library_propertyhdl_x64.mk
+++ b/shell/Library_propertyhdl_x64.mk
@@ -54,7 +54,7 @@ $(eval $(call gb_Library_add_defs,propertyhdl_x64,\
))
$(eval $(call gb_Library_use_externals,propertyhdl_x64,\
- expat_utf8_x64 \
+ expat_x64 \
zlib_x64 \
))
diff --git a/shell/Library_recentfile.mk b/shell/Library_recentfile.mk
index 70f57a1e8790..303d535ca35a 100644
--- a/shell/Library_recentfile.mk
+++ b/shell/Library_recentfile.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Library_set_include,recentfile,\
))
$(eval $(call gb_Library_use_externals,recentfile,\
- expat_utf8 \
+ expat \
))
$(eval $(call gb_Library_use_libraries,recentfile,\
diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk
index 07aa300fe9db..a171437d227f 100644
--- a/shell/Library_shlxthdl.mk
+++ b/shell/Library_shlxthdl.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_defs,shlxthdl,\
))
$(eval $(call gb_Library_use_externals,shlxthdl,\
- expat_utf8 \
+ expat \
zlib \
))
diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk
index e41bbb72af28..c9d06f9bb75f 100644
--- a/shell/Library_shlxthdl_x64.mk
+++ b/shell/Library_shlxthdl_x64.mk
@@ -54,7 +54,7 @@ $(eval $(call gb_Library_add_defs,shlxthdl_x64,\
))
$(eval $(call gb_Library_use_externals,shlxthdl_x64,\
- expat_utf8_x64 \
+ expat_x64 \
zlib_x64 \
))
diff --git a/shell/StaticLibrary_shlxthandler_common.mk b/shell/StaticLibrary_shlxthandler_common.mk
index 5d5f7bd89226..d16f71d0878e 100644
--- a/shell/StaticLibrary_shlxthandler_common.mk
+++ b/shell/StaticLibrary_shlxthandler_common.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\
))
$(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common,\
- expat_utf8 \
+ expat \
zlib \
))
diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk
index 427de020caa9..0e08415df628 100644
--- a/shell/StaticLibrary_shlxthandler_common_x64.mk
+++ b/shell/StaticLibrary_shlxthandler_common_x64.mk
@@ -53,7 +53,7 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\
))
$(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common_x64,\
- expat_utf8_x64 \
+ expat_x64 \
zlib_x64 \
))
diff --git a/shell/StaticLibrary_xmlparser.mk b/shell/StaticLibrary_xmlparser.mk
index d329c005aaaa..17b743d12d3c 100644
--- a/shell/StaticLibrary_xmlparser.mk
+++ b/shell/StaticLibrary_xmlparser.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_StaticLibrary_set_include,shell_xmlparser,\
))
$(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser,\
- expat_utf8 \
+ expat \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,shell_xmlparser,\
diff --git a/shell/StaticLibrary_xmlparser_x64.mk b/shell/StaticLibrary_xmlparser_x64.mk
index 244c310ffdf1..185818dbf56e 100644
--- a/shell/StaticLibrary_xmlparser_x64.mk
+++ b/shell/StaticLibrary_xmlparser_x64.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_StaticLibrary_set_include,shell_xmlparser_x64,\
))
$(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser_x64,\
- expat_utf8_x64 \
+ expat_x64 \
))
$(eval $(call gb_StaticLibrary_add_x64_generated_exception_objects,shell_xmlparser_x64,\
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 0abe61e9c015..17d1ef6c1723 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -595,7 +595,7 @@ $(eval $(call gb_Library_use_static_libraries,vcl,\
$(eval $(call gb_Library_use_externals,vcl,\
fontconfig \
freetype \
- expat_utf8 \
+ expat \
))
endif
diff --git a/xmlhelp/Library_tvhlp1.mk b/xmlhelp/Library_tvhlp1.mk
index cb0aeec73284..b2624e9a8363 100644
--- a/xmlhelp/Library_tvhlp1.mk
+++ b/xmlhelp/Library_tvhlp1.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Library_use_sdk_api,tvhlp1))
$(eval $(call gb_Library_use_externals,tvhlp1,\
boost_headers \
- expat_utf8 \
+ expat \
))
$(eval $(call gb_Library_use_libraries,tvhlp1,\
diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk
index ecadcca943f0..6ff8f1a41991 100644
--- a/xmlhelp/Library_ucpchelp1.mk
+++ b/xmlhelp/Library_ucpchelp1.mk
@@ -58,7 +58,7 @@ $(eval $(call gb_Library_use_sdk_api,ucpchelp1))
$(eval $(call gb_Library_use_externals,ucpchelp1,\
boost_headers \
clucene \
- expat_utf8 \
+ expat \
libxml2 \
libxslt \
))
generated by cgit (git 2.34.1) at 2024-05-12 01:22:28 +0000