Rename the find-roots library
Give it a name more in line with the rest
This commit is contained in:
2
Makefile
2
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 \
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user