diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-02-19 11:20:31 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-02-19 13:23:05 +0100 |
| commit | 5de206a7fbe74a7022bb3b20f190e6a3e6f1e3ae (patch) | |
| tree | f5fdfd65a65a949069422971e540494c11a42e5e | |
| parent | fe8bcfa422c654e35ec22b5e3b1a512ae438b565 (diff) | |
rename SYSTEM_LIBWPD to SYSTEM_WPD to remove specialcasing
Change-Id: Ibc8178e2dd7209705cb752f9570e414483c319a7
| -rw-r--r-- | RepositoryExternal.mk | 6 | ||||
| -rw-r--r-- | config_host.mk.in | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libwpd/Module_libwpd.mk | 2 | ||||
| -rw-r--r-- | writerperfect/Module_writerperfect.mk | 6 |
5 files changed, 8 insertions, 10 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index f838bf8df31b..447ddf6f153d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1284,7 +1284,7 @@ endef endif # SYSTEM_VISIO -ifeq ($(SYSTEM_LIBWPD),YES) +ifeq ($(SYSTEM_WPD),YES) define gb_LinkTarget__use_wpd $(call gb_LinkTarget_set_include,$(1),\ @@ -1296,7 +1296,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(WPD_LIBS)) endef gb_ExternalProject__use_wpd := -else # !SYSTEM_LIBWPD +else # !SYSTEM_WPD $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ wpd-0.9 \ @@ -1316,7 +1316,7 @@ $(call gb_ExternalProject_use_package,$(1),libwpd) endef -endif # SYSTEM_LIBWPD +endif # SYSTEM_WPD ifeq ($(SYSTEM_LIBWPG),YES) diff --git a/config_host.mk.in b/config_host.mk.in index dc18078c7a0a..e4ccac58b094 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -554,7 +554,7 @@ export SYSTEM_LIBMSPUB=@SYSTEM_LIBMSPUB@ export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@ export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@ export SYSTEM_VISIO=@SYSTEM_VISIO@ -export SYSTEM_LIBWPD=@SYSTEM_LIBWPD@ +export SYSTEM_WPD=@SYSTEM_WPD@ export SYSTEM_LIBWPG=@SYSTEM_LIBWPG@ export SYSTEM_LIBWPS=@SYSTEM_LIBWPS@ export SYSTEM_LIBXML=@SYSTEM_LIBXML@ diff --git a/configure.ac b/configure.ac index 06661c7959dc..0b547e75f2a8 100644 --- a/configure.ac +++ b/configure.ac @@ -7297,8 +7297,6 @@ else fi libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 libwpd-stream-0.9]) fi -SYSTEM_LIBWPD=$SYSTEM_WPD -AC_SUBST(SYSTEM_LIBWPD) dnl =================================================================== dnl Check for system lcms2 diff --git a/libwpd/Module_libwpd.mk b/libwpd/Module_libwpd.mk index bd74b12f9b48..13ef595e47aa 100644 --- a/libwpd/Module_libwpd.mk +++ b/libwpd/Module_libwpd.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,libwpd)) -ifeq ($(SYSTEM_LIBWPD),NO) +ifeq ($(SYSTEM_WPD),NO) $(eval $(call gb_Module_add_targets,libwpd,\ ExternalProject_libwpd \ diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk index 5b10dcce1259..4bf5cc58b50b 100644 --- a/writerperfect/Module_writerperfect.mk +++ b/writerperfect/Module_writerperfect.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Module_Module,writerperfect)) -ifneq (,$(SYSTEM_LIBWPD)) +ifneq (,$(SYSTEM_WPD)) ifneq (,$(SYSTEM_LIBWPS)) $(eval $(call gb_Module_add_targets,writerperfect,\ Library_wpftwriter \ @@ -27,7 +27,7 @@ $(eval $(call gb_Module_add_targets,writerperfect,\ endif endif -ifneq (,$(SYSTEM_LIBWPD)) +ifneq (,$(SYSTEM_WPD)) ifneq (,$(SYSTEM_LIBWPG)) ifneq (,$(SYSTEM_VISIO)) ifneq (,$(SYSTEM_LIBCDR)) @@ -41,7 +41,7 @@ endif endif endif -ifneq (,$(SYSTEM_LIBWPD)) +ifneq (,$(SYSTEM_WPD)) ifneq (,$(SYSTEM_LIBWPG)) $(eval $(call gb_Module_add_targets,writerperfect,\ StaticLibrary_writerperfect \ |