about summary refs log tree commit diff
path: root/Makefile.new
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.new')
-rw-r--r--Makefile.new12
1 files changed, 5 insertions, 7 deletions
diff --git a/Makefile.new b/Makefile.new
index 8911d6d72c40..ea4096cc1c4b 100644
--- a/Makefile.new
+++ b/Makefile.new
@@ -1,5 +1,6 @@
-include Makefile.config
-include Makefile.lib
+default: all
+
+here = $(dir $(lastword $(MAKEFILE_LIST)))
 
 include src/boost/format/Makefile.new
 include src/libutil/Makefile.new
@@ -12,9 +13,6 @@ include src/nix-instantiate/Makefile.new
 include src/nix-env/Makefile.new
 include src/nix-daemon/Makefile.new
 
-CXXFLAGS += -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr
-
-$(foreach lib, $(LIBS), $(eval $(call LIBS_template,$(lib))))
-$(foreach prog, $(PROGRAMS), $(eval $(call PROGRAMS_template,$(prog))))
+include Makefile.lib
 
-all: $(programs_list)
+CXXFLAGS += -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr