From f5c74abc9fbbe8fc652a85801a87073d40a79b2d Mon Sep 17 00:00:00 2001
From: Matúš Kukan <matus.kukan@gmail.com>
Date: Fri, 20 Mar 2015 08:05:07 +0100
Subject: Remove library urelibs. It was more just a temporary hack and is not
 used.

Change-Id: I7566dcf21aae6b800adb58d8c94e350bb0da720c
---
 Library_urelibs.mk                             | 47 --------------------------
 Repository.mk                                  |  1 -
 RepositoryModule_host.mk                       |  1 -
 bin/module-deps.pl                             |  1 -
 config_host.mk.in                              |  1 -
 configure.ac                                   |  2 --
 desktop/Pagein_common.mk                       |  1 -
 solenv/bin/install-gdb-printers                | 11 ++----
 solenv/gbuild/Helper.mk                        |  2 +-
 solenv/gbuild/Library.mk                       |  2 +-
 solenv/gbuild/LinkTarget.mk                    | 11 +++---
 solenv/gbuild/Pagein.mk                        |  2 +-
 solenv/gbuild/extensions/pre_MergedLibsList.mk | 22 ------------
 13 files changed, 10 insertions(+), 94 deletions(-)
 delete mode 100644 Library_urelibs.mk

diff --git a/Library_urelibs.mk b/Library_urelibs.mk
deleted file mode 100644
index dfcdd53b700a..000000000000
--- a/Library_urelibs.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Library_Library,urelibs))
-
-# gb_URELIBS is defined in solenv/gbuild/extensions/pre_MergedLibsList.mk
-$(eval $(call gb_Library_use_library_objects,urelibs,\
-	$(gb_URELIBS) \
-))
-
-# needed to generate proper deps for module-deps.pl
-$(eval $(call gb_Library_use_libraries,urelibs,\
-	$(gb_UWINAPI) \
-))
-
-$(eval $(call gb_Library_use_static_libraries,urelibs,\
-	findsofficepath \
-))
-
-$(eval $(call gb_Library_use_externals,urelibs,\
-	libxml2 \
-))
-
-$(eval $(call gb_Library_add_libs,urelibs,\
-	$(if $(filter $(OS),LINUX), \
-		-ldl \
-		-lpthread \
-		-lrt \
-	) \
-))
-
-$(if $(filter $(OS),WNT), \
-	$(eval $(call gb_Library_use_system_win32_libs,urelibs,\
-		mpr \
-		ole32 \
-		shell32 \
-		ws2_32 \
-	)) \
-)
-
-# vim: set noet sw=4 ts=4:
diff --git a/Repository.mk b/Repository.mk
index 7b6f7d673a50..0928df685631 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -547,7 +547,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
 	) \
 	log_uno_uno \
 	unsafe_uno_uno \
-	$(if $(URELIBS),urelibs) \
 	$(if $(filter MSC,$(COM)),$(if $(filter INTEL,$(CPUNAME)),msci,mscx),gcc3)_uno \
 	$(if $(filter $(OS),WNT), \
 		uwinapi \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 2d7fcb8f8768..b215316d70a1 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_Module_Module,libreoffice))
 ifneq ($(MERGELIBS),)
 $(eval $(call gb_Module_add_targets,libreoffice,\
 	Library_merged \
-	$(if $(URELIBS),Library_urelibs) \
 ))
 endif
 
diff --git a/bin/module-deps.pl b/bin/module-deps.pl
index edf597da28c5..08126d07d936 100755
--- a/bin/module-deps.pl
+++ b/bin/module-deps.pl
@@ -166,7 +166,6 @@ sub create_lib_module_map()
     my %l2m;
     # hardcode the libs that don't have a directory
     $l2m{'merged'} = 'merged';
