diff Makefile.am @ 20327:0ce7d8303152

eliminate recursive make invocations in liboctave and libinterp directories * libinterp/module.mk: New file created from libinterp/Makefile.am. * liboctave/module.mk: New file created from liboctave/Makefile.am. * libinterp/Makefile.am, liboctave/Makefile.am: Delete. * configure.ac (AC_CONFIG_FILES): Remove libinterp/Makefile and liboctave/Makefile from the list. * Makefile.am (SUBDIRS): Remove liboctave and libinterp from the list. (BUILT_DISTFILES, BUILT_NODISTFILES, EXTRA_DIST, DIST_SRC, octinclude_HEADERS, nodist_octinclude_HEADERS): Initialize as empty. Include liboctave/module.mk liboctave/link-deps.mk, libinterp/module.mk, and libinterp/link-deps.mk. * doc/module.mk, libgui/link-deps.mk, libinterp/corefcn/module.mk, libinterp/dldfcn/config-module.awk, libinterp/link-deps.mk, libinterp/mkops, libinterp/octave-value/module.mk, libinterp/operators/module.mk, libinterp/parse-tree/module.mk, libinterp/template-inst/module.mk, liboctave/array/module.mk, 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/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, liboctave/numeric/module.mk, liboctave/operators/mk-ops.awk, liboctave/operators/module.mk, liboctave/operators/sparse-mk-ops.awk, liboctave/system/module.mk, liboctave/util/module.mk: Update for non-recursive build.
author John W. Eaton <jwe@octave.org>
date Fri, 10 Jul 2015 13:28:33 -0400
parents 8ef616eec739
children fa9fa6ab76f0
line wrap: on
line diff
--- a/Makefile.am	Thu Jul 09 13:55:58 2015 -0400
+++ b/Makefile.am	Fri Jul 10 13:28:33 2015 -0400
@@ -26,13 +26,17 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-BUILT_DISTFILES = \
+BUILT_DISTFILES =
+BUILT_NODISTFILES =
+EXTRA_DIST =
+
+BUILT_DISTFILES += \
   AUTHORS \
   BUGS \
   ChangeLog \
   INSTALL.OCTAVE
 
-EXTRA_DIST = \
+EXTRA_DIST += \
   COPYING \
   ChangeLog \
   INSTALL \
@@ -77,8 +81,17 @@
 octlib_LTLIBRARIES =
 noinst_LTLIBRARIES =
 
+octinclude_HEADERS =
+nodist_octinclude_HEADERS =
+
+DIST_SRC =
+
 ALL_LOCAL_TARGETS =
 
+include liboctave/module.mk
+include liboctave/link-deps.mk
+include libinterp/module.mk
+include libinterp/link-deps.mk
 include libgui/module.mk
 include libgui/link-deps.mk
 include src/module.mk
@@ -93,7 +106,7 @@
 # directories are handled directly from this Makefile (see also the
 # included makefile fragments).
 
-SUBDIRS = libgnu liboctave libinterp scripts
+SUBDIRS = libgnu scripts
 
 dist-hook: doc-interpreter-dist-hook docs-dist-hook icons-dist-hook
 
@@ -138,8 +151,8 @@
 
 CONFIG_FILES = @ac_config_headers@ @ac_config_files@
 
-nodist_octinclude_HEADERS = config.h
-octinclude_HEADERS = oct-conf-post.h
+octinclude_HEADERS += oct-conf-post.h
+nodist_octinclude_HEADERS += config.h
 
 all-local: $(ALL_LOCAL_TARGETS) $(noinst_SCRIPTS) $(DIST_INFO_FILES) .gdbinit $(DOC_TARGETS)
 	@echo ""