diff Makefile.am @ 20328:fa9fa6ab76f0

eliminate recursive make invocation in scripts directory tree * scripts/module.mk: New file created from scripts/Makefile.am * scripts/Makefile.am: Delete. * Makefile.am (SUBDIRS): Remove scripts from the list. * configure.ac (AC_CONFIG_FILES): Remove scripts/Makefile from the list. * doc/interpreter/images.awk, doc/module.mk, etc/module.mk, scripts/@ftp/module.mk, scripts/audio/module.mk, scripts/deprecated/module.mk, scripts/elfun/module.mk, scripts/general/module.mk, scripts/geometry/module.mk, scripts/gui/module.mk, scripts/help/module.mk, scripts/image/module.mk, scripts/io/module.mk, scripts/java/module.mk, scripts/linear-algebra/module.mk, scripts/miscellaneous/module.mk, scripts/optimization/module.mk, scripts/path/module.mk, scripts/pkg/module.mk, scripts/plot/appearance/module.mk, scripts/plot/draw/module.mk, scripts/plot/util/module.mk, scripts/polynomial/module.mk, scripts/prefs/module.mk, scripts/set/module.mk, scripts/signal/module.mk, scripts/sparse/module.mk, scripts/specfun/module.mk, scripts/special-matrix/module.mk, scripts/startup/module.mk, scripts/statistics/base/module.mk, scripts/statistics/distributions/module.mk, scripts/statistics/models/module.mk, scripts/statistics/tests/module.mk, scripts/strings/module.mk, scripts/testfun/module.mk, scripts/time/module.mk: Update for non-recursive build.
author John W. Eaton <jwe@octave.org>
date Fri, 10 Jul 2015 14:40:47 -0400
parents 0ce7d8303152
children 0e2da885a410
line wrap: on
line diff
--- a/Makefile.am	Fri Jul 10 13:28:33 2015 -0400
+++ b/Makefile.am	Fri Jul 10 14:40:47 2015 -0400
@@ -20,6 +20,7 @@
 
 include build-aux/common.mk
 
+image_DATA =
 octdata_DATA =
 octetc_DATA =
 octlocale_DATA =
@@ -65,11 +66,19 @@
 BUILT_SOURCES =
 TEST_FILES =
 
-IMAGES_SRC =
-IMAGES_EPS =
-IMAGES_PDF =
-IMAGES_PNG =
-IMAGES_TXT =
+DOC_IMAGES =
+DOC_IMAGES_SRC =
+DOC_IMAGES_EPS =
+DOC_IMAGES_PDF =
+DOC_IMAGES_PNG =
+DOC_IMAGES_TXT =
+
+FCN_FILE_DIRS =
+FCN_FILES =
+GEN_FCN_FILES =
+PKG_ADD_FILES =
+SCRIPTS_IMAGES =
+JAR_FILES =
 
 bin_PROGRAMS =
 archlib_PROGRAMS =
@@ -95,6 +104,7 @@
 include libgui/module.mk
 include libgui/link-deps.mk
 include src/module.mk
+include scripts/module.mk
 include doc/module.mk
 include doc/interpreter/images.mk
 include etc/module.mk
@@ -106,9 +116,9 @@
 # directories are handled directly from this Makefile (see also the
 # included makefile fragments).
 
-SUBDIRS = libgnu scripts
+SUBDIRS = libgnu
 
-dist-hook: doc-interpreter-dist-hook docs-dist-hook icons-dist-hook
+dist-hook: doc-interpreter-dist-hook docs-dist-hook icons-dist-hook scripts-dist-hook
 
 if AMCOND_BUILD_DOCS
 docs-dist-hook:
@@ -218,3 +228,5 @@
 	$(MKDIR_P) $(addprefix $(DESTDIR), $(DIRS_TO_MAKE))
 
 install-data-local: installdirs-local
+
+distclean-local: scripts-distclean