Re: gnulib and automake

[John W. Eaton]

On  9-Nov-2009, David Grundberg wrote:

| I made some changes on top of automake-diffs in order to build 
| liboctave/ and src/.
| 
| amd.patch is just a rewrite of an earlier changeset that fixes a 
| configure test on my setup.
| 
| lt-flags.patch are some changes I made while compiling against ARPACK, 
| SparseSuite, qrupdate and FFTW for liboctave/. It fixes the convhulln 
| typo in src/.
| 
| ----------------------------------------------------------------------
| diff --git a/liboctave/Makefile.am b/liboctave/Makefile.am
| --- a/liboctave/Makefile.am
| +++ b/liboctave/Makefile.am
| @@ -494,10 +494,10 @@
|  LINK_DEPS = \
|    $(RLD_FLAG) \
|    ../libcruft/libcruft.la \
| -  $(SPARSE_LDFLAGS) $(SPARSE_XLIBS) \
| +  $(SPARSE_XLIBS) \
|    $(ARPACK_LIBS) \
|    $(QRUPDATE_LIBS) \
| -  $(FFTW_LDFLAGS) $(FFTW_XLIBS) \
| +  $(FFTW_XLIBS) \
|    $(LAPACK_LIBS) $(BLAS_LIBS) \
|    $(READLINE_LIBS) $(TERM_LIBS) \
|    $(LIBGLOB) $(REGEX_LIBS) $(DL_LIBS) \
| @@ -511,7 +511,17 @@
|  
|  liboctave_la_LIBADD = $(LINK_DEPS)
|  
| -liboctave_la_LDFLAGS = -release $(version)
| +liboctave_la_LDFLAGS = -release $(version) \
| +  $(SPARSE_XLDFLAGS) \
| +  $(ARPACK_LDFLAGS) \
| +  $(QRUPDATE_LDFLAGS) \
| +  $(FFTW_XLDFLAGS)
| +
| +liboctave_la_CPPFLAGS = \
| +  $(SPARSE_XCPPFLAGS) \
| +  $(FFTW_XCPPFLAGS) \
| +  $(ARPACK_CPPFLAGS) \
| +  $(AM_CPPFLAGS)
|  
|  octinclude_HEADERS = \
|    $(INCS) \
| @@ -538,46 +548,6 @@
|       $(AWK) -f $(srcdir)/mk-ops.awk prefix=mx make_inclusive_header=mx-ops.h 
$(srcdir)/mx-ops > address@hidden
|       $(simple_move_if_change_rule)
|  
| -CSparse.d CSparse.df pic/CSparse.o CSparse.o: CPPFLAGS += $(SPARSE_CPPFLAGS)
| -
| -dSparse.d dSparse.df pic/dSparse.o dSparse.o: CPPFLAGS += $(SPARSE_CPPFLAGS)
| -
| -SparseCmplxLU.d SparseCmplxLU.df pic/SparseCmplxLU.o SparseCmplxLU.o: \
| -  CPPFLAGS += $(SPARSE_CPPFLAGS)
| -
| -SparsedbleLU.d SparsedbleLU.df pic/SparsedbleLU.o SparsedbleLU.o: \
| -  CPPFLAGS += $(SPARSE_CPPFLAGS)
| -
| -SparseCmplxQR.d SparseCmplxQR.df pic/SparseCmplxQR.o SparseCmplxQR.o: \
| -  CPPFLAGS += $(SPARSE_CPPFLAGS)
| -
| -SparsedbleQR.d SparsedbleQR.df pic/SparsedbleQR.o SparsedbleQR.o: \
| -  CPPFLAGS += $(SPARSE_CPPFLAGS)
| -
| -SparseCmplxCHOL.d SparseCmplxCHOL.df pic/SparseCmplxCHOL.o 
SparseCmplxCHOL.o: \
| -  CPPFLAGS += $(SPARSE_CPPFLAGS)
| -
| -SparsedbleCHOL.d SparsedbleCHOL.df pic/SparsedbleCHOL.o SparsedbleCHOL.o: \
| -  CPPFLAGS += $(SPARSE_CPPFLAGS)
| -
| -CMatrix.d CMatrix.df pic/CMatrix.o CMatrix.o: CPPFLAGS += $(FFTW_CPPFLAGS)
| -
| -CNDArray.d CNDArray.df pic/CNDArray.o CNDArray.o: CPPFLAGS += 
$(FFTW_CPPFLAGS)
| -
| -dMatrix.d dMatrix.df pic/dMatrix.o dMatrix.o: CPPFLAGS += $(FFTW_CPPFLAGS)
| -
| -dNDArray.d dNDArray.df pic/dNDArray.o dNDArray.o: CPPFLAGS += 
$(FFTW_CPPFLAGS)
| -
| -fCMatrix.d fCMatrix.df pic/fCMatrix.o fCMatrix.o: CPPFLAGS += 
$(FFTW_CPPFLAGS)
| -
| -fCNDArray.d fCNDArray.df pic/fCNDArray.o fCNDArray.o: CPPFLAGS += 
$(FFTW_CPPFLAGS)
| -
| -fMatrix.d fMatrix.df pic/fMatrix.o fMatrix.o: CPPFLAGS += $(FFTW_CPPFLAGS)
| -
| -fNDArray.d fNDArray.df pic/fNDArray.o fNDArray.o: CPPFLAGS += 
$(FFTW_CPPFLAGS)
| -
| -oct-fftw.d oct-fftw.df pic/oct-fftw.o oct-fftw.o: CPPFLAGS += 
$(FFTW_CPPFLAGS)

I made these changes in my automake patch.

| @@ -724,7 +724,7 @@
|  DLD_FUNCTIONS_lib__magick_read___la_LIBADD = $(OCT_LINK_DEPS) 
$(MAGICK_LDFLAGS) $(MAGICK_LIBS)
|  
|  DLD-FUNCTIONS/convhull.df: CPPFLAGS += $(QHULL_CPPFLAGS)
| -DLD_FUNCTIONS_libconvhull_la_CPPFLAGS = $(AM_CPPFLAGS) $(QHULL_CPPFLAGS)
| +DLD_FUNCTIONS_libconvhulln_la_CPPFLAGS = $(AM_CPPFLAGS) $(QHULL_CPPFLAGS)
|  DLD_FUNCTIONS_libconvhulln_la_LIBADD = $(OCT_LINK_DEPS) $(QHULL_LDFLAGS) 
$(QHULL_LIBS)

I changed the name of the convnull.df file dependency and folded this
change into my automake patch.

| 
| diff --git a/ChangeLog b/ChangeLog
| --- a/ChangeLog
| +++ b/ChangeLog
| @@ -1,6 +1,10 @@
|  2009-10-29  Thomas Treichl  <address@hidden>
|  
|       * configure.in: Add support for dlopen on Mac systems.
| +
| +2009-10-21  David Grundberg  <address@hidden>
| +
| +     * configure.ac: Use AMD_CPPFLAGS while checking for UMFPACK.
|  
|  2009-10-20  Jaroslav Hajek  <address@hidden>

I applied this patch to the current sources.

Thanks,

jwe