diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 19 | ||||
| -rw-r--r-- | Makefile.new | 19 | ||||
| -rw-r--r-- | corepkgs/Makefile (renamed from corepkgs/Makefile.new) | 0 | ||||
| -rw-r--r-- | mk/install.mk | 2 | ||||
| -rw-r--r-- | scripts/Makefile (renamed from scripts/Makefile.new) | 0 | ||||
| -rw-r--r-- | src/boost/format/Makefile (renamed from src/boost/format/Makefile.new) | 0 | ||||
| -rw-r--r-- | src/bsdiff-4.3/Makefile (renamed from src/bsdiff-4.3/Makefile.new) | 0 | ||||
| -rw-r--r-- | src/libexpr/Makefile (renamed from src/libexpr/Makefile.new) | 0 | ||||
| -rw-r--r-- | src/libmain/Makefile (renamed from src/libmain/Makefile.new) | 0 | ||||
| -rw-r--r-- | src/libstore/Makefile (renamed from src/libstore/Makefile.new) | 0 | ||||
| -rw-r--r-- | src/libutil/Makefile (renamed from src/libutil/Makefile.new) | 0 | ||||
| -rw-r--r-- | src/nix-daemon/Makefile (renamed from src/nix-daemon/Makefile.new) | 0 | ||||
| -rw-r--r-- | src/nix-env/Makefile (renamed from src/nix-env/Makefile.new) | 0 | ||||
| -rw-r--r-- | src/nix-hash/Makefile (renamed from src/nix-hash/Makefile.new) | 0 | ||||
| -rw-r--r-- | src/nix-instantiate/Makefile (renamed from src/nix-instantiate/Makefile.new) | 0 | ||||
| -rw-r--r-- | src/nix-log2xml/Makefile (renamed from src/nix-log2xml/Makefile.new) | 0 | ||||
| -rw-r--r-- | src/nix-store/Makefile (renamed from src/nix-store/Makefile.new) | 0 |
18 files changed, 20 insertions, 22 deletions
diff --git a/.gitignore b/.gitignore index 961877ada331..fafe8a17a461 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 000000000000..652085a78165 --- /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 d63fa3ace35b..000000000000 --- 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 a04e3e3fbc1d..a04e3e3fbc1d 100644 --- a/corepkgs/Makefile.new +++ b/corepkgs/Makefile diff --git a/mk/install.mk b/mk/install.mk index d6e75d2bfb13..633c432a8cfc 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 2805128db8de..2805128db8de 100644 --- a/scripts/Makefile.new +++ b/scripts/Makefile diff --git a/src/boost/format/Makefile.new b/src/boost/format/Makefile index b60a2ea4fb62..b60a2ea4fb62 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 a56f6c124db0..a56f6c124db0 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 c6ed7d14b9bf..c6ed7d14b9bf 100644 --- a/src/libexpr/Makefile.new +++ b/src/libexpr/Makefile diff --git a/src/libmain/Makefile.new b/src/libmain/Makefile index 7312b8d2cd26..7312b8d2cd26 100644 --- a/src/libmain/Makefile.new +++ b/src/libmain/Makefile diff --git a/src/libstore/Makefile.new b/src/libstore/Makefile index eaba1005f227..eaba1005f227 100644 --- a/src/libstore/Makefile.new +++ b/src/libstore/Makefile diff --git a/src/libutil/Makefile.new b/src/libutil/Makefile index b604c0078709..b604c0078709 100644 --- a/src/libutil/Makefile.new +++ b/src/libutil/Makefile diff --git a/src/nix-daemon/Makefile.new b/src/nix-daemon/Makefile index 2a8a7d92cd26..2a8a7d92cd26 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 04545231caf3..04545231caf3 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 462cd78d8c26..462cd78d8c26 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 9c4cfec287d9..9c4cfec287d9 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 a88f948671dc..a88f948671dc 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 105513872e81..105513872e81 100644 --- a/src/nix-store/Makefile.new +++ b/src/nix-store/Makefile |