From 16e7d692092449263880ee795ec419cecbe22d24 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 1 Feb 2014 12:23:14 +0100 Subject: Update Makefile variable names --- 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 +- 12 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/boost/format/local.mk b/src/boost/format/local.mk index 17897fa59074..3776eff382fe 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 aca1ac116205..320795a94c1b 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 de276aa65296..ff35155b1a96 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 0efeee531478..71a07d1979ab 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 dcedd4c26ab8..a9ae53270076 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 83bd05f281d6..8af2e78d9ce4 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 d02f9f6ce22d..db071a3f7c7e 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 5a38d2fb76af..e80719cd76f7 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 062e4d13b29e..7c290ca8466e 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 daa741eb7f08..7d1bc5ec9dfb 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 8467d1973bda..46eb2e02ca64 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 edd111b42015..7f93e4c19196 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) -- cgit 1.4.1