[btrfs-progs: PATCH 1/2] Makefile: use $(CC) as a compilers instead of $(CC)/gcc

[btrfs-progs: PATCH 1/2] Makefile: use $(CC) as a compilers instead of $(CC)/gcc

[Sergei Trofimovich]

From: Sergei Trofimovich <slyfox@gentoo.org>

CC: Chris Mason <chris.mason@oracle.com>
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
 Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 79818e6..ebfd5c8 100644
--- a/Makefile
+++ b/Makefile
@@ -44,13 +44,13 @@ btrfs: $(objects) btrfs.o help.o common.o $(cmds_objects)
 		$(objects) $(LDFLAGS) $(LIBS) -lpthread
 
 calc-size: $(objects) calc-size.o
-	gcc $(CFLAGS) -o calc-size calc-size.o $(objects) $(LDFLAGS) $(LIBS)
+	$(CC) $(CFLAGS) -o calc-size calc-size.o $(objects) $(LDFLAGS) $(LIBS)
 
 btrfs-find-root: $(objects) find-root.o
-	gcc $(CFLAGS) -o btrfs-find-root find-root.o $(objects) $(LDFLAGS) $(LIBS)
+	$(CC) $(CFLAGS) -o btrfs-find-root find-root.o $(objects) $(LDFLAGS) $(LIBS)
 
 btrfs-restore: $(objects) restore.o
-	gcc $(CFLAGS) -o btrfs-restore restore.o $(objects) $(LDFLAGS) $(LIBS) $(RESTORE_LIBS)
+	$(CC) $(CFLAGS) -o btrfs-restore restore.o $(objects) $(LDFLAGS) $(LIBS) $(RESTORE_LIBS)
 
 btrfsctl: $(objects) btrfsctl.o
 	$(CC) $(CFLAGS) -o btrfsctl btrfsctl.o $(objects) $(LDFLAGS) $(LIBS)
-- 
1.7.8.5

[btrfs-progs: PATCH 2/2] Makefile: use $(MAKE) instead of hardcoded 'make'

[Sergei Trofimovich]

From: Sergei Trofimovich <slyfox@gentoo.org>

CC: Chris Mason <chris.mason@oracle.com>
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
 Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index ebfd5c8..9694444 100644
--- a/Makefile
+++ b/Makefile
@@ -101,15 +101,15 @@ ioctl-test: $(objects) ioctl-test.o
 	$(CC) $(CFLAGS) -o ioctl-test $(objects) ioctl-test.o $(LDFLAGS) $(LIBS)
 
 manpages:
-	cd man; make
+	cd man; $(MAKE)
 
 install-man:
-	cd man; make install
+	cd man; $(MAKE) install
 
 clean :
 	rm -f $(progs) cscope.out *.o .*.d btrfs-convert btrfs-image btrfs-select-super \
 	      btrfs-zero-log btrfstune dir-test ioctl-test quick-test version.h
-	cd man; make clean
+	cd man; $(MAKE) clean
 
 install: $(progs) install-man
 	$(INSTALL) -m755 -d $(DESTDIR)$(bindir)
-- 
1.7.8.5

Re: [btrfs-progs: PATCH 2/2] Makefile: use $(MAKE) instead of hardcoded 'make'

[Sergey V.]

On Monday 02 of April 2012 17:10:02 Sergei Trofimovich wrote:
> From: Sergei Trofimovich <slyfox@gentoo.org>
> 
> CC: Chris Mason <chris.mason@oracle.com>
> Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
> ---
>  Makefile |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index ebfd5c8..9694444 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -101,15 +101,15 @@ ioctl-test: $(objects) ioctl-test.o
>  	$(CC) $(CFLAGS) -o ioctl-test $(objects) ioctl-test.o $(LDFLAGS) $(LIBS)
>  
>  manpages:
> -	cd man; make
> +	cd man; $(MAKE)
>  
>  install-man:
> -	cd man; make install
> +	cd man; $(MAKE) install
>  
>  clean :
>  	rm -f $(progs) cscope.out *.o .*.d btrfs-convert btrfs-image btrfs-select-super \
>  	      btrfs-zero-log btrfstune dir-test ioctl-test quick-test version.h
> -	cd man; make clean
> +	cd man; $(MAKE) clean
>  
>  install: $(progs) install-man
>  	$(INSTALL) -m755 -d $(DESTDIR)$(bindir)
> -- 

Resonable.

Reviewed-by: Sergey V. <sftp.mtuci@gmail.com>

for both patches.

Thanks

Re: [btrfs-progs: PATCH 1/2] Makefile: use $(CC) as a compilers instead of $(CC)/gcc

[Sergei Trofimovich]

[-- Attachment #1: Type: text/plain, Size: 268 bytes --]

> From: Sergei Trofimovich <slyfox@gentoo.org>
> 
> CC: Chris Mason <chris.mason@oracle.com>
> Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
> ---
>  Makefile |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)

Ping.

-- 

  Sergei

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]