diff mbox series

[ovs-dev,1/6] automake: Move build-aux EXTRA_DIST updates to their own file.

Message ID 20231030201054.136934-2-i.maximets@ovn.org
State Accepted
Commit 723cd4c9be4a06b87909a6b157544b530afc6954
Delegated to: Ilya Maximets
Headers show
Series build-aux: Fix flake8 and syntax issues with python 3.12. | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot-_Build_and_Test success github build: passed
ovsrobot/intel-ovs-compilation fail test: fail

Commit Message

Ilya Maximets Oct. 30, 2023, 8:10 p.m. UTC 
Otherwise it's hard to keep track of all the scripts we have.

Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
---
 build-aux/automake.mk                | 10 +++++++++-
 datapath-windows/include/automake.mk |  2 --
 include/automake.mk                  |  1 -
 include/openflow/automake.mk         |  3 ---
 lib/automake.mk                      |  4 ----
 5 files changed, 9 insertions(+), 11 deletions(-)

Comments

Eelco Chaudron Oct. 31, 2023, 8:22 a.m. UTC | #1 
On 30 Oct 2023, at 21:10, Ilya Maximets wrote:

> Otherwise it's hard to keep track of all the scripts we have.
>
> Signed-off-by: Ilya Maximets <i.maximets@ovn.org>

Thanks for fixing this, and the changes look good to me.

Acked-by: Eelco Chaudron <echaudro@redhat.com>
diff mbox series

Patch

diff --git a/build-aux/automake.mk b/build-aux/automake.mk
index b9a77a51c..8d7e8ae19 100644
--- a/build-aux/automake.mk
+++ b/build-aux/automake.mk
@@ -1,11 +1,19 @@ 
 EXTRA_DIST += \
 	build-aux/calculate-schema-cksum \
 	build-aux/cccl \
+	build-aux/check-structs \
 	build-aux/cksum-schema-check \
 	build-aux/dist-docs \
 	build-aux/dpdkstrip.py \
-	build-aux/generate-dhparams-c \
+	build-aux/extract-odp-netlink-h \
+	build-aux/extract-odp-netlink-macros-h \
+	build-aux/extract-odp-netlink-windows-dp-h \
+	build-aux/extract-ofp-actions \
+	build-aux/extract-ofp-errors \
+	build-aux/extract-ofp-fields \
+	build-aux/extract-ofp-msgs \
 	build-aux/gen_ofp_field_decoders \
+	build-aux/generate-dhparams-c \
 	build-aux/initial-tab-allowed-files \
 	build-aux/sodepends.py \
 	build-aux/soexpand.py \
diff --git a/datapath-windows/include/automake.mk b/datapath-windows/include/automake.mk
index a354f007f..185a06b03 100644
--- a/datapath-windows/include/automake.mk
+++ b/datapath-windows/include/automake.mk
@@ -7,6 +7,4 @@  $(srcdir)/datapath-windows/include/OvsDpInterface.h: \
          build-aux/extract-odp-netlink-windows-dp-h
 	$(AM_V_GEN)sed -f $(srcdir)/build-aux/extract-odp-netlink-windows-dp-h < $< > $@
 
-EXTRA_DIST += $(srcdir)/build-aux/extract-odp-netlink-windows-dp-h
-
 CLEANFILES += $(srcdir)/datapath-windows/include/OvsDpInterface.h
diff --git a/include/automake.mk b/include/automake.mk
index 1e3390ae0..a276c680b 100644
--- a/include/automake.mk
+++ b/include/automake.mk
@@ -8,7 +8,6 @@  include/odp-netlink-macros.h: include/odp-netlink.h \
                               build-aux/extract-odp-netlink-macros-h
 	$(AM_V_GEN)sh -f $(srcdir)/build-aux/extract-odp-netlink-macros-h $< > $@
 
-EXTRA_DIST += build-aux/extract-odp-netlink-h build-aux/extract-odp-netlink-macros-h
 CLEANFILES += include/odp-netlink.h include/odp-netlink-macros.h
 
 include include/openflow/automake.mk
diff --git a/include/openflow/automake.mk b/include/openflow/automake.mk
index a1d75756c..820c09f84 100644
--- a/include/openflow/automake.mk
+++ b/include/openflow/automake.mk
@@ -22,6 +22,3 @@  HSTAMP_FILES = $(openflowinclude_HEADERS:.h=.hstamp)
 CLEANFILES += $(HSTAMP_FILES)
 ALL_LOCAL += $(HSTAMP_FILES)
 $(HSTAMP_FILES): build-aux/check-structs $(openflowinclude_HEADERS)
-
-EXTRA_DIST += build-aux/check-structs
-
diff --git a/lib/automake.mk b/lib/automake.mk
index 24b0ffefe..1be13a420 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -642,7 +642,6 @@  lib/nx-match.inc: $(srcdir)/build-aux/extract-ofp-fields include/openvswitch/met
 	$(AM_V_at)mv $@.tmp $@
 lib/nx-match.lo: lib/nx-match.inc
 CLEANFILES += lib/meta-flow.inc lib/nx-match.inc
-EXTRA_DIST += build-aux/extract-ofp-fields
 
 lib/ofp-actions.inc1: $(srcdir)/build-aux/extract-ofp-actions lib/ofp-actions.c
 	$(AM_V_GEN)$(run_python) $< prototypes $(srcdir)/lib/ofp-actions.c > $@.tmp && mv $@.tmp $@
@@ -650,7 +649,6 @@  lib/ofp-actions.inc2: $(srcdir)/build-aux/extract-ofp-actions lib/ofp-actions.c
 	$(AM_V_GEN)$(run_python) $< definitions $(srcdir)/lib/ofp-actions.c > $@.tmp && mv $@.tmp $@
 lib/ofp-actions.lo: lib/ofp-actions.inc1 lib/ofp-actions.inc2
 CLEANFILES += lib/ofp-actions.inc1 lib/ofp-actions.inc2
-EXTRA_DIST += build-aux/extract-ofp-actions
 
 lib/ofp-errors.inc: include/openvswitch/ofp-errors.h include/openflow/openflow-common.h \
 	$(srcdir)/build-aux/extract-ofp-errors
@@ -660,14 +658,12 @@  lib/ofp-errors.inc: include/openvswitch/ofp-errors.h include/openflow/openflow-c
 	mv $@.tmp $@
 lib/ofp-errors.lo: lib/ofp-errors.inc
 CLEANFILES += lib/ofp-errors.inc
-EXTRA_DIST += build-aux/extract-ofp-errors
 
 lib/ofp-msgs.inc: include/openvswitch/ofp-msgs.h $(srcdir)/build-aux/extract-ofp-msgs
 	$(AM_V_GEN)$(run_python) $(srcdir)/build-aux/extract-ofp-msgs \
 		$(srcdir)/include/openvswitch/ofp-msgs.h $@ > $@.tmp && mv $@.tmp $@
 lib/ofp-msgs.lo: lib/ofp-msgs.inc
 CLEANFILES += lib/ofp-msgs.inc
-EXTRA_DIST += build-aux/extract-ofp-msgs
 
 # _server IDL
 OVSIDL_BUILT += lib/ovsdb-server-idl.c lib/ovsdb-server-idl.h lib/ovsdb-server-idl.ovsidl