From patchwork Tue Feb 14 01:31:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Pettit X-Patchwork-Id: 727650 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vMlJg73tHz9s7k for ; Tue, 14 Feb 2017 12:32:01 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id A735FB3F; Tue, 14 Feb 2017 01:31:57 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 82AF3B3D for ; Tue, 14 Feb 2017 01:31:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 1BE331D6 for ; Tue, 14 Feb 2017 01:31:55 +0000 (UTC) Received: from mfilter19-d.gandi.net (mfilter19-d.gandi.net [217.70.178.147]) by relay3-d.mail.gandi.net (Postfix) with ESMTP id D061BA80CE for ; Tue, 14 Feb 2017 02:31:53 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter19-d.gandi.net Received: from relay3-d.mail.gandi.net ([IPv6:::ffff:217.70.183.195]) by mfilter19-d.gandi.net (mfilter19-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id GRW-HR_hzGMw for ; Tue, 14 Feb 2017 02:31:52 +0100 (CET) X-Originating-IP: 208.91.2.3 Received: from localhost.localdomain (unknown [208.91.2.3]) (Authenticated sender: jpettit@ovn.org) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 68A11A80C6 for ; Tue, 14 Feb 2017 02:31:50 +0100 (CET) From: Justin Pettit To: dev@openvswitch.org Date: Mon, 13 Feb 2017 17:31:49 -0800 Message-Id: <1487035909-103017-1-git-send-email-jpettit@ovn.org> X-Mailer: git-send-email 1.9.1 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] Remove build-time generated files when "make clean" is run. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org "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 Acked-by: Ben Pfaff --- debian/automake.mk | 2 +- ovn/automake.mk | 10 +++++----- ovn/controller-vtep/automake.mk | 2 +- ovn/controller/automake.mk | 2 +- ovn/northd/automake.mk | 2 +- ovn/utilities/automake.mk | 2 +- ovsdb/automake.mk | 10 +++++----- utilities/automake.mk | 2 +- utilities/bugtool/automake.mk | 2 +- vswitchd/automake.mk | 6 +++--- vtep/automake.mk | 6 +++--- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/debian/automake.mk b/debian/automake.mk index e5e72de..07ea912 100644 --- 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 1257ef4..c5925e9 100644 --- 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 cacfae6..0c83dc7 100644 --- 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 cf57bbd..8c6a787 100644 --- 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 6e713fc..93aebe8 100644 --- 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 164cdda..08e48ea 100644 --- 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 84aed2a..33d04f8 100644 --- 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 2590dc0..169388f 100644 --- 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 ce205a9..b6d5629 100644 --- 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 895625b..aa42245 100644 --- 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 02024eb..6bcb031 100644 --- 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)