summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2013-02-19 11:26:46 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2013-02-19 13:23:06 +0100
commit3a3254a900a6a8aad8d3321bf8b10d1770555cf5 (patch)
treee5e8da3eac840aa7ac4e1116b52d006ebf4ee538
parenta4c80756ca429ac3654455b5e6a6b6a700361b9a (diff)
rename SYSTEM_LIBWPS to SYSTEM_WPS to remove specialcasing
Change-Id: I54880cd7d404692b8fee16c331c8e7a64508f52b
-rw-r--r--RepositoryExternal.mk12
-rw-r--r--config_host.mk.in4
-rw-r--r--configure.ac4
-rw-r--r--libwpg/Module_libwpg.mk2
-rw-r--r--libwps/Module_libwps.mk2
-rw-r--r--writerperfect/Module_writerperfect.mk6
6 files changed, 13 insertions, 17 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d295a0c2e0ab..aed173be9ad7 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1319,7 +1319,7 @@ endef
endif # SYSTEM_WPD
-ifeq ($(SYSTEM_LIBWPG),YES)
+ifeq ($(SYSTEM_WPG),YES)
define gb_LinkTarget__use_wpg
$(call gb_LinkTarget_set_include,$(1),\
@@ -1331,7 +1331,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(WPG_LIBS))
endef
gb_ExternalProject__use_wpg :=
-else # !SYSTEM_LIBWPG
+else # !SYSTEM_WPG
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
wpglib \
@@ -1352,10 +1352,10 @@ $(call gb_ExternalProject_use_static_libraries,$(1),wpglib)
endef
-endif # SYSTEM_LIBWPG
+endif # SYSTEM_WPG
-ifeq ($(SYSTEM_LIBWPS),YES)
+ifeq ($(SYSTEM_WPS),YES)
define gb_LinkTarget__use_wps
$(call gb_LinkTarget_set_include,$(1),\
@@ -1367,7 +1367,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(WPS_LIBS))
endef
gb_ExternalProject__use_wps :=
-else # !SYSTEM_LIBWPS
+else # !SYSTEM_WPS
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
wpslib \
@@ -1385,7 +1385,7 @@ $(call gb_ExternalProject_use_static_libraries,$(1),wpslib)
endef
-endif # SYSTEM_LIBWPS
+endif # SYSTEM_WPS
ifeq ($(SYSTEM_LCMS2),YES)
diff --git a/config_host.mk.in b/config_host.mk.in
index 2d63e3507e6b..2e2fa56337d7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -555,8 +555,8 @@ export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@
export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@
export SYSTEM_VISIO=@SYSTEM_VISIO@
export SYSTEM_WPD=@SYSTEM_WPD@
-export SYSTEM_LIBWPG=@SYSTEM_LIBWPG@
-export SYSTEM_LIBWPS=@SYSTEM_LIBWPS@
+export SYSTEM_LIBWPG=@SYSTEM_WPG@
+export SYSTEM_WPS=@SYSTEM_WPS@
export SYSTEM_LIBXML=@SYSTEM_LIBXML@
export SYSTEM_LIBXSLT=@SYSTEM_LIBXSLT@
export SYSTEM_LIBXSLT_FOR_BUILD=@SYSTEM_LIBXSLT_FOR_BUILD@
diff --git a/configure.ac b/configure.ac
index 9013f05f9615..ef68d5288f04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7343,8 +7343,6 @@ else
fi
libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.2])
fi
-SYSTEM_LIBWPS=$SYSTEM_WPS
-AC_SUBST(SYSTEM_LIBWPS)
dnl ===================================================================
dnl Check for system libwpg
@@ -7358,8 +7356,6 @@ else
fi
libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.2])
fi
-SYSTEM_LIBWPG=$SYSTEM_WPG
-AC_SUBST(SYSTEM_LIBWPG)
dnl ===================================================================
dnl Check whether freetype2 supports emboldening
diff --git a/libwpg/Module_libwpg.mk b/libwpg/Module_libwpg.mk
index e628b89cda8c..63924c21664b 100644
--- a/libwpg/Module_libwpg.mk
+++ b/libwpg/Module_libwpg.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,libwpg))
-ifeq ($(SYSTEM_LIBWPG),NO)
+ifeq ($(SYSTEM_WPG),NO)
$(eval $(call gb_Module_add_targets,libwpg,\
ExternalPackage_libwpg \
diff --git a/libwps/Module_libwps.mk b/libwps/Module_libwps.mk
index a903fa955389..b17779a3d24a 100644
--- a/libwps/Module_libwps.mk
+++ b/libwps/Module_libwps.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,libwps))
-ifeq ($(SYSTEM_LIBWPS),NO)
+ifeq ($(SYSTEM_WPS),NO)
$(eval $(call gb_Module_add_targets,libwps,\
ExternalPackage_libwps \
diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk
index faf9d4301d22..0a9b8b570514 100644
--- a/writerperfect/Module_writerperfect.mk
+++ b/writerperfect/Module_writerperfect.mk
@@ -20,7 +20,7 @@
$(eval $(call gb_Module_Module,writerperfect))
ifneq (,$(SYSTEM_WPD))
-ifneq (,$(SYSTEM_LIBWPS))
+ifneq (,$(SYSTEM_WPS))
$(eval $(call gb_Module_add_targets,writerperfect,\
Library_wpftwriter \
))
@@ -28,7 +28,7 @@ endif
endif
ifneq (,$(SYSTEM_WPD))
-ifneq (,$(SYSTEM_LIBWPG))
+ifneq (,$(SYSTEM_WPG))
ifneq (,$(SYSTEM_VISIO))
ifneq (,$(SYSTEM_CDR))
ifneq (,$(SYSTEM_MSPUB))
@@ -42,7 +42,7 @@ endif
endif
ifneq (,$(SYSTEM_WPD))
-ifneq (,$(SYSTEM_LIBWPG))
+ifneq (,$(SYSTEM_WPG))
$(eval $(call gb_Module_add_targets,writerperfect,\
StaticLibrary_writerperfect \
))