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

do not merge public ure libraries

Browse Source 
No more need for URELIBS, depend only on MERGELIBS.

Change-Id: I5a93031116c26bbbe375e9c467e7b427487ec18b
This commit is contained in:
Matúš Kukan 2013-04-16 11:47:34 +02:00
parent fdb6b39d68
commit 75ece7acdc
6 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Repository.mk
View File

@ -431,7 +431,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,URE, \
$(if $(SOLAR_JAVA),sunjavaplugin) \ $(if $(SOLAR_JAVA),sunjavaplugin) \
unoidl \ unoidl \
unsafe_uno \ unsafe_uno \
$(if $(URELIBS),urelibs) \ $(if $(MERGELIBS),urelibs) \
xmlreader \ xmlreader \
$(if $(filter MSC,$(COM)),$(if $(filter INTEL,$(CPUNAME)),msci,mscx),gcc3)_uno \ $(if $(filter MSC,$(COM)),$(if $(filter INTEL,$(CPUNAME)),msci,mscx),gcc3)_uno \
)) ))

2
RepositoryModule_host.mk
View File

@ -240,7 +240,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
ifneq ($(MERGELIBS),) ifneq ($(MERGELIBS),)
$(eval $(call gb_Module_add_targets,libreoffice,\ $(eval $(call gb_Module_add_targets,libreoffice,\
Library_merged \ Library_merged \
$(if $(URELIBS),Library_urelibs) \ Library_urelibs \
)) ))
endif endif

1
config_host.mk.in
View File

@ -536,7 +536,6 @@ export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@
export UNIXWRAPPERNAME=@UNIXWRAPPERNAME@ export UNIXWRAPPERNAME=@UNIXWRAPPERNAME@
export UNOWINREG_DLL=@UNOWINREG_DLL@ export UNOWINREG_DLL=@UNOWINREG_DLL@
export UPD=@UPD@ export UPD=@UPD@
export URELIBS=@URELIBS@
export USE_FT_EMBOLDEN=@USE_FT_EMBOLDEN@ export USE_FT_EMBOLDEN=@USE_FT_EMBOLDEN@
export USE_XINERAMA=@USE_XINERAMA@ export USE_XINERAMA=@USE_XINERAMA@
export use_shl_version=@use_shl_version@ export use_shl_version=@use_shl_version@

2
configure.ac
View File

@ -11723,7 +11723,6 @@ if test -n "$enable_mergelibs" -a "$enable_mergelibs" != "no"; then
fi fi
if test "$enable_mergelibs" = "all"; then if test "$enable_mergelibs" = "all"; then
MERGELIBS="ALL" MERGELIBS="ALL"
URELIBS="TRUE"
else else
MERGELIBS="CORE" MERGELIBS="CORE"
fi fi
@ -11732,7 +11731,6 @@ else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
AC_SUBST([MERGELIBS]) AC_SUBST([MERGELIBS])
AC_SUBST([URELIBS])
# =================================================================== # ===================================================================
# Create hardlinks on deliver instead of copying for smaller size and speed up # Create hardlinks on deliver instead of copying for smaller size and speed up

2
desktop/Pagein_common.mk
View File

@ -30,7 +30,7 @@ $(eval $(call gb_Pagein_Pagein,common))
# sorted in approx. reverse load order (ld.so.1) # sorted in approx. reverse load order (ld.so.1)
$(eval $(call gb_Pagein_add_objects,common,\ $(eval $(call gb_Pagein_add_objects,common,\
$(if $(MERGELIBS),merged) \ $(if $(MERGELIBS),merged) \
$(if $(URELIBS),urelibs) \ $(if $(MERGELIBS),urelibs) \
i18nlangtag \ i18nlangtag \
$(if $(findstring YES,$(SYSTEM_ICU)),,\ $(if $(findstring YES,$(SYSTEM_ICU)),,\
icui18n \ icui18n \

17
solenv/gbuild/extensions/pre_MergedLibsList.mk
View File

@ -179,21 +179,20 @@ gb_MERGEDLIBS := \
xstor \ xstor \
$(if $(filter ALL,$(MERGELIBS)),$(gb_EXTRAMERGEDLIBS)) $(if $(filter ALL,$(MERGELIBS)),$(gb_EXTRAMERGEDLIBS))
ifneq (,$(URELIBS))
gb_URELIBS := \ gb_URELIBS := \
cppu \
cppuhelper \
$(if $(filter TRUE,$(SOLAR_JAVA)),jvmaccess) \ $(if $(filter TRUE,$(SOLAR_JAVA)),jvmaccess) \
$(if $(filter TRUE,$(SOLAR_JAVA)),jvmfwk) \ $(if $(filter TRUE,$(SOLAR_JAVA)),jvmfwk) \
purpenvhelper \
reg \ reg \
sal \
salhelper \
store \ store \
unoidl \ unoidl \
xmlreader xmlreader \
$(if $(filter ALL,$(MERGELIBS)), \
endif cppu \
cppuhelper \
purpenvhelper \
sal \
salhelper \
)
endif endif