nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-12 05:26:02 +01:00
Code Activity

Rename the find-roots library

Browse source 
Give it a name more in line with the rest
This commit is contained in:
Théophane Hufschmitt 2022-04-11 10:20:36 +02:00
parent 072f420260
commit f6a30993f0
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -2,6 +2,7 @@ makefiles = \
mk/precompiled-headers.mk \ mk/precompiled-headers.mk \
local.mk \ local.mk \
src/libutil/local.mk \ src/libutil/local.mk \
src/nix-find-roots/local.mk \
src/libutil/tests/local.mk \ src/libutil/tests/local.mk \
src/libstore/local.mk \ src/libstore/local.mk \
src/libstore/tests/local.mk \ src/libstore/tests/local.mk \
@ -10,7 +11,6 @@ makefiles = \
src/libexpr/local.mk \ src/libexpr/local.mk \
src/libcmd/local.mk \ src/libcmd/local.mk \
src/nix/local.mk \ src/nix/local.mk \
src/nix-find-roots/local.mk \
src/resolve-system-dependencies/local.mk \ src/resolve-system-dependencies/local.mk \
scripts/local.mk \ scripts/local.mk \
misc/bash/local.mk \ misc/bash/local.mk \

2
src/libstore/local.mk
View file

@ -6,7 +6,7 @@ libstore_DIR := $(d)
libstore_SOURCES := $(wildcard $(d)/*.cc $(d)/builtins/*.cc $(d)/build/*.cc) 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 libstore_LDFLAGS += $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(SODIUM_LIBS) -pthread
ifdef HOST_LINUX ifdef HOST_LINUX

10
src/nix-find-roots/local.mk
View file

@ -1,11 +1,11 @@
ifndef HOST_DARWIN 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 programs += nix-find-roots
@ -13,7 +13,7 @@ nix-find-roots_DIR := $(d)
nix-find-roots_SOURCES := $(d)/main.cc nix-find-roots_SOURCES := $(d)/main.cc
nix-find-roots_LIBS := find-roots nix-find-roots_LIBS := libfindroots
nix-find-roots_CXXFLAGS += \ nix-find-roots_CXXFLAGS += \
-I src/nix-find-roots/lib -I src/nix-find-roots/lib