rename expat external to 'expat'

expat_utf16 is long gone, so there is no need to fool around with
expat_utf8.

Change-Id: I0dd4a5c4d78805e98913e645cc83d2ab634bcb89

Library_merged.mk

@@ -56,7 +56,7 @@ $(eval $(call gb_Library_use_externals,merged,\
 	cppunit \
 	cups \
 	curl \
-	expat_utf8 \
+	expat \
 	hunspell \
 	hyphen \
 	icui18n \

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
 

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 \

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 \

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 \

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 \

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

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

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

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

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

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

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

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

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

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

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

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

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

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
 

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

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