On 4/25/19 4:26 PM, Ben Pfaff wrote:
On Thu, Apr 25, 2019 at 04:08:15PM -0400, Brian Haley wrote:
Added TODO_SPLIT.rst to Makefile.am to avoid an error
during build.

Removed a section from config-h-check section of Makefile.am
that was no longer relevant.

Signed-off-by: Brian Haley <[email protected]>
---
  Makefile.am | 8 +-------
  1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1b492a314..2bcdb0a76 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,6 +106,7 @@ EXTRA_DIST = \
        Vagrantfile-FreeBSD \
        .mailmap \
        TODO.rst \
+       TODO_SPLIT.rst \
        ovn-architecture.7.xml \
        ovn-nb.ovsschema \
        ovn-nb.xml \
@@ -263,13 +264,6 @@ config-h-check:
          echo "See above for list of violations of the rule that"; \
          echo "every C source file must #include <config.h>."; \
          exit 1; \
-       fi; \
-       if grep '#include' include/openvswitch/*.h | \
-           grep -vE '(<.*>)|("openvswitch)|("openflow)'; \
-       then \
-         echo "See above for list of violations of the rule that"; \
-         echo "public openvswitch header file should not include internal 
library."; \
-         exit 1; \
        fi
  .PHONY: config-h-check

I wonder whether there should be a similar rule for include/ovn, though?

The top-level include/ only had a single directory, openflow, which itself was empty. I now see there is an ovs/include directory, so maybe that second part needs to change instead of being deleted? It was only generating a non-fatal warning, the TODO_SPLIT.rst was causing a dist-hook-git error.

-Brian
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to