Remove build-time generated files when "make clean" is run.

"make clean" should remove all files generated by building a program, while
"make distclean" should also remove files generated by configuring the
program.  Previously some generated files during the build process, such
as man pages, were left behind when "make clean" was run.  This commit
only leaves configuration files after "make clean" is run, and removes
all other generated files.

Signed-off-by: Justin Pettit <jpettit@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>

diff --git a/debian/automake.mk b/debian/automake.mk
index e5e72de509045ba2ff69eedc869226bd62bdc247..07ea912c47aeb53dce0da58bd56b06ec1f7b31a5 100644 (file)
--- a/debian/automake.mk
+++ b/debian/automake.mk
@@ -97,4 +97,4 @@ $(srcdir)/debian/copyright: AUTHORS.rst debian/copyright.in
          sed -e '34,/%AUTHORS%/d' $(srcdir)/debian/copyright.in;          \
        } > $@
 
-DISTCLEANFILES += debian/copyright
+CLEANFILES += debian/copyright

diff --git a/ovn/automake.mk b/ovn/automake.mk
index 1257ef49d86819eb544b010fe6bcdd6013cb4401..c5925e9285acf7b26c66ffe6d8cc5526162de6b7 100644 (file)
--- a/ovn/automake.mk
+++ b/ovn/automake.mk
@@ -15,13 +15,13 @@ ovn/ovn-sb.pic: ovn/ovn-sb.gv ovsdb/dot2pic
        mv $@.tmp $@
 OVN_SB_PIC = ovn/ovn-sb.pic
 OVN_SB_DOT_DIAGRAM_ARG = --er-diagram=$(OVN_SB_PIC)
-DISTCLEANFILES += ovn/ovn-sb.gv ovn/ovn-sb.pic
+CLEANFILES += ovn/ovn-sb.gv ovn/ovn-sb.pic
 endif
 endif
 
 # OVN southbound schema documentation
 EXTRA_DIST += ovn/ovn-sb.xml
-DISTCLEANFILES += ovn/ovn-sb.5
+CLEANFILES += ovn/ovn-sb.5
 man_MANS += ovn/ovn-sb.5
 ovn/ovn-sb.5: \
        ovsdb/ovsdb-doc ovn/ovn-sb.xml ovn/ovn-sb.ovsschema $(OVN_SB_PIC)
@@ -49,13 +49,13 @@ ovn/ovn-nb.pic: ovn/ovn-nb.gv ovsdb/dot2pic
        mv $@.tmp $@
 OVN_NB_PIC = ovn/ovn-nb.pic
 OVN_NB_DOT_DIAGRAM_ARG = --er-diagram=$(OVN_NB_PIC)
-DISTCLEANFILES += ovn/ovn-nb.gv ovn/ovn-nb.pic
+CLEANFILES += ovn/ovn-nb.gv ovn/ovn-nb.pic
 endif
 endif
 
 # OVN northbound schema documentation
 EXTRA_DIST += ovn/ovn-nb.xml
-DISTCLEANFILES += ovn/ovn-nb.5
+CLEANFILES += ovn/ovn-nb.5
 man_MANS += ovn/ovn-nb.5
 ovn/ovn-nb.5: \
        ovsdb/ovsdb-doc ovn/ovn-nb.xml ovn/ovn-nb.ovsschema $(OVN_NB_PIC)
@@ -68,7 +68,7 @@ ovn/ovn-nb.5: \
 
 man_MANS += ovn/ovn-architecture.7
 EXTRA_DIST += ovn/ovn-architecture.7.xml
-DISTCLEANFILES += ovn/ovn-architecture.7
+CLEANFILES += ovn/ovn-architecture.7
 
 EXTRA_DIST += \
        ovn/TODO.rst

diff --git a/ovn/controller-vtep/automake.mk b/ovn/controller-vtep/automake.mk
index cacfae6cd82759265dc888170087c101d85425ea..0c83dc70a18bd68dc0c938ad463b7eedad2861f2 100644 (file)
--- a/ovn/controller-vtep/automake.mk
+++ b/ovn/controller-vtep/automake.mk
@@ -11,4 +11,4 @@ ovn_controller_vtep_ovn_controller_vtep_SOURCES = \
 ovn_controller_vtep_ovn_controller_vtep_LDADD = ovn/lib/libovn.la lib/libopenvswitch.la vtep/libvtep.la
 man_MANS += ovn/controller-vtep/ovn-controller-vtep.8
 EXTRA_DIST += ovn/controller-vtep/ovn-controller-vtep.8.xml
-DISTCLEANFILES += ovn/controller-vtep/ovn-controller-vtep.8
+CLEANFILES += ovn/controller-vtep/ovn-controller-vtep.8

