[PATCH net-next 0/2] tools: ynl: clean up make clean

[PATCH net-next 0/2] tools: ynl: clean up make clean

[Jakub Kicinski]

First change renames the clean target which removes build results,
to a more common name. Second one ensures that clean deletes __pycache__. 

Jakub Kicinski (2):
  tools: ynl: rename make hardclean -> distclean
  tools: ynl: remove __pycache__ during clean

 tools/net/ynl/Makefile           | 2 +-
 tools/net/ynl/generated/Makefile | 4 ++--
 tools/net/ynl/lib/Makefile       | 3 ++-
 tools/net/ynl/samples/Makefile   | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

-- 
2.44.0

[PATCH net-next 1/2] tools: ynl: rename make hardclean -> distclean

[Jakub Kicinski]

The make target to remove all generated files used to be called
"hardclean" because it deleted files which were tracked by git.
We no longer track generated user space files, so use the more
common "distclean" name.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
 tools/net/ynl/Makefile           | 2 +-
 tools/net/ynl/generated/Makefile | 4 ++--
 tools/net/ynl/lib/Makefile       | 2 +-
 tools/net/ynl/samples/Makefile   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/net/ynl/Makefile b/tools/net/ynl/Makefile
index da1aa10bbcc3..1874296665e1 100644
--- a/tools/net/ynl/Makefile
+++ b/tools/net/ynl/Makefile
@@ -11,7 +11,7 @@ samples: | lib generated
 		$(MAKE) -C $@ ; \
 	fi
 
-clean hardclean:
+clean distclean:
 	@for dir in $(SUBDIRS) ; do \
 		if [ -f "$$dir/Makefile" ] ; then \
 			$(MAKE) -C $$dir $@; \
diff --git a/tools/net/ynl/generated/Makefile b/tools/net/ynl/generated/Makefile
index 7135028cb449..713f5fb9cc2d 100644
--- a/tools/net/ynl/generated/Makefile
+++ b/tools/net/ynl/generated/Makefile
@@ -43,11 +43,11 @@ protos.a: $(OBJS)
 clean:
 	rm -f *.o
 
-hardclean: clean
+distclean: clean
 	rm -f *.c *.h *.a
 
 regen:
 	@../ynl-regen.sh
 
-.PHONY: all clean hardclean regen
+.PHONY: all clean distclean regen
 .DEFAULT_GOAL: all
diff --git a/tools/net/ynl/lib/Makefile b/tools/net/ynl/lib/Makefile
index d2e50fd0a52d..2201dafc62b3 100644
--- a/tools/net/ynl/lib/Makefile
+++ b/tools/net/ynl/lib/Makefile
@@ -18,7 +18,7 @@ ynl.a: $(OBJS)
 clean:
 	rm -f *.o *.d *~
 
-hardclean: clean
+distclean: clean
 	rm -f *.a
 
 %.o: %.c
diff --git a/tools/net/ynl/samples/Makefile b/tools/net/ynl/samples/Makefile
index 1d33e98e3ffe..3e81432f7b27 100644
--- a/tools/net/ynl/samples/Makefile
+++ b/tools/net/ynl/samples/Makefile
@@ -28,7 +28,7 @@ $(BINS): ../lib/ynl.a ../generated/protos.a $(SRCS)
 clean:
 	rm -f *.o *.d *~
 
-hardclean: clean
+distclean: clean
 	rm -f $(BINS)
 
 .PHONY: all clean
-- 
2.44.0

[PATCH net-next 2/2] tools: ynl: remove __pycache__ during clean

[Jakub Kicinski]

Build process uses python to generate the user space code.
Remove __pycache__ on make clean.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
 tools/net/ynl/lib/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/net/ynl/lib/Makefile b/tools/net/ynl/lib/Makefile
index 2201dafc62b3..bdd6e132e58c 100644
--- a/tools/net/ynl/lib/Makefile
+++ b/tools/net/ynl/lib/Makefile
@@ -17,6 +17,7 @@ ynl.a: $(OBJS)
 	ar rcs $@ $(OBJS)
 clean:
 	rm -f *.o *.d *~
+	rm -rf __pycache__
 
 distclean: clean
 	rm -f *.a
-- 
2.44.0

Re: [PATCH net-next 1/2] tools: ynl: rename make hardclean -> distclean

[Donald Hunter]

Jakub Kicinski <kuba@kernel.org> writes:

> The make target to remove all generated files used to be called
> "hardclean" because it deleted files which were tracked by git.
> We no longer track generated user space files, so use the more
> common "distclean" name.
>
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Nit: distclean should probably be added to the .PHONY target in all the
makefiles.

> ---
>  tools/net/ynl/Makefile           | 2 +-
>  tools/net/ynl/generated/Makefile | 4 ++--
>  tools/net/ynl/lib/Makefile       | 2 +-
>  tools/net/ynl/samples/Makefile   | 2 +-
>  4 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/tools/net/ynl/Makefile b/tools/net/ynl/Makefile
> index da1aa10bbcc3..1874296665e1 100644
> --- a/tools/net/ynl/Makefile
> +++ b/tools/net/ynl/Makefile
> @@ -11,7 +11,7 @@ samples: | lib generated
>  		$(MAKE) -C $@ ; \
>  	fi
>  
> -clean hardclean:
> +clean distclean:
>  	@for dir in $(SUBDIRS) ; do \
>  		if [ -f "$$dir/Makefile" ] ; then \
>  			$(MAKE) -C $$dir $@; \
> diff --git a/tools/net/ynl/generated/Makefile b/tools/net/ynl/generated/Makefile
> index 7135028cb449..713f5fb9cc2d 100644
> --- a/tools/net/ynl/generated/Makefile
> +++ b/tools/net/ynl/generated/Makefile
> @@ -43,11 +43,11 @@ protos.a: $(OBJS)
>  clean:
>  	rm -f *.o
>  
> -hardclean: clean
> +distclean: clean
>  	rm -f *.c *.h *.a
>  
>  regen:
>  	@../ynl-regen.sh
>  
> -.PHONY: all clean hardclean regen
> +.PHONY: all clean distclean regen
>  .DEFAULT_GOAL: all
> diff --git a/tools/net/ynl/lib/Makefile b/tools/net/ynl/lib/Makefile
> index d2e50fd0a52d..2201dafc62b3 100644
> --- a/tools/net/ynl/lib/Makefile
> +++ b/tools/net/ynl/lib/Makefile
> @@ -18,7 +18,7 @@ ynl.a: $(OBJS)
>  clean:
>  	rm -f *.o *.d *~
>  
> -hardclean: clean
> +distclean: clean
>  	rm -f *.a
>  
>  %.o: %.c
> diff --git a/tools/net/ynl/samples/Makefile b/tools/net/ynl/samples/Makefile
> index 1d33e98e3ffe..3e81432f7b27 100644
> --- a/tools/net/ynl/samples/Makefile
> +++ b/tools/net/ynl/samples/Makefile
> @@ -28,7 +28,7 @@ $(BINS): ../lib/ynl.a ../generated/protos.a $(SRCS)
>  clean:
>  	rm -f *.o *.d *~
>  
> -hardclean: clean
> +distclean: clean
>  	rm -f $(BINS)
>  
>  .PHONY: all clean

Re: [PATCH net-next 2/2] tools: ynl: remove __pycache__ during clean

[Donald Hunter]

Jakub Kicinski <kuba@kernel.org> writes:

> Build process uses python to generate the user space code.
> Remove __pycache__ on make clean.
>
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Reviewed-by: Donald Hunter <donald.hunter@gmail.com>