Re: [PATCH v2 0/9] Patches to avoid use of make recursion in the 'src/' subdir

[Jim Meyering]

Stefano Lattarini wrote:

> On 08/31/2012 08:12 PM, Jim Meyering wrote:
>>
>> From ea8043e5b08956b804c1cc3cb79ee54f2d969b36 Mon Sep 17 00:00:00 2001
>> From: Jim Meyering <address@hidden>
>> Date: Fri, 31 Aug 2012 20:05:29 +0200
>> Subject: [PATCH 2/2] maint: check-programs-vs-x: avoid a new syntax-check
>>  failure
>>
>> * cfg.mk (check-programs-vs-x): The new variable,
>> $(all-progs-but-lbracket) contains libstdbuf.so, and it does
>> not have a corresponding .x file, so exempt it.
>> ---
>>  cfg.mk | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/cfg.mk b/cfg.mk
>> index 87f54c0..e1bcf27 100644
>> --- a/cfg.mk
>> +++ b/cfg.mk
>> @@ -234,6 +234,7 @@ all-progs-but-lbracket = $(filter-out [,$(patsubst 
>> src/%,%,$(all_programs)))
>>  check-programs-vs-x:
>>      @status=0;                                      \
>>      for p in dummy $(all-progs-but-lbracket); do    \
>> +      case $$p in *.so) continue;; esac;            \
>>        test $$p = dummy && continue;                 \
>>        test $$p = ginstall && p=install || : ;       \
>>        test -f $(srcdir)/man/$$p.x                   \
>>
> Oh.  I hadn't noticed any failure here.  Weird.  Oh well, probably I
> missed in in the fully of fix/amend/rebase/....
>
> Thanks for taking care of those issues.

No problem.
Next step, "make distcheck".  First failure is because inclusion of
version.h fails in the non-srcdir build:

    $ make src/dd.o
      CC       src/dd.o
    In file included from ../src/dd.c:28:0:
    ../src/system.h:94:21: fatal error: version.h: No such file or directory
     #include "version.h"
                         ^
    compilation terminated.
    make: *** [src/dd.o] Error 1

This fixes it:

diff --git a/src/local.mk b/src/local.mk
index 5146361..6236750 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -70,7 +70,7 @@ CLEANFILES = $(SCRIPTS)
 # or 'dist'.
 CLEANFILES += $(no_install__progs)

-AM_CPPFLAGS = -I$(top_srcdir)/lib
+AM_CPPFLAGS = -I$(top_srcdir)/lib -Isrc

 noinst_LIBRARIES = src/libver.a
 nodist_src_libver_a_SOURCES = src/version.c src/version.h