mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename SYSTEM_LIBCDR to SYSTEM_CDR to remove specialcasing

Browse Source 
Change-Id: I14bd9c0a4b9b55963da67102468d573f7132fab7
This commit is contained in:
Bjoern Michaelsen
2013-02-19 11:22:02 +01:00
parent 5de206a7fb
commit fb455e5013
5 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
RepositoryExternal.mk
View File

@@ -1194,7 +1194,7 @@ endef
endif # SYSTEM_OPENSSL endif # SYSTEM_OPENSSL
ifeq ($(SYSTEM_LIBCDR),YES) ifeq ($(SYSTEM_CDR),YES)
define gb_LinkTarget__use_cdr define gb_LinkTarget__use_cdr
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
@@ -1205,7 +1205,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(CDR_LIBS))
endef endef
else # !SYSTEM_LIBCDR else # !SYSTEM_CDR
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
cdr-0.0 \ cdr-0.0 \
@@ -1221,7 +1221,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
endef endef
endif # SYSTEM_LIBCDR endif # SYSTEM_CDR
ifeq ($(SYSTEM_LIBMSPUB),YES) ifeq ($(SYSTEM_LIBMSPUB),YES)

2
config_host.mk.in
View File

@@ -545,7 +545,7 @@ export SYSTEM_JFREEREPORT=@SYSTEM_JFREEREPORT@
export SYSTEM_JPEG=@SYSTEM_JPEG@ export SYSTEM_JPEG=@SYSTEM_JPEG@
export SYSTEM_LCMS2=@SYSTEM_LCMS2@ export SYSTEM_LCMS2=@SYSTEM_LCMS2@
export SYSTEM_LIBC=@SYSTEM_LIBC@ export SYSTEM_LIBC=@SYSTEM_LIBC@
export SYSTEM_LIBCDR=@SYSTEM_LIBCDR@ export SYSTEM_CDR=@SYSTEM_CDR@
export SYSTEM_CMIS=@SYSTEM_CMIS@ export SYSTEM_CMIS=@SYSTEM_CMIS@
export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@ export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@
export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@ export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@

2
configure.ac
View File

@@ -7255,8 +7255,6 @@ if test $_os = iOS; then
else else
libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.0 >= 0.0.5]) libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.0 >= 0.0.5])
fi fi
SYSTEM_LIBCDR=$SYSTEM_CDR
AC_SUBST(SYSTEM_LIBCDR)
dnl =================================================================== dnl ===================================================================
dnl Check for system libmspub dnl Check for system libmspub

2
libcdr/Module_libcdr.mk
View File

@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,libcdr)) $(eval $(call gb_Module_Module,libcdr))
ifeq ($(SYSTEM_LIBCDR),NO) ifeq ($(SYSTEM_CDR),NO)
$(eval $(call gb_Module_add_targets,libcdr,\ $(eval $(call gb_Module_add_targets,libcdr,\
ExternalPackage_libcdr \ ExternalPackage_libcdr \

2
writerperfect/Module_writerperfect.mk
View File

@@ -30,7 +30,7 @@ endif
ifneq (,$(SYSTEM_WPD)) ifneq (,$(SYSTEM_WPD))
ifneq (,$(SYSTEM_LIBWPG)) ifneq (,$(SYSTEM_LIBWPG))
ifneq (,$(SYSTEM_VISIO)) ifneq (,$(SYSTEM_VISIO))
ifneq (,$(SYSTEM_LIBCDR)) ifneq (,$(SYSTEM_CDR))
ifneq (,$(SYSTEM_LIBMSPUB)) ifneq (,$(SYSTEM_LIBMSPUB))
$(eval $(call gb_Module_add_targets,writerperfect,\ $(eval $(call gb_Module_add_targets,writerperfect,\
Library_wpftdraw \ Library_wpftdraw \