[PATCH 0/4] user-cr: Makefile cleanups

[PATCH 0/4] user-cr: Makefile cleanups

[Matt Helsley]

Some minor fixes to the Makefile:

[PATCH 1/4] user-cr: Add install prefix
[PATCH 2/4] user-cr: Make directories during install
[PATCH 3/4] user-cr: Fix install rule dependencies
[PATCH 4/4] user-cr: Remove pointless echo lines and @-prefixed lines

Cheers,
	-Matt Helsley

[PATCH 1/4] user-cr: Add install prefix

[Matt Helsley]

Add an install prefix rather than require setting both
BIN_INSTALL_DIR and LIB_INSTALL_DIR.

Signed-off-by: Matt Helsley <matthltc-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
---
 Makefile |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index b312358..a8f426a 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,9 @@ WARNS := -Wall -Wstrict-prototypes -Wno-trigraphs
 CFLAGS += -g $(WARNS) $(CKPT_INCLUDE) $(DEBUG)
 
 # install dir
-BIN_INSTALL_DIR = /bin
-LIB_INSTALL_DIR = /lib
+PREFIX ?= /usr/local
+BIN_INSTALL_DIR := $(PREFIX)/bin
+LIB_INSTALL_DIR := $(PREFIX)/lib
 
 ECLONE_PROGS = restart nsexec
 PROGS =	checkpoint ckptinfo $(ECLONE_PROGS)
-- 
1.6.3.3

[PATCH 2/4] user-cr: Make directories during install

[Matt Helsley]

This makes the directories needed to hold the installed files if they do not
already exist.

Signed-off-by: Matt Helsley <matthltc-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
---
 Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index a8f426a..e776857 100644
--- a/Makefile
+++ b/Makefile
@@ -68,6 +68,7 @@ ckptinfo_types.c: $(CKPT_HEADERS) ckptinfo.py
 	cat $(CKPT_HEADERS) | ./ckptinfo.py > ckptinfo_types.c
 
 install:
+	/usr/bin/install -d -D $(BIN_INSTALL_DIR) $(LIB_INSTALL_DIR)
 	@echo /usr/bin/install -m 755 checkpoint restart nsexec ckptinfo $(BIN_INSTALL_DIR)
 	@/usr/bin/install -m 755 checkpoint restart ckptinfo nsexec $(BIN_INSTALL_DIR)
 	@echo /usr/bin/install -m 755 $(LIB_ECLONE) $(LIB_INSTALL_DIR)
-- 
1.6.3.3

[PATCH 3/4] user-cr: Fix install rule dependencies

[Matt Helsley]

Since we're installing these programs we need them to be built first.

Signed-off-by: Matt Helsley <matthltc-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index e776857..f8b113a 100644
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,7 @@ ckptinfo: ckptinfo_types.o
 ckptinfo_types.c: $(CKPT_HEADERS) ckptinfo.py
 	cat $(CKPT_HEADERS) | ./ckptinfo.py > ckptinfo_types.c
 
-install:
+install: $(PROGS)
 	/usr/bin/install -d -D $(BIN_INSTALL_DIR) $(LIB_INSTALL_DIR)
 	@echo /usr/bin/install -m 755 checkpoint restart nsexec ckptinfo $(BIN_INSTALL_DIR)
 	@/usr/bin/install -m 755 checkpoint restart ckptinfo nsexec $(BIN_INSTALL_DIR)
-- 
1.6.3.3

[PATCH 4/4] user-cr: Remove pointless echo lines and @-prefixed lines

[Matt Helsley]

In Make, actions prefixed with @ do not produce output showing what
Make is executing. It seems rather silly to manually echo the precise
output Make would produce automatically without the @ prefix.

Signed-off-by: Matt Helsley <matthltc-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
---
 Makefile |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index f8b113a..a4a1a8a 100644
--- a/Makefile
+++ b/Makefile
@@ -69,10 +69,8 @@ ckptinfo_types.c: $(CKPT_HEADERS) ckptinfo.py
 
 install: $(PROGS)
 	/usr/bin/install -d -D $(BIN_INSTALL_DIR) $(LIB_INSTALL_DIR)
