From: Burt Silverman <burtms@gmail.com>
Date: Fri, 27 Jan 2017 20:29:54 +0000 (-0500)
Subject: Add files to CLEANFILES for robust make clean.
X-Git-Tag: v17.04-rc1~300
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F18%2F4918%2F2;p=vpp.git

Add files to CLEANFILES for robust make clean.

At the least, $(BUILT_SOURCES) should be added to CLEANFILES. Also
beneficial is $(api_DATA), and in the case of Java, *.files and *.h.
Also there is a vpp/app/version.h, and some grammar and lex files in
vppapigen.

Change-Id: Ic6d3f2d40ce65e1d9a8b88217fa1f36de393ebb4
Signed-off-by: Burt Silverman <burtms@gmail.com>
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 239afeacd52..7da86fcb673 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,6 +28,7 @@ noinst_HEADERS =
 dist_bin_SCRIPTS =
 lib_LTLIBRARIES =
 BUILT_SOURCES =
+CLEANFILES =
 install-data-local:
 	@echo "Building vppctl command list..."
 	@DIR_SEARCH="$(srcdir)" ; \
@@ -115,3 +116,5 @@ BUILT_SOURCES += \
 
 endif # if ENABLE_VLIB
 endif # if ENABLE_SVM
+
+CLEANFILES += $(BUILT_SOURCES) $(api_DATA)
diff --git a/src/examples/sample-plugin/Makefile.am b/src/examples/sample-plugin/Makefile.am
index 47642055a78..a105afdd52b 100644
--- a/src/examples/sample-plugin/Makefile.am
+++ b/src/examples/sample-plugin/Makefile.am
@@ -54,3 +54,5 @@ sample_test_plugin_la_SOURCES = sample/sample_test.c sample/sample_plugin.api.h
 install-data-hook:
 	@(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES))
 	@(cd $(vppapitestpluginsdir) && $(RM) $(vppapitestplugins_LTLIBRARIES))
+
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index f0c455a51bb..06b575d1cc3 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -76,3 +76,4 @@ api_DATA = \
 BUILT_SOURCES += \
 	$(patsubst %.api,%.api.h,$(API_FILES))
 
+CLEANFILES = $(BUILT_SOURCES) $(api_DATA)
diff --git a/src/vpp-api/java/Makefile.am b/src/vpp-api/java/Makefile.am
index 3696e5bf089..6eb500847b2 100644
--- a/src/vpp-api/java/Makefile.am
+++ b/src/vpp-api/java/Makefile.am
@@ -218,7 +218,7 @@ all-local: $(JAR_FILES)
 #
 # Cleanup
 #
-CLEANFILES = jvpp-registry.ok $(JAR_FILES) $(BUILT_SOURCES)
+CLEANFILES = jvpp-registry.ok $(JAR_FILES) $(BUILT_SOURCES) *.files */*.h
 
 clean-local:
 	rm -rf $(CLEANDIRS)
diff --git a/src/vpp.am b/src/vpp.am
index 0b605ec5e32..37466c60fdf 100644
--- a/src/vpp.am
+++ b/src/vpp.am
@@ -132,4 +132,6 @@ bin_vpp_get_metrics_LDADD = \
   libvppinfra.la \
   -lpthread -lm -lrt
 
+CLEANFILES += vpp/app/version.h
+
 # vi:syntax=automake
diff --git a/src/vppapigen.am b/src/vppapigen.am
index 3207c83a325..5c25e1ec6f4 100644
--- a/src/vppapigen.am
+++ b/src/vppapigen.am
@@ -27,4 +27,6 @@ vppapigen_SOURCES = tools/vppapigen/gram.y tools/vppapigen/lex_e.c tools/vppapig
 vppapigen_LDADD = libvppinfra.la
 vppapigen_LDFLAGS = -static
 
+CLEANFILES += tools/vppapigen/gram.c tools/vppapigen/gram.h
+CLEANFILES += tools/vppapigen/lex_e.c
 # vi:syntax=automake