Re: gnulib and automake

[Michael Goffioul]

I see on http://www.octave.org/hg/octave/ that you didn't
apply the changes above. Did you find another solution?
While continuing with the compilation, I noticed that the
proposed changes below prevents to create PKG_ADD
correctly in DLD-FUNCTIONS subdir, because
DLD_DYNAMIC_DEF_FILES is not defined anymore.

Michael.


On Sun, Nov 15, 2009 at 5:38 PM, John W. Eaton <address@hidden> wrote:
> OK, automake is not being too smart here.  It is generating these
> rules as if __contourc__ (and other DLD-FUNCTIONS files) are part of
> liboctinterp when they are not.  The relevant part of src/Makefile.am
> is
>
>  if AMCOND_ENABLE_DYNAMIC_LINKING
>    DLD_DYNAMIC_SRC = $(DLD_FUNCTIONS_SRC)
>    DLD_STATIC_SRC =
>    OCT_FILES = $(DLD_FUNCTIONS_SRC:.cc=.oct)
>  else
>    DLD_DYNAMIC_SRC =
>    DLD_STATIC_SRC = $(DLD_FUNCTIONS_SRC)
>    OCT_FILES =
>  endif
>
>  liboctinterp_la_SOURCES = \
>    $(DIST_SRC) \
>    $(DLD_STATIC_SRC) \
>    $(OPERATORS_SRC) \
>    $(TEMPLATE_INST_SRC)
>
>  DLD_DYNAMIC_DEF_FILES = $(DLD_DYNAMIC_SRC:.cc=.df)
>  DLD_STATIC_DEF_FILES = $(DLD_STATIC_SRC:.cc=.df)
>
>  SRC_DEF_FILES := $(shell $(srcdir)/find-defun-files.sh "$(srcdir)" 
> $(DIST_SRC))
>
>  DEF_FILES = $(SRC_DEF_FILES) $(DLD_DYNAMIC_DEF_FILES) $(DLD_STATIC_DEF_FILES)
>
> The problem persists even if I write this as
>
>  if AMCOND_ENABLE_DYNAMIC_LINKING
>    OCT_FILES = $(DLD_FUNCTIONS_SRC:.cc=.oct)
>    liboctinterp_la_SOURCES = \
>      $(DIST_SRC) \
>      $(OPERATORS_SRC) \
>      $(TEMPLATE_INST_SRC)
>  else
>    OCT_FILES =
>    liboctinterp_la_SOURCES = \
>      $(DIST_SRC) \
>      $(OPERATORS_SRC) \
>      $(TEMPLATE_INST_SRC) \
>      $(DLD_FUNCTIONS_SRC)
>  endif
>
>  DEF_FILES = \
>    $(shell $(srcdir)/find-defun-files.sh "$(srcdir)" $(DIST_SRC)) \
>    $(DLD_FUNCTIONS_SRC:.cc=.df)
>
> Since you want to do dynamic linking, try the following change and see
> if it solves the problem.  Then I will try to figure out if this is a
> bug in automake or just pilot error.
>
> jwe
>
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -430,28 +430,15 @@
>  include OPERATORS/module.mk
>  include TEMPLATE-INST/module.mk
>
> -if AMCOND_ENABLE_DYNAMIC_LINKING
> -  DLD_DYNAMIC_SRC = $(DLD_FUNCTIONS_SRC)
> -  DLD_STATIC_SRC =
> -  OCT_FILES = $(DLD_FUNCTIONS_SRC:.cc=.oct)
> -else
> -  DLD_DYNAMIC_SRC =
> -  DLD_STATIC_SRC = $(DLD_FUNCTIONS_SRC)
> -  OCT_FILES =
> -endif
> -
> +OCT_FILES = $(DLD_FUNCTIONS_SRC:.cc=.oct)
>  liboctinterp_la_SOURCES = \
>   $(DIST_SRC) \
> -  $(DLD_STATIC_SRC) \
>   $(OPERATORS_SRC) \
>   $(TEMPLATE_INST_SRC)
>
> -DLD_DYNAMIC_DEF_FILES = $(DLD_DYNAMIC_SRC:.cc=.df)
> -DLD_STATIC_DEF_FILES = $(DLD_STATIC_SRC:.cc=.df)
> -
> -SRC_DEF_FILES := $(shell $(srcdir)/find-defun-files.sh "$(srcdir)" 
> $(DIST_SRC))
> -
> -DEF_FILES = $(SRC_DEF_FILES) $(DLD_DYNAMIC_DEF_FILES) $(DLD_STATIC_DEF_FILES)
> +DEF_FILES = \
> +  $(shell $(srcdir)/find-defun-files.sh "$(srcdir)" $(DIST_SRC)) \
> +  $(DLD_FUNCTIONS_SRC:.cc=.df)
>
>  if AMCOND_ENABLE_DYNAMIC_LINKING
>   OCTAVE_LIBS = \
>
>