-	@echo /usr/bin/install -m 755 checkpoint restart nsexec ckptinfo $(BIN_INSTALL_DIR)
-	@/usr/bin/install -m 755 checkpoint restart ckptinfo nsexec $(BIN_INSTALL_DIR)
-	@echo /usr/bin/install -m 755 $(LIB_ECLONE) $(LIB_INSTALL_DIR)
-	@/usr/bin/install -m 755 $(LIB_ECLONE) $(LIB_INSTALL_DIR)
+	/usr/bin/install -m 755 checkpoint restart ckptinfo nsexec $(BIN_INSTALL_DIR)
+	/usr/bin/install -m 755 $(LIB_ECLONE) $(LIB_INSTALL_DIR)
 
 $(CKPT_HEADERS): %:
 	./scripts/extract-headers.sh -s $(KERNELSRC) -o ./include
-- 
1.6.3.3

Re: [PATCH 0/4] user-cr: Makefile cleanups

[Nathan Lynch]

On Fri, 2010-02-26 at 10:56 -0800, Matt Helsley wrote:
> Some minor fixes to the Makefile:
> 
> [PATCH 1/4] user-cr: Add install prefix
> [PATCH 2/4] user-cr: Make directories during install
> [PATCH 3/4] user-cr: Fix install rule dependencies
> [PATCH 4/4] user-cr: Remove pointless echo lines and @-prefixed lines

ack 1-4

[PATCH] user-cr: Makefile: Use standard variables

[Matt Helsley]

[Based on the previous series of Makefile patches]

These are standard variables which many cross compiler systems will setup.
I believe they are also variables Make sets up with default values.
Make also sets $(MAKE) so you don't accidentally mix make binaries in the
same build -- let's use that too.

Signed-off-by: Matt Helsley <matthltc-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
---
 Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index a4a1a8a..60ddccd 100644
--- a/Makefile
+++ b/Makefile
@@ -34,10 +34,10 @@ LDLIBS = -lm
 .PHONY: all distclean clean headers install
 
 all: $(PROGS)
-	@make -C test
+	@$(MAKE) -C test
 
 $(LIB_ECLONE):
-	ar ruv $(LIB_ECLONE) $^
+	$(AR) ruv $(LIB_ECLONE) $^
 
 # restart needs to be thread-safe
 restart: CFLAGS += -D__REENTRANT -pthread
@@ -82,4 +82,4 @@ distclean: clean
 
 clean:
 	@rm -f $(PROGS) $(LIB_ECLONE) $(OTHER) *~ *.o headers.h
-	@make -C test clean
+	@$(MAKE) -C test clean
-- 
1.6.3.3

Re: [PATCH] user-cr: Makefile: Use standard variables

[Oren Laadan]

Applied, thanks.

Matt Helsley wrote:
> [Based on the previous series of Makefile patches]
> 
> These are standard variables which many cross compiler systems will setup.
> I believe they are also variables Make sets up with default values.
> Make also sets $(MAKE) so you don't accidentally mix make binaries in the
> same build -- let's use that too.
> 
> Signed-off-by: Matt Helsley <matthltc-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> ---
>  Makefile |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index a4a1a8a..60ddccd 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -34,10 +34,10 @@ LDLIBS = -lm
>  .PHONY: all distclean clean headers install
>  
>  all: $(PROGS)
> -	@make -C test
> +	@$(MAKE) -C test
>  
>  $(LIB_ECLONE):
> -	ar ruv $(LIB_ECLONE) $^
> +	$(AR) ruv $(LIB_ECLONE) $^
>  
>  # restart needs to be thread-safe
>  restart: CFLAGS += -D__REENTRANT -pthread
> @@ -82,4 +82,4 @@ distclean: clean
>  
>  clean:
>  	@rm -f $(PROGS) $(LIB_ECLONE) $(OTHER) *~ *.o headers.h
> -	@make -C test clean
> +	@$(MAKE) -C test clean

Re: [PATCH 0/4] user-cr: Makefile cleanups

[Oren Laadan]

Applied, thanks.

Matt Helsley wrote:
> Some minor fixes to the Makefile:
> 
> [PATCH 1/4] user-cr: Add install prefix
> [PATCH 2/4] user-cr: Make directories during install
> [PATCH 3/4] user-cr: Fix install rule dependencies
> [PATCH 4/4] user-cr: Remove pointless echo lines and @-prefixed lines
> 
> Cheers,
> 	-Matt Helsley
>