Fix breakage from last commits.

1 files changed, 75 insertions, 69 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 87755212..e25ca169 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,69 +1,75 @@
-

-pamphlets = Makefile.pamphlet

-

-subdir = src/

-

-SUBDIRS = @axiom_src_subdirs@

-

-.PHONY: all all-ax all-src all-clef all-sman all-driver

-

-all: all-ax

-

-all-ax all-src: stamp

-	@echo finished $(builddir)

-

-stamp: @axiom_src_all@ all-driver

-	-rm -f stamp

-	$(STAMP) stamp

-

-all-driver:

-	@cd driver && $(MAKE) $@

-

-all-clef: all-lib

-	@$(mkinstalldirs) $(axiom_target_bindir)

-	cd clef && ${MAKE}

-all-sman: all-lib all-driver

-	$(mkinstalldirs) $(axiom_target_bindir)

-	$(mkinstalldirs) $(axiom_target_libdir)

-	cd sman && ${MAKE}

-all-hyper: all-lib

-	$(mkinstalldirs) $(axiom_target_bindir)

-	$(mkinstalldirs) $(axiom_target_datadir)

-	cd hyper && ${MAKE}

-all-share:

-	$(mkinstalldirs) $(axiom_target_libdir)

-	cd share && ${MAKE}

-all-doc:

-	cd doc && ${MAKE}

-all-lib:

-	@cd lib && $(MAKE) $@

-all-lisp: all-lib

-	cd lisp && $(MAKE) all-lisp

-all-boot: all-lisp

-	@cd boot && $(MAKE) $@

-all-interpsys: all-boot all-hyper

-	cd interp && ${MAKE} all-interpsys

-

-all-axiomsys: all-asq

-	cd interp && $(MAKE) all-axiomsys

-all-algebra: all-interpsys all-share

-	@ $(mkinstalldirs) algebra/strap

-	cd algebra && ${MAKE}

-all-input: all-axiomsys

-	cd input && ${MAKE}

-all-asq: all-algebra

-	cd etc && ${MAKE}

-all-graph: all-lib

-	cd graph && ${MAKE}

-

-.PHONY: all-check

-all-check:

-	cd input && $(MAKE) all-check

-

-mostlyclean-local:

-	-rm -f stamp

-

-clean-local: mostlyclean-local

-

-distclean-local: clean-local

-

+
+pamphlets = Makefile.pamphlet
+
+subdir = src/
+
+SUBDIRS = @axiom_src_subdirs@
+
+.PHONY: all all-ax all-src all-clef all-sman all-driver
+
+all: all-ax
+
+all-ax all-src: stamp
+	@echo finished $(builddir)
+
+stamp: @axiom_src_all@ all-driver
+	-rm -f stamp
+	$(STAMP) stamp
+
+all-driver:
+	@cd driver && $(MAKE) $@
+
+all-clef: all-lib
+	@$(mkinstalldirs) $(axiom_target_bindir)
+	cd clef && ${MAKE}
+all-sman: all-lib all-driver
+	$(mkinstalldirs) $(axiom_target_bindir)
+	$(mkinstalldirs) $(axiom_target_libdir)
+	cd sman && ${MAKE}
+all-hyper: all-lib
+	$(mkinstalldirs) $(axiom_target_bindir)
+	$(mkinstalldirs) $(axiom_target_datadir)
+	cd hyper && ${MAKE}
+all-share:
+	$(mkinstalldirs) $(axiom_target_libdir)
+	cd share && ${MAKE}
+all-doc:
+	cd doc && ${MAKE}
+all-lib:
+	@cd lib && $(MAKE) $@
+all-lisp: all-lib
+	cd lisp && $(MAKE) all-lisp
+all-boot: all-lisp
+	@cd boot && $(MAKE) $@
+all-interpsys: all-boot all-hyper-pre
+	cd interp && ${MAKE} all-interpsys
+
+all-axiomsys: all-asq
+	cd interp && $(MAKE) all-axiomsys
+all-algebra: all-interpsys all-share all-hyper-pre
+	@ $(mkinstalldirs) algebra/strap
+	cd algebra && ${MAKE}
+
+all-hyper-pre: all-lib
+	cd hyper && $(MAKE) all-hyper-pre
+all-input: all-axiomsys
+	cd input && ${MAKE}
+all-asq: all-hyper-post
+	cd etc && ${MAKE}
+
+all-hyper-post: all-algebra
+	cd hyper && $(MAKE) all-hyper-post
+all-graph: all-lib
+	cd graph && ${MAKE}
+
+.PHONY: all-check
+all-check:
+	cd input && $(MAKE) all-check
+
+mostlyclean-local:
+	-rm -f stamp
+
+clean-local: mostlyclean-local
+
+distclean-local: clean-local
+