summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-04-09 09:22:20 +0200
committerDavid Tardon <dtardon@redhat.com>2013-04-09 09:46:38 +0200
commit51149806f890e8181c016713cff30bc0c9c06450 (patch)
tree93d0d0a32dc0a7f53cb994a3af36f2616b2e8fa2 /shell
parent02a8e8acd1f0cbb512868fd9849363f9d069db95 (diff)
rename expat external to 'expat'
expat_utf16 is long gone, so there is no need to fool around with expat_utf8. Change-Id: I0dd4a5c4d78805e98913e645cc83d2ab634bcb89
Diffstat (limited to 'shell')
-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
11 files changed, 11 insertions, 11 deletions
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,\