diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-02-19 11:22:51 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-02-19 13:23:06 +0100 |
| commit | a4c80756ca429ac3654455b5e6a6b6a700361b9a (patch) | |
| tree | 128e1686ea0be858c6533a3b57d7e41b7a22ee1c | |
| parent | fb455e5013ab014058ad5f92238ef6fc91b2afcf (diff) | |
rename SYSTEM_LIBMSPUB to SYSTEM_MSPUB to remove specialcasing
Change-Id: I06d6dec259f4e1d28d0fb13497097bbfae156b2f
| -rw-r--r-- | RepositoryExternal.mk | 6 | ||||
| -rw-r--r-- | config_host.mk.in | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libmspub/Module_libmspub.mk | 2 | ||||
| -rw-r--r-- | writerperfect/Module_writerperfect.mk | 2 |
5 files changed, 6 insertions, 8 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 669c74b00bc6..d295a0c2e0ab 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1224,7 +1224,7 @@ endef endif # SYSTEM_CDR -ifeq ($(SYSTEM_LIBMSPUB),YES) +ifeq ($(SYSTEM_MSPUB),YES) define gb_LinkTarget__use_mspub $(call gb_LinkTarget_set_include,$(1),\ @@ -1235,7 +1235,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(MSPUB_LIBS)) endef -else # !SYSTEM_LIBMSPUB +else # !SYSTEM_MSPUB $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ mspub-0.0 \ @@ -1251,7 +1251,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ endef -endif # SYSTEM_LIBMSPUB +endif # SYSTEM_MSPUB ifeq ($(SYSTEM_VISIO),YES) diff --git a/config_host.mk.in b/config_host.mk.in index 36339e2db671..2d63e3507e6b 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -550,7 +550,7 @@ export SYSTEM_CMIS=@SYSTEM_CMIS@ export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@ export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@ export SYSTEM_LIBLANGTAG=@SYSTEM_LIBLANGTAG@ -export SYSTEM_LIBMSPUB=@SYSTEM_LIBMSPUB@ +export SYSTEM_MSPUB=@SYSTEM_MSPUB@ export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@ export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@ export SYSTEM_VISIO=@SYSTEM_VISIO@ diff --git a/configure.ac b/configure.ac index 30d25e53c44f..9013f05f9615 100644 --- a/configure.ac +++ b/configure.ac @@ -7265,8 +7265,6 @@ if test $_os = iOS; then else libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.0]) fi -SYSTEM_LIBMSPUB=$SYSTEM_MSPUB -AC_SUBST(SYSTEM_LIBMSPUB) dnl =================================================================== dnl Check for system libvisio diff --git a/libmspub/Module_libmspub.mk b/libmspub/Module_libmspub.mk index fd67e906c2f1..844ac5451d1f 100644 --- a/libmspub/Module_libmspub.mk +++ b/libmspub/Module_libmspub.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,libmspub)) -ifeq ($(SYSTEM_LIBMSPUB),NO) +ifeq ($(SYSTEM_MSPUB),NO) $(eval $(call gb_Module_add_targets,libmspub,\ ExternalPackage_libmspub \ diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk index ecac55a54df4..faf9d4301d22 100644 --- a/writerperfect/Module_writerperfect.mk +++ b/writerperfect/Module_writerperfect.mk @@ -31,7 +31,7 @@ ifneq (,$(SYSTEM_WPD)) ifneq (,$(SYSTEM_LIBWPG)) ifneq (,$(SYSTEM_VISIO)) ifneq (,$(SYSTEM_CDR)) -ifneq (,$(SYSTEM_LIBMSPUB)) +ifneq (,$(SYSTEM_MSPUB)) $(eval $(call gb_Module_add_targets,writerperfect,\ Library_wpftdraw \ )) |