diff mbox

[ovs-dev] Makefile.am: Suppress echoing of "Avoid include/ depending on lib/" commands

Message ID CAPWQB7ELDubMDAot-DxvkB7DgZaoxy+EM6bjnEk8v4esRQDvjA@mail.gmail.com
State Not Applicable
Headers show

Commit Message

Joe Stringer Feb. 22, 2017, 9:03 p.m. UTC 
On 22 February 2017 at 08:18, Timothy Redaelli <tredaelli@redhat.com> wrote:
> Build check added in commit c458e4a3
>
> Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
> ---
>  Makefile.am | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index 7ff66fe..147152d 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -230,7 +230,7 @@ config-h-check:
>           echo "every C source file must #include <config.h>."; \
>           exit 1; \
>         fi
> -       if grep '#include' $(srcdir)/include/openvswitch/*.h | \
> +       @if grep '#include' $(srcdir)/include/openvswitch/*.h | \

I suggest the following instead, does this work for you?

Comments

Timothy Redaelli Feb. 22, 2017, 11:14 p.m. UTC | #1 
On Wed, Feb 22, 2017 at 10:03 PM, Joe Stringer <joe@ovn.org> wrote:
> On 22 February 2017 at 08:18, Timothy Redaelli <tredaelli@redhat.com> wrote:
<cut>

> I suggest the following instead, does this work for you?
>
> diff --git a/Makefile.am b/Makefile.am
> index 7ff66fe15086..a4dd7b8dd16a 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -229,8 +229,8 @@ 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' $(srcdir)/include/openvswitch/*.h | \
> +       fi; \
> +       if grep '#include' include/openvswitch/*.h | \
>            grep -vE '(<.*>)|("openvswitch)|("openflow)'; \
>        then \
>          echo "See above for list of violations of the rule that"; \

Looks good to me.

Thank you
Joe Stringer Feb. 22, 2017, 11:21 p.m. UTC | #2 
On 22 February 2017 at 15:14, Timothy Redaelli <tredaelli@redhat.com> wrote:
> On Wed, Feb 22, 2017 at 10:03 PM, Joe Stringer <joe@ovn.org> wrote:
>> On 22 February 2017 at 08:18, Timothy Redaelli <tredaelli@redhat.com> wrote:
> <cut>
>
>> I suggest the following instead, does this work for you?
>>
>> diff --git a/Makefile.am b/Makefile.am
>> index 7ff66fe15086..a4dd7b8dd16a 100644
>> --- a/Makefile.am
>> +++ b/Makefile.am
>> @@ -229,8 +229,8 @@ 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' $(srcdir)/include/openvswitch/*.h | \
>> +       fi; \
>> +       if grep '#include' include/openvswitch/*.h | \
>>            grep -vE '(<.*>)|("openvswitch)|("openflow)'; \
>>        then \
>>          echo "See above for list of violations of the rule that"; \
>
> Looks good to me.

OK thanks, I made this change and applied the patch to master and branch-2.7.
diff mbox

Patch

diff --git a/Makefile.am b/Makefile.am
index 7ff66fe15086..a4dd7b8dd16a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -229,8 +229,8 @@  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' $(srcdir)/include/openvswitch/*.h | \
+       fi; \
+       if grep '#include' include/openvswitch/*.h | \
           grep -vE '(<.*>)|("openvswitch)|("openflow)'; \
       then \
         echo "See above for list of violations of the rule that"; \