1 files changed, 12 insertions, 15 deletions
diff --git a/Makefile.new b/Makefile.new
index ea4096cc1c4b..af2c4cec3c4d 100644
--- a/Makefile.new
+++ b/Makefile.new
@@ -1,18 +1,15 @@
-default: all
-
-here = $(dir $(lastword $(MAKEFILE_LIST)))
-
-include src/boost/format/Makefile.new
-include src/libutil/Makefile.new
-include src/libstore/Makefile.new
-include src/libmain/Makefile.new
-include src/libexpr/Makefile.new
-include src/nix-hash/Makefile.new
-include src/nix-store/Makefile.new
-include src/nix-instantiate/Makefile.new
-include src/nix-env/Makefile.new
-include src/nix-daemon/Makefile.new
+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
 
 include Makefile.lib
 
-CXXFLAGS += -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr
+CXXFLAGS += -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr -O0