diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-02-19 11:22:02 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-02-19 13:23:06 +0100 |
| commit | fb455e5013ab014058ad5f92238ef6fc91b2afcf (patch) | |
| tree | ad18a9c8002074f3b788c5cc1b7af5e5a50b1749 | |
| parent | 5de206a7fbe74a7022bb3b20f190e6a3e6f1e3ae (diff) | |
rename SYSTEM_LIBCDR to SYSTEM_CDR to remove specialcasing
Change-Id: I14bd9c0a4b9b55963da67102468d573f7132fab7
| -rw-r--r-- | RepositoryExternal.mk | 6 | ||||
| -rw-r--r-- | config_host.mk.in | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libcdr/Module_libcdr.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 447ddf6f153d..669c74b00bc6 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1194,7 +1194,7 @@ endef endif # SYSTEM_OPENSSL -ifeq ($(SYSTEM_LIBCDR),YES) +ifeq ($(SYSTEM_CDR),YES) define gb_LinkTarget__use_cdr $(call gb_LinkTarget_set_include,$(1),\ @@ -1205,7 +1205,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(CDR_LIBS)) endef -else # !SYSTEM_LIBCDR +else # !SYSTEM_CDR $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ cdr-0.0 \ @@ -1221,7 +1221,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ endef -endif # SYSTEM_LIBCDR +endif # SYSTEM_CDR ifeq ($(SYSTEM_LIBMSPUB),YES) diff --git a/config_host.mk.in b/config_host.mk.in index e4ccac58b094..36339e2db671 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -545,7 +545,7 @@ export SYSTEM_JFREEREPORT=@SYSTEM_JFREEREPORT@ export SYSTEM_JPEG=@SYSTEM_JPEG@ export SYSTEM_LCMS2=@SYSTEM_LCMS2@ export SYSTEM_LIBC=@SYSTEM_LIBC@ -export SYSTEM_LIBCDR=@SYSTEM_LIBCDR@ +export SYSTEM_CDR=@SYSTEM_CDR@ export SYSTEM_CMIS=@SYSTEM_CMIS@ export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@ export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@ diff --git a/configure.ac b/configure.ac index 0b547e75f2a8..30d25e53c44f 100644 --- a/configure.ac +++ b/configure.ac @@ -7255,8 +7255,6 @@ if test $_os = iOS; then else libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.0 >= 0.0.5]) fi -SYSTEM_LIBCDR=$SYSTEM_CDR -AC_SUBST(SYSTEM_LIBCDR) dnl =================================================================== dnl Check for system libmspub diff --git a/libcdr/Module_libcdr.mk b/libcdr/Module_libcdr.mk index a9ee9240c8ee..e92d5ad8e1ca 100644 --- a/libcdr/Module_libcdr.mk +++ b/libcdr/Module_libcdr.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,libcdr)) -ifeq ($(SYSTEM_LIBCDR),NO) +ifeq ($(SYSTEM_CDR),NO) $(eval $(call gb_Module_add_targets,libcdr,\ ExternalPackage_libcdr \ diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk index 4bf5cc58b50b..ecac55a54df4 100644 --- a/writerperfect/Module_writerperfect.mk +++ b/writerperfect/Module_writerperfect.mk @@ -30,7 +30,7 @@ endif ifneq (,$(SYSTEM_WPD)) ifneq (,$(SYSTEM_LIBWPG)) ifneq (,$(SYSTEM_VISIO)) -ifneq (,$(SYSTEM_LIBCDR)) +ifneq (,$(SYSTEM_CDR)) ifneq (,$(SYSTEM_LIBMSPUB)) $(eval $(call gb_Module_add_targets,writerperfect,\ Library_wpftdraw \ |