From d15d91cad1676cd08a184339ab0c586f7bcee205 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 30 Mar 2020 16:50:13 +0200 Subject: [PATCH] Makefile cleanup --- src/libstore/local.mk | 5 +---- tests/local.mk | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libstore/local.mk b/src/libstore/local.mk index b6d04834a..636f74b65 100644 --- a/src/libstore/local.mk +++ b/src/libstore/local.mk @@ -4,7 +4,7 @@ libstore_NAME = libnixstore libstore_DIR := $(d) -libstore_SOURCES := $(wildcard $(d)/*.cc $(d)/builtins/*.cc $(d)/fetchers/*.cc) +libstore_SOURCES := $(wildcard $(d)/*.cc $(d)/builtins/*.cc) libstore_LIBS = libutil libnixrust @@ -64,6 +64,3 @@ $(eval $(call install-file-in, $(d)/nix-store.pc, $(prefix)/lib/pkgconfig, 0644) $(foreach i, $(wildcard src/libstore/builtins/*.hh), \ $(eval $(call install-file-in, $(i), $(includedir)/nix/builtins, 0644))) - -$(foreach i, $(wildcard src/libstore/fetchers/*.hh), \ - $(eval $(call install-file-in, $(i), $(includedir)/nix/fetchers, 0644))) diff --git a/tests/local.mk b/tests/local.mk index 9e221f740..62bfcaac1 100644 --- a/tests/local.mk +++ b/tests/local.mk @@ -38,4 +38,4 @@ tests-environment = NIX_REMOTE= $(bash) -e clean-files += $(d)/common.sh $(d)/config.nix -installcheck: $(d)/common.sh $(d)/plugins/libplugintest.$(SO_EXT) $(d)/config.nix +installcheck: $(d)/common.sh $(d)/config.nix $(d)/plugins/libplugintest.$(SO_EXT)