summaryrefslogtreecommitdiff
path: root/RepositoryExternal.mk
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 /RepositoryExternal.mk
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 'RepositoryExternal.mk')
-rw-r--r--RepositoryExternal.mk16
1 files changed, 8 insertions, 8 deletions
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