wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 06:01:48 +02:00
Code Activity

Rename $(here) to $(d) for brevity, and remove trailing slash

Browse source
This commit is contained in:
Eelco Dolstra 2013-11-22 16:45:52 +00:00
parent 9a14d5e2f3
commit 754c05ed6c
12 changed files with 49 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/boost/format/Makefile.new
View file

@ -1,5 +1,5 @@
LIBS += libformat
libformat_DIR := $(here)
libformat_DIR := $(d)
libformat_SOURCES = format_implementation.cc free_funcs.cc parsing.cc

10
src/libexpr/Makefile.new
View file

@ -1,14 +1,14 @@
LIBS += libexpr
libexpr_DIR := $(here)
libexpr_DIR := $(d)
libexpr_SOURCES = \
nixexpr.cc eval.cc primops.cc lexer-tab.cc parser-tab.cc \
get-drvs.cc attr-path.cc value-to-xml.cc value-to-json.cc \
common-opts.cc names.cc
$(here)parser-tab.cc $(here)parser-tab.hh: $(here)parser.y
bison -v -o $(here)parser-tab.cc $< -d
$(d)/parser-tab.cc $(d)/parser-tab.hh: $(d)/parser.y
bison -v -o $(libexpr_DIR)/parser-tab.cc $< -d
$(here)lexer-tab.cc $(here)lexer-tab.hh: $(here)lexer.l
flex --outfile $(here)lexer-tab.cc --header-file=$(here)lexer-tab.hh $<
$(d)/lexer-tab.cc $(d)/lexer-tab.hh: $(d)/lexer.l
flex --outfile $(libexpr_DIR)/lexer-tab.cc --header-file=$(libexpr_DIR)/lexer-tab.hh $<

2
src/libmain/Makefile.new
View file

@ -1,6 +1,6 @@
LIBS += libmain
libmain_DIR := $(here)
libmain_DIR := $(d)
libmain_SOURCES = shared.cc stack.cc

2
src/libstore/Makefile.new
View file

@ -1,6 +1,6 @@
LIBS += libstore
libstore_DIR := $(here)
libstore_DIR := $(d)
libstore_SOURCES = \
store-api.cc local-store.cc remote-store.cc derivations.cc build.cc misc.cc \

9
src/libutil/Makefile.new
View file

@ -1,10 +1,11 @@
LIBS += libutil
libutil_DIR := $(here)
libutil_DIR := $(d)
libutil_SOURCES = util.cc hash.cc serialise.cc archive.cc xml-writer.cc affinity.cc \
md5.c sha1.c sha256.c
libutil_SOURCES = util.cc hash.cc serialise.cc archive.cc xml-writer.cc affinity.cc
# FIXME: md5.c et al. should only be built when we don't have OpenSSL.
ifneq ($(HAVE_OPENSSL), 1)
libutil_SOURCES += md5.c sha1.c sha256.c
endif
libutil_LIBS = src/boost/format/libformat

2
src/nix-daemon/Makefile.new
View file

@ -1,6 +1,6 @@
PROGRAMS += nix-daemon
nix-daemon_DIR := $(here)
nix-daemon_DIR := $(d)
nix-daemon_SOURCES = nix-daemon.cc

2
src/nix-env/Makefile.new
View file

@ -1,6 +1,6 @@
PROGRAMS += nix-env
nix-env_DIR := $(here)
nix-env_DIR := $(d)
nix-env_SOURCES = nix-env.cc profiles.cc profiles.hh user-env.cc user-env.hh

2
src/nix-hash/Makefile.new
View file

@ -1,6 +1,6 @@
PROGRAMS += nix-hash
nix-hash_DIR := $(here)
nix-hash_DIR := $(d)
nix-hash_SOURCES = nix-hash.cc

2
src/nix-instantiate/Makefile.new
View file

@ -1,6 +1,6 @@
PROGRAMS += nix-instantiate
nix-instantiate_DIR := $(here)
nix-instantiate_DIR := $(d)
nix-instantiate_SOURCES = nix-instantiate.cc

2
src/nix-store/Makefile.new
View file

@ -1,6 +1,6 @@
PROGRAMS += nix-store
nix-store_DIR := $(here)
nix-store_DIR := $(d)
nix-store_SOURCES = nix-store.cc dotgraph.cc xmlgraph.cc