Rename Makefile.new -> Makefile

18 files changed, 20 insertions, 22 deletions

diff --git a/.gitignore b/.gitignore
index 961877ada3..fafe8a17a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-Makefile
-Makefile.in
 Makefile.config
 
 # /
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000..652085a781
--- /dev/null
+++ b/Makefile
@@ -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
diff --git a/Makefile.new b/Makefile.new
deleted file mode 100644
index d63fa3ace3..0000000000
--- a/Makefile.new
+++ /dev/null
@@ -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
diff --git a/corepkgs/Makefile.new b/corepkgs/Makefile
index a04e3e3fbc..a04e3e3fbc 100644
--- a/corepkgs/Makefile.new
+++ b/corepkgs/Makefile
diff --git a/mk/install.mk b/mk/install.mk
index d6e75d2bfb..633c432a8c 100644
--- a/mk/install.mk
+++ b/mk/install.mk
@@ -48,7 +48,7 @@ define install-symlink =
   $$(eval $$(call create-dir,$$(dir $(2))))
 
   $(2): | $$(dir $(2))
-	ln -sfn $(1) $(2)
+	$(QUIET) ln -sfn $(1) $(2)
 
 endef
 
diff --git a/scripts/Makefile.new b/scripts/Makefile
index 2805128db8..2805128db8 100644
--- a/scripts/Makefile.new
+++ b/scripts/Makefile
diff --git a/src/boost/format/Makefile.new b/src/boost/format/Makefile
index b60a2ea4fb..b60a2ea4fb 100644
--- a/src/boost/format/Makefile.new
+++ b/src/boost/format/Makefile
diff --git a/src/bsdiff-4.3/Makefile.new b/src/bsdiff-4.3/Makefile
index a56f6c124d..a56f6c124d 100644
--- a/src/bsdiff-4.3/Makefile.new
+++ b/src/bsdiff-4.3/Makefile
diff --git a/src/libexpr/Makefile.new b/src/libexpr/Makefile
index c6ed7d14b9..c6ed7d14b9 100644
--- a/src/libexpr/Makefile.new
+++ b/src/libexpr/Makefile
diff --git a/src/libmain/Makefile.new b/src/libmain/Makefile
index 7312b8d2cd..7312b8d2cd 100644
--- a/src/libmain/Makefile.new
+++ b/src/libmain/Makefile
diff --git a/src/libstore/Makefile.new b/src/libstore/Makefile
index eaba1005f2..eaba1005f2 100644
--- a/src/libstore/Makefile.new
+++ b/src/libstore/Makefile
diff --git a/src/libutil/Makefile.new b/src/libutil/Makefile
index b604c00787..b604c00787 100644
--- a/src/libutil/Makefile.new
+++ b/src/libutil/Makefile
diff --git a/src/nix-daemon/Makefile.new b/src/nix-daemon/Makefile
index 2a8a7d92cd..2a8a7d92cd 100644
--- a/src/nix-daemon/Makefile.new
+++ b/src/nix-daemon/Makefile
diff --git a/src/nix-env/Makefile.new b/src/nix-env/Makefile
index 04545231ca..04545231ca 100644
--- a/src/nix-env/Makefile.new
+++ b/src/nix-env/Makefile
diff --git a/src/nix-hash/Makefile.new b/src/nix-hash/Makefile
index 462cd78d8c..462cd78d8c 100644
--- a/src/nix-hash/Makefile.new
+++ b/src/nix-hash/Makefile
diff --git a/src/nix-instantiate/Makefile.new b/src/nix-instantiate/Makefile
index 9c4cfec287..9c4cfec287 100644
--- a/src/nix-instantiate/Makefile.new
+++ b/src/nix-instantiate/Makefile
diff --git a/src/nix-log2xml/Makefile.new b/src/nix-log2xml/Makefile
index a88f948671..a88f948671 100644
--- a/src/nix-log2xml/Makefile.new
+++ b/src/nix-log2xml/Makefile
diff --git a/src/nix-store/Makefile.new b/src/nix-store/Makefile
index 105513872e..105513872e 100644
--- a/src/nix-store/Makefile.new
+++ b/src/nix-store/Makefile