From 16e7d692092449263880ee795ec419cecbe22d24 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 1 Feb 2014 12:23:14 +0100 Subject: [PATCH] Update Makefile variable names --- Makefile | 2 +- corepkgs/local.mk | 2 +- doc/manual/local.mk | 8 ++++---- perl/local.mk | 6 +++--- scripts/local.mk | 8 ++++---- src/boost/format/local.mk | 2 +- src/bsdiff-4.3/local.mk | 4 ++-- src/libexpr/local.mk | 2 +- src/libmain/local.mk | 2 +- src/libstore/local.mk | 2 +- src/libutil/local.mk | 2 +- src/nix-daemon/local.mk | 2 +- src/nix-env/local.mk | 2 +- src/nix-hash/local.mk | 2 +- src/nix-instantiate/local.mk | 2 +- src/nix-log2xml/local.mk | 2 +- src/nix-store/local.mk | 2 +- tests/local.mk | 6 +++--- 18 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index f22a70a81..df72578cc 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -SUBS = \ +makefiles = \ src/boost/format/local.mk \ src/libutil/local.mk \ src/libstore/local.mk \ diff --git a/corepkgs/local.mk b/corepkgs/local.mk index a04e3e3fb..19c1d0696 100644 --- a/corepkgs/local.mk +++ b/corepkgs/local.mk @@ -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 diff --git a/doc/manual/local.mk b/doc/manual/local.mk index ae3a9df5c..8d49e1e4d 100644 --- a/doc/manual/local.mk +++ b/doc/manual/local.mk @@ -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 diff --git a/perl/local.mk b/perl/local.mk index cd07631ca..b5550cc9f 100644 --- a/perl/local.mk +++ b/perl/local.mk @@ -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) diff --git a/scripts/local.mk b/scripts/local.mk index 2805128db..606b73df6 100644 --- a/scripts/local.mk +++ b/scripts/local.mk @@ -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 diff --git a/src/boost/format/local.mk b/src/boost/format/local.mk index 17897fa59..3776eff38 100644 --- a/src/boost/format/local.mk +++ b/src/boost/format/local.mk @@ -1,4 +1,4 @@ -LIBS += libformat +libraries += libformat libformat_NAME = libnixformat diff --git a/src/bsdiff-4.3/local.mk b/src/bsdiff-4.3/local.mk index aca1ac116..320795a94 100644 --- a/src/bsdiff-4.3/local.mk +++ b/src/bsdiff-4.3/local.mk @@ -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/* diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk index de276aa65..ff35155b1 100644 --- a/src/libexpr/local.mk +++ b/src/libexpr/local.mk @@ -1,4 +1,4 @@ -LIBS += libexpr +libraries += libexpr libexpr_NAME = libnixexpr diff --git a/src/libmain/local.mk b/src/libmain/local.mk index 0efeee531..71a07d197 100644 --- a/src/libmain/local.mk +++ b/src/libmain/local.mk @@ -1,4 +1,4 @@ -LIBS += libmain +libraries += libmain libmain_NAME = libnixmain diff --git a/src/libstore/local.mk b/src/libstore/local.mk index dcedd4c26..a9ae53270 100644 --- a/src/libstore/local.mk +++ b/src/libstore/local.mk @@ -1,4 +1,4 @@ -LIBS += libstore +libraries += libstore libstore_NAME = libnixstore diff --git a/src/libutil/local.mk b/src/libutil/local.mk index 83bd05f28..8af2e78d9 100644 --- a/src/libutil/local.mk +++ b/src/libutil/local.mk @@ -1,4 +1,4 @@ -LIBS += libutil +libraries += libutil libutil_NAME = libnixutil diff --git a/src/nix-daemon/local.mk b/src/nix-daemon/local.mk index d02f9f6ce..db071a3f7 100644 --- a/src/nix-daemon/local.mk +++ b/src/nix-daemon/local.mk @@ -1,4 +1,4 @@ -PROGRAMS += nix-daemon +programs += nix-daemon nix-daemon_DIR := $(d) diff --git a/src/nix-env/local.mk b/src/nix-env/local.mk index 5a38d2fb7..e80719cd7 100644 --- a/src/nix-env/local.mk +++ b/src/nix-env/local.mk @@ -1,4 +1,4 @@ -PROGRAMS += nix-env +programs += nix-env nix-env_DIR := $(d) diff --git a/src/nix-hash/local.mk b/src/nix-hash/local.mk index 062e4d13b..7c290ca84 100644 --- a/src/nix-hash/local.mk +++ b/src/nix-hash/local.mk @@ -1,4 +1,4 @@ -PROGRAMS += nix-hash +programs += nix-hash nix-hash_DIR := $(d) diff --git a/src/nix-instantiate/local.mk b/src/nix-instantiate/local.mk index daa741eb7..7d1bc5ec9 100644 --- a/src/nix-instantiate/local.mk +++ b/src/nix-instantiate/local.mk @@ -1,4 +1,4 @@ -PROGRAMS += nix-instantiate +programs += nix-instantiate nix-instantiate_DIR := $(d) diff --git a/src/nix-log2xml/local.mk b/src/nix-log2xml/local.mk index 8467d1973..46eb2e02c 100644 --- a/src/nix-log2xml/local.mk +++ b/src/nix-log2xml/local.mk @@ -1,4 +1,4 @@ -PROGRAMS += nix-log2xml +programs += nix-log2xml nix-log2xml_DIR := $(d) diff --git a/src/nix-store/local.mk b/src/nix-store/local.mk index edd111b42..7f93e4c19 100644 --- a/src/nix-store/local.mk +++ b/src/nix-store/local.mk @@ -1,4 +1,4 @@ -PROGRAMS += nix-store +programs += nix-store nix-store_DIR := $(d) diff --git a/tests/local.mk b/tests/local.mk index 21ffd047f..87f4e25e6 100644 --- a/tests/local.mk +++ b/tests/local.mk @@ -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