From 7ce0e05ad875657a0fec10e192454b837146e190 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Nov 2013 15:25:13 +0000 Subject: [PATCH] Rename Makefile.new -> Makefile --- .gitignore | 2 -- Makefile | 19 +++++++++++++++++++ Makefile.new | 19 ------------------- corepkgs/{Makefile.new => Makefile} | 0 mk/install.mk | 2 +- scripts/{Makefile.new => Makefile} | 0 src/boost/format/{Makefile.new => Makefile} | 0 src/bsdiff-4.3/{Makefile.new => Makefile} | 0 src/libexpr/{Makefile.new => Makefile} | 0 src/libmain/{Makefile.new => Makefile} | 0 src/libstore/{Makefile.new => Makefile} | 0 src/libutil/{Makefile.new => Makefile} | 0 src/nix-daemon/{Makefile.new => Makefile} | 0 src/nix-env/{Makefile.new => Makefile} | 0 src/nix-hash/{Makefile.new => Makefile} | 0 .../{Makefile.new => Makefile} | 0 src/nix-log2xml/{Makefile.new => Makefile} | 0 src/nix-store/{Makefile.new => Makefile} | 0 18 files changed, 20 insertions(+), 22 deletions(-) create mode 100644 Makefile delete mode 100644 Makefile.new rename corepkgs/{Makefile.new => Makefile} (100%) rename scripts/{Makefile.new => Makefile} (100%) rename src/boost/format/{Makefile.new => Makefile} (100%) rename src/bsdiff-4.3/{Makefile.new => Makefile} (100%) rename src/libexpr/{Makefile.new => Makefile} (100%) rename src/libmain/{Makefile.new => Makefile} (100%) rename src/libstore/{Makefile.new => Makefile} (100%) rename src/libutil/{Makefile.new => Makefile} (100%) rename src/nix-daemon/{Makefile.new => Makefile} (100%) rename src/nix-env/{Makefile.new => Makefile} (100%) rename src/nix-hash/{Makefile.new => Makefile} (100%) rename src/nix-instantiate/{Makefile.new => Makefile} (100%) rename src/nix-log2xml/{Makefile.new => Makefile} (100%) rename src/nix-store/{Makefile.new => Makefile} (100%) diff --git a/.gitignore b/.gitignore index 961877ada..fafe8a17a 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 000000000..652085a78 --- /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 d63fa3ace..000000000 --- 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 similarity index 100% rename from corepkgs/Makefile.new rename to corepkgs/Makefile diff --git a/mk/install.mk b/mk/install.mk index d6e75d2bf..633c432a8 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 similarity index 100% rename from scripts/Makefile.new rename to scripts/Makefile diff --git a/src/boost/format/Makefile.new b/src/boost/format/Makefile similarity index 100% rename from src/boost/format/Makefile.new rename to src/boost/format/Makefile diff --git a/src/bsdiff-4.3/Makefile.new b/src/bsdiff-4.3/Makefile similarity index 100% rename from src/bsdiff-4.3/Makefile.new rename to src/bsdiff-4.3/Makefile diff --git a/src/libexpr/Makefile.new b/src/libexpr/Makefile similarity index 100% rename from src/libexpr/Makefile.new rename to src/libexpr/Makefile diff --git a/src/libmain/Makefile.new b/src/libmain/Makefile similarity index 100% rename from src/libmain/Makefile.new rename to src/libmain/Makefile diff --git a/src/libstore/Makefile.new b/src/libstore/Makefile similarity index 100% rename from src/libstore/Makefile.new rename to src/libstore/Makefile diff --git a/src/libutil/Makefile.new b/src/libutil/Makefile similarity index 100% rename from src/libutil/Makefile.new rename to src/libutil/Makefile diff --git a/src/nix-daemon/Makefile.new b/src/nix-daemon/Makefile similarity index 100% rename from src/nix-daemon/Makefile.new rename to src/nix-daemon/Makefile diff --git a/src/nix-env/Makefile.new b/src/nix-env/Makefile similarity index 100% rename from src/nix-env/Makefile.new rename to src/nix-env/Makefile diff --git a/src/nix-hash/Makefile.new b/src/nix-hash/Makefile similarity index 100% rename from src/nix-hash/Makefile.new rename to src/nix-hash/Makefile diff --git a/src/nix-instantiate/Makefile.new b/src/nix-instantiate/Makefile similarity index 100% rename from src/nix-instantiate/Makefile.new rename to src/nix-instantiate/Makefile diff --git a/src/nix-log2xml/Makefile.new b/src/nix-log2xml/Makefile similarity index 100% rename from src/nix-log2xml/Makefile.new rename to src/nix-log2xml/Makefile diff --git a/src/nix-store/Makefile.new b/src/nix-store/Makefile similarity index 100% rename from src/nix-store/Makefile.new rename to src/nix-store/Makefile