diff options
-rw-r--r-- | src/algebra/Makefile.am | 25 | ||||
-rw-r--r-- | src/algebra/Makefile.in | 25 |
2 files changed, 20 insertions, 30 deletions
diff --git a/src/algebra/Makefile.am b/src/algebra/Makefile.am index f3ca4da6..536cbed8 100644 --- a/src/algebra/Makefile.am +++ b/src/algebra/Makefile.am @@ -128,6 +128,7 @@ SUFFIXES = .spad .$(FASLEXT) $(EXEEXT) .input .pamphlet .tex .dvi # They are needed only for their being known as constructors. # Consequently, the dependencies listed here are at the categories # inheritance level; not necessarily at the use level. +strap-0/TYPE.$(FASLEXT): initdb.$(FASLEXT) strap-0/UTYPE.$(FASLEXT): strap-0/TYPE.$(FASLEXT) strap-0/FUNCTOR.$(FASLEXT): strap-0/TYPE.$(FASLEXT) strap-0/BASTYPE.$(FASLEXT): strap-0/TYPE.$(FASLEXT) @@ -388,7 +389,7 @@ strap-1/PID.$(FASLEXT): strap-1/GCDDOM.$(FASLEXT) \ strap-0/MAYBE.$(FASLEXT) strap-1/EUCDOM.$(FASLEXT): strap-1/PID.$(FASLEXT) \ - strap-0/BOOLEAN.$(FASLEXT) + strap-0/BOOLEAN.$(FASLEXT) strap-0/LSAGG.$(FASLEXT) strap-1/UFD.$(FASLEXT): strap-1/GCDDOM.$(FASLEXT) \ strap-1/BOOLEAN.$(FASLEXT) strap-0/FR.$(FASLEXT) @@ -809,7 +810,7 @@ strap-2/OINTDOM.$(FASLEXT): strap-2/INTDOM.$(FASLEXT) \ strap-2/ALGEBRA.$(FASLEXT): strap-2/RING.$(FASLEXT) \ strap-2/MODULE.$(FASLEXT) strap-2/KOERCE.$(FASLEXT) strap-2/EUCDOM.$(FASLEXT): strap-2/PID.$(FASLEXT) \ - strap-2/BOOLEAN.$(FASLEXT) + strap-2/BOOLEAN.$(FASLEXT) strap-1/LSAGG.$(FASLEXT) strap-2/PID.$(FASLEXT): strap-2/GCDDOM.$(FASLEXT) \ strap-2/MAYBE.$(FASLEXT) strap-2/OINTDOM.$(FASLEXT): strap-2/INTDOM.$(FASLEXT) \ @@ -1005,7 +1006,7 @@ strap-0 strap-1 strap-2: $(MKDIR_P) $@ .PRECIOUS: strap-0/%.$(FASLEXT) -strap-0/%.$(FASLEXT): %.spad | strap-0 +strap-0/%.$(FASLEXT): %.spad initdb.$(FASLEXT) | strap-0 $(BOOTSTRAP) --sysalg=strap-0 --bootstrap $< \ && cp $*.NRLIB/code.$(FASLEXT) $@ && \ if test x@oa_keep_files@ = xyes; then \ @@ -1013,7 +1014,7 @@ strap-0/%.$(FASLEXT): %.spad | strap-0 rm -rf $*.NRLIB .PRECIOUS: strap-1/%.$(FASLEXT) -strap-1/%.$(FASLEXT): %.spad | strap-1 +strap-1/%.$(FASLEXT): %.spad initdb.$(FASLEXT) | strap-1 $(BOOTSTRAP) --strap=strap-0 --sysalg=strap-1 --optimize=3 $< && \ cp $*.NRLIB/code.$(FASLEXT) $@ && \ if test -d $*-.NRLIB; then cp $*-.NRLIB/code.$(FASLEXT) \ @@ -1166,17 +1167,12 @@ TESTS=$(INPUT)/INTHEORY.input $(INPUT)/VIEW2D.input $(INPUT)/TESTFR.input # The root of the category hierarchy is the Type category. # We require the basic integer domains are available at stage 2 of -# bootstrap. This has the property of setting in motion -# the built of several other domains and categories as needed +# bootstrap. This sets in motion +# the buils of several other domains and categories as needed # to ignite the algebra build. We require Category only because # we would like not to have too many special cases for it. -strap-stamp: strap-2/CATEGORY.$(FASLEXT) \ - strap-2/SINT.$(FASLEXT) strap-2/NNI.$(FASLEXT) \ - strap-2/PI.$(FASLEXT) - -rm -f $@ - $(STAMP) $@ - -$(OUT)/TYPE.$(FASLEXT): strap-stamp +$(oa_algebra_layer_0_objects): strap-2/SINT.$(FASLEXT) \ + strap-2/NNI.$(FASLEXT) strap-2/PI.$(FASLEXT) $(OUT)/SINT.$(FASLEXT): $(OUT)/INT.$(FASLEXT) $(OUT)/NNI.$(FASLEXT): $(OUT)/INT.$(FASLEXT) @@ -2080,7 +2076,7 @@ $(OUT)/%.$(FASLEXT): %.NRLIB/code.$(FASLEXT) .PRECIOUS: %.spad .PRECIOUS: %.NRLIB/code.$(FASLEXT) -%.NRLIB/code.$(FASLEXT): %.spad +%.NRLIB/code.$(FASLEXT): %.spad initdb.$(FASLEXT) $(COMPILE_SPAD) $(SPADFILES): | $(OUTSRC) @@ -2132,7 +2128,6 @@ $(INPUT)/VIEW2D.input: $(srcdir)/view2D.spad.pamphlet $(DOC)/diagrams.tex: $(oa_src_docdir)/diagrams.tex @cp -p $< $@ -$(oa_algebra_layer_0_objects): strap-stamp $(oa_algebra_layer_1_objects): 0-stamp $(oa_algebra_layer_2_objects): 1-stamp $(oa_algebra_layer_3_objects): 2-stamp diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index 14d5079c..38fd9e53 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -1634,6 +1634,7 @@ uninstall-am: # They are needed only for their being known as constructors. # Consequently, the dependencies listed here are at the categories # inheritance level; not necessarily at the use level. +strap-0/TYPE.$(FASLEXT): initdb.$(FASLEXT) strap-0/UTYPE.$(FASLEXT): strap-0/TYPE.$(FASLEXT) strap-0/FUNCTOR.$(FASLEXT): strap-0/TYPE.$(FASLEXT) strap-0/BASTYPE.$(FASLEXT): strap-0/TYPE.$(FASLEXT) @@ -1894,7 +1895,7 @@ strap-1/PID.$(FASLEXT): strap-1/GCDDOM.$(FASLEXT) \ strap-0/MAYBE.$(FASLEXT) strap-1/EUCDOM.$(FASLEXT): strap-1/PID.$(FASLEXT) \ - strap-0/BOOLEAN.$(FASLEXT) + strap-0/BOOLEAN.$(FASLEXT) strap-0/LSAGG.$(FASLEXT) strap-1/UFD.$(FASLEXT): strap-1/GCDDOM.$(FASLEXT) \ strap-1/BOOLEAN.$(FASLEXT) strap-0/FR.$(FASLEXT) @@ -2315,7 +2316,7 @@ strap-2/OINTDOM.$(FASLEXT): strap-2/INTDOM.$(FASLEXT) \ strap-2/ALGEBRA.$(FASLEXT): strap-2/RING.$(FASLEXT) \ strap-2/MODULE.$(FASLEXT) strap-2/KOERCE.$(FASLEXT) strap-2/EUCDOM.$(FASLEXT): strap-2/PID.$(FASLEXT) \ - strap-2/BOOLEAN.$(FASLEXT) + strap-2/BOOLEAN.$(FASLEXT) strap-1/LSAGG.$(FASLEXT) strap-2/PID.$(FASLEXT): strap-2/GCDDOM.$(FASLEXT) \ strap-2/MAYBE.$(FASLEXT) strap-2/OINTDOM.$(FASLEXT): strap-2/INTDOM.$(FASLEXT) \ @@ -2510,7 +2511,7 @@ strap-0 strap-1 strap-2: $(MKDIR_P) $@ .PRECIOUS: strap-0/%.$(FASLEXT) -strap-0/%.$(FASLEXT): %.spad | strap-0 +strap-0/%.$(FASLEXT): %.spad initdb.$(FASLEXT) | strap-0 $(BOOTSTRAP) --sysalg=strap-0 --bootstrap $< \ && cp $*.NRLIB/code.$(FASLEXT) $@ && \ if test x@oa_keep_files@ = xyes; then \ @@ -2518,7 +2519,7 @@ strap-0/%.$(FASLEXT): %.spad | strap-0 rm -rf $*.NRLIB .PRECIOUS: strap-1/%.$(FASLEXT) -strap-1/%.$(FASLEXT): %.spad | strap-1 +strap-1/%.$(FASLEXT): %.spad initdb.$(FASLEXT) | strap-1 $(BOOTSTRAP) --strap=strap-0 --sysalg=strap-1 --optimize=3 $< && \ cp $*.NRLIB/code.$(FASLEXT) $@ && \ if test -d $*-.NRLIB; then cp $*-.NRLIB/code.$(FASLEXT) \ @@ -2539,17 +2540,12 @@ strap-2/%.$(FASLEXT): %.spad initdb.$(FASLEXT) | strap-2 # The root of the category hierarchy is the Type category. # We require the basic integer domains are available at stage 2 of -# bootstrap. This has the property of setting in motion -# the built of several other domains and categories as needed +# bootstrap. This sets in motion +# the buils of several other domains and categories as needed # to ignite the algebra build. We require Category only because # we would like not to have too many special cases for it. -strap-stamp: strap-2/CATEGORY.$(FASLEXT) \ - strap-2/SINT.$(FASLEXT) strap-2/NNI.$(FASLEXT) \ - strap-2/PI.$(FASLEXT) - -rm -f $@ - $(STAMP) $@ - -$(OUT)/TYPE.$(FASLEXT): strap-stamp +$(oa_algebra_layer_0_objects): strap-2/SINT.$(FASLEXT) \ + strap-2/NNI.$(FASLEXT) strap-2/PI.$(FASLEXT) $(OUT)/SINT.$(FASLEXT): $(OUT)/INT.$(FASLEXT) $(OUT)/NNI.$(FASLEXT): $(OUT)/INT.$(FASLEXT) @@ -2931,7 +2927,7 @@ $(OUT)/%.$(FASLEXT): %.NRLIB/code.$(FASLEXT) .PRECIOUS: %.spad .PRECIOUS: %.NRLIB/code.$(FASLEXT) -%.NRLIB/code.$(FASLEXT): %.spad +%.NRLIB/code.$(FASLEXT): %.spad initdb.$(FASLEXT) $(COMPILE_SPAD) $(SPADFILES): | $(OUTSRC) @@ -2981,7 +2977,6 @@ $(INPUT)/VIEW2D.input: $(srcdir)/view2D.spad.pamphlet $(DOC)/diagrams.tex: $(oa_src_docdir)/diagrams.tex @cp -p $< $@ -$(oa_algebra_layer_0_objects): strap-stamp $(oa_algebra_layer_1_objects): 0-stamp $(oa_algebra_layer_2_objects): 1-stamp $(oa_algebra_layer_3_objects): 2-stamp |