diff --git a/ovn/controller/automake.mk b/ovn/controller/automake.mk
index cf57bbd794ae87554fe8959ccb95044cee1b1469..8c6a78757b67900e2f463693b491e9dc32eee7ba 100644 (file)
--- a/ovn/controller/automake.mk
+++ b/ovn/controller/automake.mk
@@ -23,4 +23,4 @@ ovn_controller_ovn_controller_SOURCES = \
 ovn_controller_ovn_controller_LDADD = ovn/lib/libovn.la lib/libopenvswitch.la
 man_MANS += ovn/controller/ovn-controller.8
 EXTRA_DIST += ovn/controller/ovn-controller.8.xml
-DISTCLEANFILES += ovn/controller/ovn-controller.8
+CLEANFILES += ovn/controller/ovn-controller.8

diff --git a/ovn/northd/automake.mk b/ovn/northd/automake.mk
index 6e713fc97109a5a95dd60b03e988c3eaa9036db2..93aebe8b17fff7311f4ed558d233d61477e07aae 100644 (file)
--- a/ovn/northd/automake.mk
+++ b/ovn/northd/automake.mk
@@ -7,4 +7,4 @@ ovn_northd_ovn_northd_LDADD = \
        lib/libopenvswitch.la
 man_MANS += ovn/northd/ovn-northd.8
 EXTRA_DIST += ovn/northd/ovn-northd.8.xml
-DISTCLEANFILES += ovn/northd/ovn-northd.8
+CLEANFILES += ovn/northd/ovn-northd.8

diff --git a/ovn/utilities/automake.mk b/ovn/utilities/automake.mk
index 164cddaa39130cb0e38a58bac893f78244ba46b2..08e48ea84bffea0612c62fccc3eb0aab84138a70 100644 (file)
--- a/ovn/utilities/automake.mk
+++ b/ovn/utilities/automake.mk
@@ -24,7 +24,7 @@ EXTRA_DIST += \
     ovn/utilities/ovn-trace.8.xml \
     ovn/utilities/ovndb-servers.ocf
 
-DISTCLEANFILES += \
+CLEANFILES += \
     ovn/utilities/ovn-ctl.8 \
     ovn/utilities/ovn-nbctl.8 \
     ovn/utilities/ovn-sbctl.8 \

diff --git a/ovsdb/automake.mk b/ovsdb/automake.mk
index 84aed2a33f0f4acc2cb976d2911e988f6ac0d81a..33d04f809f2696b031c9575db0b23e79a01bda40 100644 (file)
--- a/ovsdb/automake.mk
+++ b/ovsdb/automake.mk
@@ -54,7 +54,7 @@ ovsdb_ovsdb_tool_SOURCES = ovsdb/ovsdb-tool.c
 ovsdb_ovsdb_tool_LDADD = ovsdb/libovsdb.la lib/libopenvswitch.la
 # ovsdb-tool.1
 man_MANS += ovsdb/ovsdb-tool.1
-DISTCLEANFILES += ovsdb/ovsdb-tool.1
+CLEANFILES += ovsdb/ovsdb-tool.1
 MAN_ROOTS += ovsdb/ovsdb-tool.1.in
 
 # ovsdb-client
@@ -63,7 +63,7 @@ ovsdb_ovsdb_client_SOURCES = ovsdb/ovsdb-client.c
 ovsdb_ovsdb_client_LDADD = ovsdb/libovsdb.la lib/libopenvswitch.la
 # ovsdb-client.1
 man_MANS += ovsdb/ovsdb-client.1
-DISTCLEANFILES += ovsdb/ovsdb-client.1
+CLEANFILES += ovsdb/ovsdb-client.1
 MAN_ROOTS += ovsdb/ovsdb-client.1.in
 
 # ovsdb-server
@@ -72,14 +72,14 @@ ovsdb_ovsdb_server_SOURCES = ovsdb/ovsdb-server.c
 ovsdb_ovsdb_server_LDADD = ovsdb/libovsdb.la lib/libopenvswitch.la
 # ovsdb-server.1
 man_MANS += ovsdb/ovsdb-server.1
-DISTCLEANFILES += ovsdb/ovsdb-server.1
+CLEANFILES += ovsdb/ovsdb-server.1
 MAN_ROOTS += ovsdb/ovsdb-server.1.in
 
 # ovsdb-idlc
 noinst_SCRIPTS += ovsdb/ovsdb-idlc
 EXTRA_DIST += ovsdb/ovsdb-idlc.in
 MAN_ROOTS += ovsdb/ovsdb-idlc.1
-DISTCLEANFILES += ovsdb/ovsdb-idlc
+CLEANFILES += ovsdb/ovsdb-idlc
 SUFFIXES += .ovsidl .ovsschema
 OVSDB_IDLC = $(run_python) $(srcdir)/ovsdb/ovsdb-idlc.in
 .ovsidl.c:
@@ -107,5 +107,5 @@ OVSDB_DOC = $(run_python) $(srcdir)/ovsdb/ovsdb-doc
 # ovsdb-dot
 EXTRA_DIST += ovsdb/ovsdb-dot.in ovsdb/dot2pic
 noinst_SCRIPTS += ovsdb/ovsdb-dot
