Re: mailutils ./ChangeLog guimb/Makefile.am libmu_s...

[Jeff Bailey]

On Sat, Oct 13, 2001 at 04:14:23AM -0700, Jeff Bailey wrote:

> Weird.  I guess CURDIR must be a GNU Make variable.  The thing is that
> the .x file is created in the builddir.  I guess -I. would do the same job.
> I was surprised that automake doesn't define a $(builddir).

Here's a patch that I'm not incredibly happy with, but it seems the
most accurate of all the solutions I can think of.

$(DEFAULT_INCLUDES) seems to include `-I$(srcdir)', `-I.', and a `-I'
pointing to the directory holding `config.h'.  However, I'm not happy
because the manual says that I should use AM_CPPFLAGS.

On my system, AM_CPPFLAGS seems to be empty.

Can someone with an older version tell me if DEFAULT_INCLUDES is just
an automake 1.5 thing?  If it is, are you guys willing to upgrade?
(I'd like to update configure.in to 2.50 too sometime.  I'm waiting
for one annoying bug to be fixed.)

(A similar patch also applied to guimb)

Index: libmu_scm/Makefile.am
===================================================================
RCS file: /cvs/mailutils/libmu_scm/Makefile.am,v
diff -r1.8 Makefile.am
2c2
< INCLUDES =-I$(CURDIR) -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib 
-I$(top_srcdir)/include
---
> INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include
34c34
<       $(GUILE_DOC_SNARF) $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) \
---
>       $(GUILE_DOC_SNARF) $< $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
> $(CPPFLAGS) $(CFLAGS) \
38c38
<       $(GUILE_DOC_SNARF) $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) \
---
>       $(GUILE_DOC_SNARF) $< $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
> $(CPPFLAGS) $(CFLAGS) \
47c47
< MKDEP = $(CC) -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
---
> MKDEP = $(CC) -M -MG $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) 
> $(CFLAGS)


-- 
Abandon the search for truth; settle for a good fantasy.