diff mbox series

[05/36] debian: don't bypass top level Makefile when building subdirs

Message ID 155259745436.31886.466306969009991047.stgit@magnolia (mailing list archive)
State Accepted
Headers show
Series xfsprogs-5.0: fix various problems | expand

Commit Message

Darrick J. Wong March 14, 2019, 9:04 p.m. UTC
From: Darrick J. Wong <darrick.wong@oracle.com>

The top level Makefile does some processing to set build environment
variables (Q and CHECK_CMD).  debian/rules uses -C to build subdirs
directly, which bypases this feature of the top-level makefile, which
causes more build spew than necessary (because Q never gets set to quiet
the build).

Since the top level makefile can be used to build the subdirs
debian/rules cares about, drop the -C and build subdirs via the top
level Makefile to quiet the build.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 debian/rules |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Nathan Scott March 15, 2019, 12:16 a.m. UTC | #1
On Fri, Mar 15, 2019 at 8:04 AM Darrick J. Wong <darrick.wong@oracle.com> wrote:
>
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> The top level Makefile does some processing to set build environment
> variables (Q and CHECK_CMD).  debian/rules uses -C to build subdirs
> directly, which bypases this feature of the top-level makefile, which
> causes more build spew than necessary (because Q never gets set to quiet
> the build).
>
> Since the top level makefile can be used to build the subdirs
> debian/rules cares about, drop the -C and build subdirs via the top
> level Makefile to quiet the build.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

Neat.

Reviewed-by: Nathan Scott <nathans@debian.org>

cheers.

--
Nathan
Allison Henderson March 15, 2019, 10:02 p.m. UTC | #2
Looks ok.  Thanks!

Reviewed-by: Allison Henderson <allison.henderson@oracle.com>

On 3/14/19 2:04 PM, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> The top level Makefile does some processing to set build environment
> variables (Q and CHECK_CMD).  debian/rules uses -C to build subdirs
> directly, which bypases this feature of the top-level makefile, which
> causes more build spew than necessary (because Q never gets set to quiet
> the build).
> 
> Since the top level makefile can be used to build the subdirs
> debian/rules cares about, drop the -C and build subdirs via the top
> level Makefile to quiet the build.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
>   debian/rules |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 
> diff --git a/debian/rules b/debian/rules
> index 80dff4bb..7c2a8b3c 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -51,7 +51,7 @@ dibuild:
>   			$(MAKE) -C $$dir NODEP=1 install-headers; \
>   		done; \
>   		for dir in include libxfs libxcmd libfrog mkfs; do \
> -			$(MAKE) -C $$dir; \
> +			$(MAKE) $$dir; \
>   		done; \
>   		mv mkfs/mkfs.xfs mkfs/mkfs.xfs-$(bootpkg); \
>   		$(MAKE) distclean; \
>
diff mbox series

Patch

diff --git a/debian/rules b/debian/rules
index 80dff4bb..7c2a8b3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,7 @@  dibuild:
 			$(MAKE) -C $$dir NODEP=1 install-headers; \
 		done; \
 		for dir in include libxfs libxcmd libfrog mkfs; do \
-			$(MAKE) -C $$dir; \
+			$(MAKE) $$dir; \
 		done; \
 		mv mkfs/mkfs.xfs mkfs/mkfs.xfs-$(bootpkg); \
 		$(MAKE) distclean; \