Rename Makefile.new -> Makefile

This commit is contained in:
Eelco Dolstra 2013-11-25 15:25:13 +00:00
parent 962551a071
commit 7ce0e05ad8
18 changed files with 20 additions and 22 deletions

2
.gitignore vendored
View File

@ -1,5 +1,3 @@
Makefile
Makefile.in
Makefile.config Makefile.config
# / # /

19
Makefile Normal file
View File

@ -0,0 +1,19 @@
SUBS = \
src/boost/format/Makefile \
src/libutil/Makefile \
src/libstore/Makefile \
src/libmain/Makefile \
src/libexpr/Makefile \
src/nix-hash/Makefile \
src/nix-store/Makefile \
src/nix-instantiate/Makefile \
src/nix-env/Makefile \
src/nix-daemon/Makefile \
src/nix-log2xml/Makefile \
src/bsdiff-4.3/Makefile \
scripts/Makefile \
corepkgs/Makefile
GLOBAL_CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr
include mk/lib.mk

View File

@ -1,19 +0,0 @@
SUBS = \
src/boost/format/Makefile.new \
src/libutil/Makefile.new \
src/libstore/Makefile.new \
src/libmain/Makefile.new \
src/libexpr/Makefile.new \
src/nix-hash/Makefile.new \
src/nix-store/Makefile.new \
src/nix-instantiate/Makefile.new \
src/nix-env/Makefile.new \
src/nix-daemon/Makefile.new \
src/nix-log2xml/Makefile.new \
src/bsdiff-4.3/Makefile.new \
scripts/Makefile.new \
corepkgs/Makefile.new
GLOBAL_CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr
include mk/lib.mk

View File

@ -48,7 +48,7 @@ define install-symlink =
$$(eval $$(call create-dir,$$(dir $(2)))) $$(eval $$(call create-dir,$$(dir $(2))))
$(2): | $$(dir $(2)) $(2): | $$(dir $(2))
ln -sfn $(1) $(2) $(QUIET) ln -sfn $(1) $(2)
endef endef