-    $l2m{'urelibs'} = 'urelibs';
 
     for (glob($src_root."/*/Library_*.mk"))
     {
diff --git a/config_host.mk.in b/config_host.mk.in
index 1a28e6353557..a242077147df 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -593,7 +593,6 @@ export TMPDIR=@TEMP_DIRECTORY@
 export TOUCH=@TOUCH@
 export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@
 export UNOWINREG_DLL=@UNOWINREG_DLL@
-export URELIBS=@URELIBS@
 export USE_LIBRARY_BIN_TAR=@USE_LIBRARY_BIN_TAR@
 export USE_XINERAMA=@USE_XINERAMA@
 export UUIDGEN=@UUIDGEN@
diff --git a/configure.ac b/configure.ac
index b42be82dc5cc..d9f0c70031c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12657,7 +12657,6 @@ if test -n "$enable_mergelibs" -a "$enable_mergelibs" != "no"; then
     fi
     if test "$enable_mergelibs" = "all"; then
         MERGELIBS="ALL"
-        URELIBS="TRUE"
         AC_DEFINE(STATIC_LINKING)
     else
         MERGELIBS="CORE"
@@ -12667,7 +12666,6 @@ else
     AC_MSG_RESULT([no])
 fi
 AC_SUBST([MERGELIBS])
-AC_SUBST([URELIBS])
 
 # ===================================================================
 # Create hardlinks on deliver instead of copying for smaller size and speed up
diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk
index 2609530bae50..fbd7f5548710 100644
--- a/desktop/Pagein_common.mk
+++ b/desktop/Pagein_common.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Pagein_Pagein,common))
 # sorted in approx. reverse load order (ld.so.1)
 $(eval $(call gb_Pagein_add_objects,common,\
     $(if $(MERGELIBS),merged) \
-    $(if $(URELIBS),urelibs) \
     i18nlangtag \
     $(if $(SYSTEM_ICU),,\
         libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR) \
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index c0a85f83c6be..036339e44112 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -122,16 +122,11 @@ if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then
     cp -pr "${GDBDIR}/libreoffice" "${DESTDIR}${pythondir}"
 fi
 
-# keep in sync with solenv/Package_gdb.mk
 if [[ -n "${MERGELIBS}" ]]; then
     make_autoload merged program libmergedlo."$DYLIB" merge svl tl basegfx `[[ ${MERGELIBS} == "ALL" ]] && echo sw`
-    if [[ ${MERGELIBS} == "ALL" ]]; then
-        make_autoload urelibs program liburelibs."$DYLIB" merge cppu sal
-    else
-        make_autoload cppu program libuno_cppu."$DYLIB".3
-        make_autoload sal program libuno_sal."$DYLIB".3
-        make_autoload sw program libswlo."$DYLIB"
-    fi
+    make_autoload cppu program libuno_cppu."$DYLIB".3
+    make_autoload sal program libuno_sal."$DYLIB".3
+    make_autoload sw program libswlo."$DYLIB"
 else
     make_autoload basegfx program libbasegfxlo."$DYLIB"
     make_autoload cppu program libuno_cppu."$DYLIB".3
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 943cce3e75b7..62817f59c680 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -188,7 +188,7 @@ $$(eval $$(call gb_Output_error,$(1) is not a valid group for installed librarie
 endif
 $(call gb_Helper__register_libraries,$(1),$(3))
 
-gb_Library_MODULE_$(2) += $(filter-out $(gb_MERGEDLIBS) $(gb_URELIBS),$(3))
+gb_Library_MODULE_$(2) += $(filter-out $(gb_MERGEDLIBS),$(3))
 
 $(if $(filter UNOVERLIBS RTVERLIBS,$(1)),\
 	gb_SdkLinkLibrary_MODULE_sdk += $(3))
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index fc57b3762aa5..8042f3357010 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -136,7 +136,7 @@ $(call gb_Library_get_clean_target,$(gb_Library__get_name)) : \
 	$(call gb_ComponentTarget_get_clean_target,$(2))
 endef
 
-gb_Library__get_name = $(if $(filter $(1),$(gb_MERGEDLIBS)),merged,$(if $(filter $(1),$(gb_URELIBS)),urelibs,$(1)))
+gb_Library__get_name = $(if $(filter $(1),$(gb_MERGEDLIBS)),merged,$(1))
 
 gb_Library__get_componentprefix = \
 	$(call gb_Library__get_layer_componentprefix,$(call \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 9faed8cdbf0a..d1602c997022 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -483,7 +483,7 @@ define gb_LinkTarget__command_impl
 		$(if $(findstring concat-deps,$(2)),,\
 			$(call gb_LinkTarget__command_dep,$(call gb_LinkTarget_get_dep_target,$(2)).tmp,$(2)) \
 			mv $(call gb_LinkTarget_get_dep_target,$(2)).tmp $(call gb_LinkTarget_get_dep_target,$(2))))
-	$(if $(filter $(2),$(foreach lib,$(gb_MERGEDLIBS) $(gb_URELIBS),$(call gb_Library__get_workdir_linktargetname,$(lib)))),\
+	$(if $(filter $(2),$(foreach lib,$(gb_MERGEDLIBS),$(call gb_Library__get_workdir_linktargetname,$(lib)))),\
 		$(if $(filter $(true),$(call gb_LinkTarget__is_build_lib,$(2))),\
 			$(call gb_LinkTarget__command,$(1),$(2)),\
 			mkdir -p $(dir $(1)) && echo invalid > $(1) \
@@ -796,8 +796,8 @@ define gb_LinkTarget__use_libraries
 
 # used by bin/module-deps.pl
 ifneq ($(ENABLE_PRINT_DEPS),)
-# exclude libraries in Library_merged Librery_urelibs
-ifeq ($(filter $(1),$(foreach lib,$(gb_MERGEDLIBS) $(gb_URELIBS),$(call gb_Library_get_linktarget,$(lib)))),)
+# exclude libraries in Library_merged
+ifeq ($(filter $(1),$(foreach lib,$(gb_MERGEDLIBS),$(call gb_Library_get_linktarget,$(lib)))),)
 $$(eval $$(call gb_PrintDeps_info,$(4),$(3)))
 endif
 endif
@@ -869,10 +869,7 @@ $(call gb_LinkTarget__use_libraries,$(1),$(2),$(strip \
 	$(if $(filter $(gb_MERGEDLIBS),$(2)), \
 		$(if $(call gb_LinkTarget__is_merged,$(1)), \
 			$(filter $(gb_MERGEDLIBS),$(2)), merged)) \
-	$(if $(filter $(gb_URELIBS),$(2)), \
-		$(if $(filter $(1),$(foreach lib,$(gb_URELIBS),$(call gb_Library_get_linktarget,$(lib)))), \
-		$(filter $(gb_URELIBS),$(2)), urelibs)) \
-	$(filter-out $(gb_MERGEDLIBS) $(gb_URELIBS),$(2)) \
+	$(filter-out $(gb_MERGEDLIBS),$(2)) \
 	),$(4))
 endif
 
diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk
index ee133cb85b06..1dd5cd692efd 100644
--- a/solenv/gbuild/Pagein.mk
+++ b/solenv/gbuild/Pagein.mk
@@ -47,7 +47,7 @@ $(call gb_Helper_install_final, \
 endef
 
 define gb_Pagein_add_object
-$(call gb_Pagein_get_target,$(1)) : OBJECTS += $(filter-out $(gb_URELIBS) $(gb_MERGEDLIBS),$(2))
+$(call gb_Pagein_get_target,$(1)) : OBJECTS += $(filter-out $(gb_MERGEDLIBS),$(2))
 
 endef
 
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index ea2b600963d1..ed77c1f0d085 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -158,28 +158,6 @@ gb_MERGEDLIBS := \
 	xstor \
 	$(if $(filter ALL,$(MERGELIBS)),$(gb_EXTRAMERGEDLIBS))
 
-ifneq (,$(URELIBS))
-gb_URELIBS := \
-	bootstrap \
-	cppu \
-	cppuhelper \
-	introspection \
-	$(if $(ENABLE_JAVA),jvmaccess) \
-	$(if $(ENABLE_JAVA),jvmfwk) \
-	reflection \
-	reg \
-	sal \
-	salhelper \
-	stocservices \
-	store \
-	unoidl \
-	xmlreader \
-	$(if $(filter ALL,$(MERGELIBS)), \
-		purpenvhelper \
-	)
-
-endif
-
 endif
 
 # vim: set noet sw=4 ts=4:
-- 
cgit v1.2.3