Update Makefile variable names

This commit is contained in:
Eelco Dolstra 2014-02-01 12:23:14 +01:00
parent ac8c2ef1aa
commit 16e7d69209
18 changed files with 29 additions and 29 deletions

View file

@ -1,4 +1,4 @@
SUBS = \
makefiles = \
src/boost/format/local.mk \
src/libutil/local.mk \
src/libstore/local.mk \

View file

@ -2,4 +2,4 @@ corepkgs_FILES = nar.nix buildenv.nix buildenv.pl unpack-channel.nix derivation.
$(foreach file,config.nix $(corepkgs_FILES),$(eval $(call install-data-in,$(d)/$(file),$(datadir)/nix/corepkgs)))
template_files += $(d)/config.nix
template-files += $(d)/config.nix

View file

@ -26,7 +26,7 @@ $(d)/manual.is-valid: $(d)/manual.xmli
$(xmllint) --nonet --noout --relaxng $(docbookrng)/docbook.rng -
@touch $@
clean_files += $(d)/manual.xmli $(d)/version.txt $(d)/manual.is-valid
clean-files += $(d)/manual.xmli $(d)/version.txt $(d)/manual.is-valid
# Generate man pages.
@ -43,7 +43,7 @@ $(man-pages): $(d)/manual.xmli $(d)/manual.is-valid
$(docbookxsl)/profiling/profile.xsl $< 2> /dev/null | \
(cd doc/manual && $(XSLTPROC) $(docbookxsl)/manpages/docbook.xsl -)
clean_files += $(d)/*.1 $(d)/*.5 $(d)/*.8
clean-files += $(d)/*.1 $(d)/*.5 $(d)/*.8
# Generate the HTML manual.
@ -62,7 +62,7 @@ $(eval $(call install-symlink, manual.html, $(docdir)/manual/index.html))
all: $(d)/manual.html
clean_files += $(d)/manual.html
clean-files += $(d)/manual.html
# Generate the PDF manual.
@ -76,4 +76,4 @@ $(d)/manual.pdf: $(d)/manual.xml $(MANUAL_SRCS) $(d)/manual.is-valid
exit 1; \
fi
clean_files += $(d)/manual.pdf
clean-files += $(d)/manual.pdf

View file

@ -17,7 +17,7 @@ ifeq ($(perlbindings), yes)
$(d)/lib/Nix/Store.cc: $(d)/lib/Nix/Store.xs
xsubpp $^ -output $@
LIBS += Store
libraries += Store
Store_DIR := $(d)/lib/Nix
@ -37,6 +37,6 @@ ifeq ($(perlbindings), yes)
endif
clean_files += $(d)/lib/Nix/Config.pm $(d)/lib/Nix/Store.cc
clean-files += $(d)/lib/Nix/Config.pm $(d)/lib/Nix/Store.cc
dist_files += $(nix_perl_sources)
dist-files += $(nix_perl_sources)

View file

@ -9,7 +9,7 @@ nix_bin_scripts := \
$(d)/nix-pull \
$(d)/nix-push
bin_SCRIPTS += $(nix_bin_scripts)
bin-scripts += $(nix_bin_scripts)
nix_substituters := \
$(d)/copy-from-other-stores.pl \
@ -24,7 +24,7 @@ nix_noinst_scripts := \
$(d)/nix-reduce-build \
$(nix_substituters)
noinst_SCRIPTS += $(nix_noinst_scripts)
noinst-scripts += $(nix_noinst_scripts)
profiledir = $(sysconfdir)/profile.d
@ -34,6 +34,6 @@ $(eval $(call install-program-in, $(d)/build-remote.pl, $(libexecdir)/nix))
$(foreach prog, $(nix_substituters), $(eval $(call install-program-in, $(prog), $(libexecdir)/nix/substituters)))
$(eval $(call install-symlink, nix-build, $(bindir)/nix-shell))
clean_files += $(nix_bin_scripts) $(nix_noinst_scripts)
clean-files += $(nix_bin_scripts) $(nix_noinst_scripts)
dist_files += $(d)/*.in
dist-files += $(d)/*.in

View file

@ -1,4 +1,4 @@
LIBS += libformat
libraries += libformat
libformat_NAME = libnixformat

View file

@ -1,4 +1,4 @@
PROGRAMS += bsdiff bspatch
programs += bsdiff bspatch
bsdiff_DIR := $(d)
bsdiff_SOURCES := $(d)/bsdiff.c
@ -10,4 +10,4 @@ bspatch_SOURCES := $(d)/bspatch.c
bspatch_LDFLAGS = -lbz2 $(bsddiff_compat_include)
bspatch_INSTALL_DIR = $(libexecdir)/nix
dist_files += $(d)/compat-include/*
dist-files += $(d)/compat-include/*

View file

@ -1,4 +1,4 @@
LIBS += libexpr
libraries += libexpr
libexpr_NAME = libnixexpr

View file

@ -1,4 +1,4 @@
LIBS += libmain
libraries += libmain
libmain_NAME = libnixmain

View file

@ -1,4 +1,4 @@
LIBS += libstore
libraries += libstore
libstore_NAME = libnixstore

View file

@ -1,4 +1,4 @@
LIBS += libutil
libraries += libutil
libutil_NAME = libnixutil

View file

@ -1,4 +1,4 @@
PROGRAMS += nix-daemon
programs += nix-daemon
nix-daemon_DIR := $(d)

View file

@ -1,4 +1,4 @@
PROGRAMS += nix-env
programs += nix-env
nix-env_DIR := $(d)

View file

@ -1,4 +1,4 @@
PROGRAMS += nix-hash
programs += nix-hash
nix-hash_DIR := $(d)

View file

@ -1,4 +1,4 @@
PROGRAMS += nix-instantiate
programs += nix-instantiate
nix-instantiate_DIR := $(d)

View file

@ -1,4 +1,4 @@
PROGRAMS += nix-log2xml
programs += nix-log2xml
nix-log2xml_DIR := $(d)

View file

@ -1,4 +1,4 @@
PROGRAMS += nix-store
programs += nix-store
nix-store_DIR := $(d)

View file

@ -12,10 +12,10 @@ nix_tests = \
multiple-outputs.sh import-derivation.sh fetchurl.sh optimise-store.sh \
binary-cache.sh nix-profile.sh
INSTALL_TESTS += $(foreach x, $(nix_tests), tests/$(x))
install-tests += $(foreach x, $(nix_tests), tests/$(x))
TESTS_ENVIRONMENT = NIX_REMOTE= $(bash) -e
tests-environment = NIX_REMOTE= $(bash) -e
clean_files += $(d)/common.sh
clean-files += $(d)/common.sh
installcheck: $(d)/common.sh