* algebra/syntax.spad.pamphlet (AbstractSyntaxCategory): New.

	(HeadAst): Likewise.

1 files changed, 14 insertions, 15 deletions

diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index 93dd4d36..f230c252 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -819,7 +819,8 @@ axiom_algebra_layer_23_nrlibs = \
 axiom_algebra_layer_23_objects = \
 	$(addprefix $(OUT)/, \
 	   $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_23)))
-axiom_algebra_layer_user =  RINTERP
+axiom_algebra_layer_user =  \
+	RINTERP	ASTCAT  HEADAST
 
 axiom_algebra_layer_user_nrlibs = \
 	$(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_user))
@@ -828,13 +829,15 @@ axiom_algebra_layer_user_objects = \
 	$(addprefix $(OUT)/, \
 	   $(addsuffix .$(FASLEXT),$(axiom_algebra_layer_user)))
 
+HEADAST.NRLIB/code.$(FASLEXT): $(OUT)/ASTCAT.$(FASLEXT)
+
 .PHONY: all all-algebra mkdir-output-directory
 all: all-ax
 
 all-ax all-algebra: stamp
 	@ echo finished $(builddir)
 
-stamp: mkdir-output-directory ${SPADFILES} bootstrap-stamp ${TESTS}
+stamp: mkdir-output-directory ${SPADFILES} user-stamp ${TESTS}
 	-rm -f stamp
 	$(STAMP) stamp
 
@@ -946,8 +949,8 @@ $(axiom_algebra_layer_20_objects): 19-stamp
 $(axiom_algebra_layer_21_objects): 20-stamp
 $(axiom_algebra_layer_22_objects): 21-stamp
 $(axiom_algebra_layer_23_objects): 22-stamp
-$(axiom_algebra_layer_user_objects): 23-stamp
-$(axiom_algebra_bootstrap_objects): user-stamp
+$(axiom_algebra_bootstrap_objects): 23-stamp
+$(axiom_algebra_layer_user_objects): bootstrap-stamp
 
 strap-stamp: $(axiom_algebra_layer_strap_objects)
 	@ rm -f strap-stamp
@@ -1124,23 +1127,19 @@ strap-stamp: $(axiom_algebra_layer_strap_objects)
 	@ echo === layer 23 of 23 complete ======
 	@ echo ==================================
 
-user-stamp: 23-stamp $(axiom_algebra_layer_user_objects)
-	@ rm -f user-stamp
-	@ $(STAMP) user-stamp
-
-
-# bootstrap-pre: user-stamp $(axiom_algebra_bootstrap_nrlibs)
-# $(axiom_algebra_bootstrap_nrlibs): user-stamp
-
-# bootstrap-post: bootstrap-pre $(axiom_algebra_bootstrap_objects)
-
-bootstrap-stamp: $(axiom_algebra_bootstrap_objects)
+bootstrap-stamp: 23-stamp $(axiom_algebra_bootstrap_objects)
 	@ rm -f bootstrap-stamp
 	@ $(STAMP) bootstrap-stamp
 	@ echo ==================================
 	@ echo ===    algebra complete     ======
 	@ echo ==================================
 
+user-stamp: bootstrap-stamp $(axiom_algebra_layer_user_objects)
+	@ rm -f user-stamp
+	@ $(STAMP) user-stamp
+
+
+
 mostlyclean-local:
 	@rm -f $(OUT)/*.$(FASLEXT) $(OUT)/*.daase
 	@rm -rf *.NRLIB