diff options
| author | dos-reis <gdr@axiomatics.org> | 2013-06-29 22:57:40 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2013-06-29 22:57:40 +0000 |
| commit | 230645f46d4f50c12585f59e07421cf4ace28247 (patch) | |
| tree | 5e0d8016a4d0f5d32a3f64c6bb923246443494f1 | |
| parent | 36c7fbf6caaafa553c0c151f4a14fdfe3175c2c6 (diff) | |
| download | open-axiom-230645f46d4f50c12585f59e07421cf4ace28247.tar.gz | |
Fix algebra build order an dependency
| -rw-r--r-- | src/algebra/Makefile.am | 12 | ||||
| -rw-r--r-- | src/algebra/Makefile.in | 12 |
2 files changed, 10 insertions, 14 deletions
diff --git a/src/algebra/Makefile.am b/src/algebra/Makefile.am index 16ca2a68..7c374b49 100644 --- a/src/algebra/Makefile.am +++ b/src/algebra/Makefile.am @@ -1967,7 +1967,7 @@ $(OUT)/PFR.$(FASLEXT): $(OUT)/FR.$(FASLEXT) oa_algebra_layer_10 = \ BPADIC ANY LWORD FR \ SEXOF CRAPACK DEQUEUE DLIST \ - FLASORT \ + FLASORT PATRES \ FLAGG2 FGROUP FM FM1 \ FPC FPC- FMONOID INDE \ IPADIC IROOT IR2 \ @@ -2018,7 +2018,7 @@ oa_algebra_layer_11 = \ TS TUPLE UPSCAT UPSCAT- \ XDPOLY XEXPPKG \ XF XF- XPOLY \ - XRPOLY FFIELDC FFIELDC- MTSCAT + XRPOLY oa_algebra_layer_11_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_11)) @@ -2188,7 +2188,7 @@ $(OUT)/PSETCAT.$(FASLEXT): $(OUT)/RPOLCAT.$(FASLEXT) oa_algebra_layer_18 = \ IPF CATCTOR DOMCTOR CTORCALL \ - KAFILE PATRES TBCMPPK PSETCAT PSETCAT- \ + KAFILE TBCMPPK PSETCAT PSETCAT- \ RPOLCAT RPOLCAT- oa_algebra_layer_18_nrlibs = \ @@ -2266,8 +2266,7 @@ oa_algebra_layer_20 = \ RDEEF RDEEFS RDIV RSETCAT \ RSETCAT- RULE RULESET SIMPAN \ SOLVESER SUMFS SUTS \ - TOOLSIGN TRIGMNIP TRMANIP ULSCCAT \ - ULSCCAT- UPXSSING UTSODE UTSODETL \ + TOOLSIGN TRIGMNIP TRMANIP UPXSSING UTSODE UTSODETL \ UTS2 WUTSET oa_algebra_layer_20_nrlibs = \ @@ -2288,8 +2287,7 @@ oa_algebra_layer_21 = \ GSERIES HELLFDIV INVLAPLA IR2F \ IRRF2F LAPLACE LIMITPS LODEEF \ NODE1 ODECONST ODEINT REP \ - SOLVERAD SULS SUPXS \ - UPXSCONS + SOLVERAD SULS SUPXS oa_algebra_layer_21_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_21)) diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index 6278d710..7fadb2fe 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -916,7 +916,7 @@ oa_algebra_layer_9_objects = \ oa_algebra_layer_10 = \ BPADIC ANY LWORD FR \ SEXOF CRAPACK DEQUEUE DLIST \ - FLASORT \ + FLASORT PATRES \ FLAGG2 FGROUP FM FM1 \ FPC FPC- FMONOID INDE \ IPADIC IROOT IR2 \ @@ -962,7 +962,7 @@ oa_algebra_layer_11 = \ TS TUPLE UPSCAT UPSCAT- \ XDPOLY XEXPPKG \ XF XF- XPOLY \ - XRPOLY FFIELDC FFIELDC- MTSCAT + XRPOLY oa_algebra_layer_11_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_11)) @@ -1111,7 +1111,7 @@ oa_algebra_layer_17_objects = \ oa_algebra_layer_18 = \ IPF CATCTOR DOMCTOR CTORCALL \ - KAFILE PATRES TBCMPPK PSETCAT PSETCAT- \ + KAFILE TBCMPPK PSETCAT PSETCAT- \ RPOLCAT RPOLCAT- oa_algebra_layer_18_nrlibs = \ @@ -1182,8 +1182,7 @@ oa_algebra_layer_20 = \ RDEEF RDEEFS RDIV RSETCAT \ RSETCAT- RULE RULESET SIMPAN \ SOLVESER SUMFS SUTS \ - TOOLSIGN TRIGMNIP TRMANIP ULSCCAT \ - ULSCCAT- UPXSSING UTSODE UTSODETL \ + TOOLSIGN TRIGMNIP TRMANIP UPXSSING UTSODE UTSODETL \ UTS2 WUTSET oa_algebra_layer_20_nrlibs = \ @@ -1200,8 +1199,7 @@ oa_algebra_layer_21 = \ GSERIES HELLFDIV INVLAPLA IR2F \ IRRF2F LAPLACE LIMITPS LODEEF \ NODE1 ODECONST ODEINT REP \ - SOLVERAD SULS SUPXS \ - UPXSCONS + SOLVERAD SULS SUPXS oa_algebra_layer_21_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(oa_algebra_layer_21)) |