--- a/octMakefile.in	Thu Mar 02 03:40:01 2006 +0000
+++ b/octMakefile.in	Thu Mar 02 06:09:17 2006 +0000
@@ -36,9 +36,7 @@
 
 # Subdirectories in which to run `make all'.
 SUBDIRS = @PLPLOT_DIR@ @DLFCN_DIR@ \
-	libcruft liboctave scripts doc examples
-
-ALL_SUBDIRS = $(SUBDIRS) src
+	libcruft liboctave src scripts doc examples
 
 # Subdirectories in which to run `make all'.
 INSTALL_SUBDIRS = libcruft liboctave src scripts doc examples
@@ -47,7 +45,7 @@
 CONF_DISTSUBDIRS = src
 
 # Subdirectories in which to run `make dist'.
-DISTSUBDIRS_1 = $(sort $(ALL_SUBDIRS) dlfcn test emacs)
+DISTSUBDIRS_1 = $(sort $(SUBDIRS) dlfcn test emacs)
 DISTSUBDIRS = $(filter-out $(DISTDIRS), $(DISTSUBDIRS_1))
 
 # Subdirectories in which to run clean targets.
@@ -58,12 +56,18 @@
   $(shell echo $(localfcnfilepath) | awk -F: '{for (i=1; i<=NF; i++) print $$i}') \
   $(shell echo $(localoctfilepath) | awk -F: '{for (i=1; i<=NF; i++) print $$i}')
 
-all: octave-bug octave-config mkoctfile src
+SHELL_SCRIPTS = octave-bug octave-config mkoctfile
+
+all: $(SHELL_SCRIPTS) $(filter-out libcruft liboctave, $(SUBDIRS))
 .PHONY: all
 
-src: $(SUBDIRS)
+src: liboctave
+
+liboctave: libcruft
+
+$(SUBDIRS):
 	$(MAKE) -C $@ all
-.PHONY: src
+.PHONY: $(SUBDIRS)
 
 octave-bug: octave-bug.in Makeconf octMakefile
 	@$(do-subst-config-vals)
@@ -77,10 +81,6 @@
 	@$(do-subst-config-vals)
 	chmod a+rx $@
 
-$(SUBDIRS):
-	$(MAKE) -C $@ all
-.PHONY: $(SUBDIRS)
-
 check:
 	$(MAKE) -C test check
 .PHONY: check