Mercurial > octave

diff liboctave/Makefile.am @ 19124:3087dc835497

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate recursive build in liboctave/cruft directory * liboctave/cruft/module.mk: New file, adapted from Makefile.am. * liboctave/cruft/Makefile.am: Delete. * configure.ac (AC_OUTPUT): Don't generate liboctave/cruft/Makefile. * liboctave/array/module.mk, liboctave/numeric/module.mk, liboctave/operators/module.mk, liboctave/system/module.mk, liboctave/util/module.mk: Append convenience library name to liboctave_la_LIBADD here. * liboctave/Makefile.am: Initialize liboctave_la_LIBADD to empty string here. * liboctave/cruft/Faddeeva/module.mk, liboctave/cruft/amos/module.mk, liboctave/cruft/blas-xtra/module.mk, liboctave/cruft/daspk/module.mk, liboctave/cruft/dasrt/module.mk, liboctave/cruft/dassl/module.mk, liboctave/cruft/fftpack/module.mk, liboctave/cruft/lapack-xtra/module.mk, liboctave/cruft/misc/module.mk, liboctave/cruft/odepack/module.mk, liboctave/cruft/ordered-qz/module.mk, liboctave/cruft/quadpack/module.mk, liboctave/cruft/ranlib/module.mk, liboctave/cruft/slatec-err/module.mk, liboctave/cruft/slatec-fn/module.mk: Adapt for non-recursive build.
author John W. Eaton <jwe@octave.org>
date Sun, 21 Sep 2014 10:51:38 -0400
parents c0c61619917e
children 18a3eaf7bdf0
line wrap: on
line diff
--- a/liboctave/Makefile.am	Sat Sep 20 22:04:01 2014 -0700
+++ b/liboctave/Makefile.am	Sun Sep 21 10:51:38 2014 -0400
@@ -20,10 +20,6 @@
 
 include $(top_srcdir)/build-aux/common.mk
 
-## Run cruft dir with stand-alone Makefile.
-## Eventually this will use module.mk syntax.
-SUBDIRS = cruft
-
 ## Search local directories before those specified by the user.
 AM_CPPFLAGS = \
   -I$(srcdir)/array \
@@ -55,6 +51,7 @@
 
 octinclude_HEADERS = \
   $(ARRAY_INC) \
+  $(CRUFT_INC) \
   $(NUMERIC_INC) \
   $(OPERATORS_INC) \
   $(SYSTEM_INC) \
@@ -75,7 +72,10 @@
 
 ## A list of all files that could include tests
 
+liboctave_la_LIBADD =
+
 include array/module.mk
+include cruft/module.mk
 include numeric/module.mk
 include operators/module.mk
 include system/module.mk
@@ -92,14 +92,7 @@
 # Dummy C++ source to force C++ linking.
 nodist_EXTRA_liboctave_la_SOURCES = dummy.cc
 
-liboctave_la_LIBADD = \
-  array/libarray.la \
-  cruft/libcruft.la \
-  cruft/ranlib/libranlib.la \
-  numeric/libnumeric.la \
-  operators/liboperators.la \
-  system/libsystem.la \
-  util/libutil.la \
+liboctave_la_LIBADD += \
   $(top_builddir)/libgnu/libgnu.la \
   $(LIBOCTAVE_LINK_DEPS)