From f6a30993f05edce7d6d888fc21aaa63d13fb5328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?=
 <theophane.hufschmitt@tweag.io>
Date: Mon, 11 Apr 2022 10:20:36 +0200
Subject: [PATCH] Rename the find-roots library

Give it a name more in line with the rest
---
 Makefile                    |  2 +-
 src/libstore/local.mk       |  2 +-
 src/nix-find-roots/local.mk | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index d4f5e53d9..c44fa2128 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ makefiles = \
   mk/precompiled-headers.mk \
   local.mk \
   src/libutil/local.mk \
+  src/nix-find-roots/local.mk \
   src/libutil/tests/local.mk \
   src/libstore/local.mk \
   src/libstore/tests/local.mk \
@@ -10,7 +11,6 @@ makefiles = \
   src/libexpr/local.mk \
   src/libcmd/local.mk \
   src/nix/local.mk \
-  src/nix-find-roots/local.mk \
   src/resolve-system-dependencies/local.mk \
   scripts/local.mk \
   misc/bash/local.mk \
diff --git a/src/libstore/local.mk b/src/libstore/local.mk
index 31daf4eac..004f955c3 100644
--- a/src/libstore/local.mk
+++ b/src/libstore/local.mk
@@ -6,7 +6,7 @@ libstore_DIR := $(d)
 
 libstore_SOURCES := $(wildcard $(d)/*.cc $(d)/builtins/*.cc $(d)/build/*.cc)
 
-libstore_LIBS = libutil find-roots
+libstore_LIBS = libutil libfindroots
 
 libstore_LDFLAGS += $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(SODIUM_LIBS) -pthread
 ifdef HOST_LINUX
diff --git a/src/nix-find-roots/local.mk b/src/nix-find-roots/local.mk
index a4bf2fd43..1b3f010e3 100644
--- a/src/nix-find-roots/local.mk
+++ b/src/nix-find-roots/local.mk
@@ -1,11 +1,11 @@
 ifndef HOST_DARWIN
-libraries += find-roots
+libraries += libfindroots
 
-find-roots_NAME = libfindroots
+libfindroots_NAME = libnixfindroots
 
-find-roots_DIR := $(d)/lib
+libfindroots_DIR := $(d)/lib
 
-find-roots_SOURCES := $(wildcard $(d)/lib/*.cc)
+libfindroots_SOURCES := $(wildcard $(d)/lib/*.cc)
 
 programs += nix-find-roots
 
@@ -13,7 +13,7 @@ nix-find-roots_DIR := $(d)
 
 nix-find-roots_SOURCES := $(d)/main.cc
 
-nix-find-roots_LIBS := find-roots
+nix-find-roots_LIBS := libfindroots
 
 nix-find-roots_CXXFLAGS += \
 	-I src/nix-find-roots/lib