-DISTCLEANFILES += ovsdb/ovsdb-dot
+CLEANFILES += ovsdb/ovsdb-dot
 OVSDB_DOT = $(run_python) $(srcdir)/ovsdb/ovsdb-dot.in

diff --git a/utilities/automake.mk b/utilities/automake.mk
index 2590dc0e6b119f691510af4d7b3d2331c8bb9ca4..169388fda5ecfdd96c78ee63651dd91a17dbe33d 100644 (file)
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -75,7 +75,7 @@ MAN_ROOTS += \
        utilities/ovs-vlan-test.8.in \
        utilities/ovs-vsctl.8.in
 MAN_FRAGMENTS += utilities/ovs-vlan-bugs.man
-DISTCLEANFILES += \
+CLEANFILES += \
        utilities/ovs-appctl.8 \
        utilities/ovs-ctl \
        utilities/ovs-check-dead-ifs \

diff --git a/utilities/bugtool/automake.mk b/utilities/bugtool/automake.mk
index ce205a983cd5ea0aae3d19d2d92147adc2a96bda..b6d5629dde381b48b303f158d2745ae5bdac3f2c 100644 (file)
--- a/utilities/bugtool/automake.mk
+++ b/utilities/bugtool/automake.mk
@@ -4,7 +4,7 @@ CLEANFILES += utilities/bugtool/ovs-bugtool
 
 man_MANS += utilities/bugtool/ovs-bugtool.8
 MAN_ROOTS += utilities/bugtool/ovs-bugtool.8.in
-DISTCLEANFILES += utilities/bugtool/ovs-bugtool.8
+CLEANFILES += utilities/bugtool/ovs-bugtool.8
 
 bugtool_plugins = \
        utilities/bugtool/plugins/kernel-info/openvswitch.xml \

diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
index 895625be20cede3078bc685d4a9e4082811dc18d..aa4224561f3de53c596ada2a3e7e2809816ce6e9 100644 (file)
--- a/vswitchd/automake.mk
+++ b/vswitchd/automake.mk
@@ -1,6 +1,6 @@
 sbin_PROGRAMS += vswitchd/ovs-vswitchd
 man_MANS += vswitchd/ovs-vswitchd.8
-DISTCLEANFILES += \
+CLEANFILES += \
        vswitchd/ovs-vswitchd.8
 
 vswitchd_ovs_vswitchd_SOURCES = \
@@ -35,13 +35,13 @@ vswitchd/vswitch.pic: vswitchd/vswitch.gv ovsdb/dot2pic
        mv $@.tmp $@
 VSWITCH_PIC = vswitchd/vswitch.pic
 VSWITCH_DOT_DIAGRAM_ARG = --er-diagram=$(VSWITCH_PIC)
-DISTCLEANFILES += vswitchd/vswitch.gv vswitchd/vswitch.pic
+CLEANFILES += vswitchd/vswitch.gv vswitchd/vswitch.pic
 endif
 endif
 
 # vswitch schema documentation
 EXTRA_DIST += vswitchd/vswitch.xml
-DISTCLEANFILES += vswitchd/ovs-vswitchd.conf.db.5
+CLEANFILES += vswitchd/ovs-vswitchd.conf.db.5
 man_MANS += vswitchd/ovs-vswitchd.conf.db.5
 vswitchd/ovs-vswitchd.conf.db.5: \
        ovsdb/ovsdb-doc vswitchd/vswitch.xml vswitchd/vswitch.ovsschema \

diff --git a/vtep/automake.mk b/vtep/automake.mk
index 02024eb7bacf9dff115d773dcf7d831f49ba2cc3..6bcb031888d4e1af24ea161b5d65c857e06eb6bb 100644 (file)
--- a/vtep/automake.mk
+++ b/vtep/automake.mk
@@ -27,7 +27,7 @@ bin_PROGRAMS += \
 MAN_ROOTS += \
    vtep/vtep-ctl.8.in
 
-DISTCLEANFILES += \
+CLEANFILES += \
    vtep/vtep-ctl.8
 
 man_MANS += \
@@ -61,13 +61,13 @@ vtep/vtep.pic: vtep/vtep.gv ovsdb/dot2pic
        mv $@.tmp $@
 VTEP_PIC = vtep/vtep.pic
 VTEP_DOT_DIAGRAM_ARG = --er-diagram=$(VTEP_PIC)
-DISTCLEANFILES += vtep/vtep.gv vtep/vtep.pic
+CLEANFILES += vtep/vtep.gv vtep/vtep.pic
 endif
 endif
 
 # VTEP schema documentation
 EXTRA_DIST += vtep/vtep.xml
-DISTCLEANFILES += vtep/vtep.5
+CLEANFILES += vtep/vtep.5
 man_MANS += vtep/vtep.5
 vtep/vtep.5: \
        ovsdb/ovsdb-doc vtep/vtep.xml $(srcdir)/vtep/vtep.ovsschema $(VTEP_PIC)