changeset 3646:e85efffe12a5

[project @ 2000-03-25 07:18:55 by jwe]
author jwe
date Sat, 25 Mar 2000 07:18:56 +0000
parents 71b4ccd27162
children 4cdb8c0ef5f0
files ChangeLog octMakefile.in
diffstat 2 files changed, 15 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Mar 24 20:01:34 2000 +0000
+++ b/ChangeLog	Sat Mar 25 07:18:56 2000 +0000
@@ -1,3 +1,10 @@
+2000-03-25  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* octMakefile.in (SUBDIRS): Omit src.
+	(ALL_SUBDIRS): New variable.  Include src here.
+	(all): Depend on src instead of $(SUBDIRS).
+	(src): New target.  Depend on $(SUBDIRS).
+
 2000-03-22  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* configure.in: Check for vsnprintf.
--- a/octMakefile.in	Fri Mar 24 20:01:34 2000 +0000
+++ b/octMakefile.in	Sat Mar 25 07:18:56 2000 +0000
@@ -35,8 +35,9 @@
 
 # Subdirectories in which to run `make all'.
 SUBDIRS = @PLPLOT_DIR@ @READLINE_DIR@ @DLFCN_DIR@ @GLOB_DIR@ \
-	kpathsea libcruft liboctave src scripts doc examples
+	kpathsea libcruft liboctave scripts doc examples
 
+ALL_SUBDIRS = $(SUBDIRS) src
 
 # Subdirectories in which to run `make all'.
 INSTALL_SUBDIRS = libcruft liboctave src scripts doc examples
@@ -67,9 +68,14 @@
   `echo $(localfcnfilepath) | awk -F: '{for (i=1; i<=NF; i++) print $i}'` \
   `echo $(localoctfilepath) | awk -F: '{for (i=1; i<=NF; i++) print $i}'`
 
-all: octave-bug mkoctfile $(SUBDIRS)
+all: octave-bug mkoctfile src
 .PHONY: all
 
+src: $(SUBDIRS)
+	echo making all in $@
+	$(MAKE) -C $@ all
+.PHONY: src
+
 octave-bug: octave-bug.in Makeconf octMakefile
 	@$(do-subst-config-vals)
 	chmod a+rx $@