aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2008-08-28 07:28:41 +0000
committerdos-reis <gdr@axiomatics.org>2008-08-28 07:28:41 +0000
commitd2f12c5b1328c1165dff3e559c1620b5863ea50d (patch)
tree02d1c9d722e2e8a94fb502dec655f6743b774ea1 /src
parent84610779b4249b0ce556e1326459ed02f02de68a (diff)
downloadopen-axiom-d2f12c5b1328c1165dff3e559c1620b5863ea50d.tar.gz
* Makefile.pamphlet: Tidy.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/Makefile.in16
-rw-r--r--src/Makefile.pamphlet16
-rw-r--r--src/algebra/Makefile.in2
-rw-r--r--src/algebra/Makefile.pamphlet2
5 files changed, 22 insertions, 18 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2485b661..04241cfd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-28 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * Makefile.pamphlet: Tidy.
+
2008-08-24 Gabriel Dos Reis <gdr@cs.tamu.edu>
* etc/Makefile.in: Tidy databases construction rule.
diff --git a/src/Makefile.in b/src/Makefile.in
index eedc235e..6d80aa79 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -21,20 +21,20 @@ all-driver:
all-clef: all-lib
@$(mkdir_p) "$(axiom_target_bindir)"
- cd clef && ${MAKE}
+ cd clef && $(MAKE) $@
all-sman: all-lib all-driver
$(mkdir_p) "$(axiom_target_bindir)"
$(mkdir_p) "$(axiom_target_libdir)"
- cd sman && ${MAKE}
+ cd sman && $(MAKE) $@
all-hyper: all-lib
$(mkdir_p) "$(axiom_target_bindir)"
$(mkdir_p) "$(axiom_target_datadir)"
- cd hyper && ${MAKE}
+ cd hyper && $(MAKE) $@
all-share:
$(mkdir_p) "$(axiom_target_libdir)"
- cd share && ${MAKE}
+ cd share && $(MAKE) $@
all-doc:
- cd doc && ${MAKE}
+ cd doc && $(MAKE) $@
all-lib:
@cd lib && $(MAKE) $@
all-lisp: all-lib
@@ -48,19 +48,19 @@ all-axiomsys: all-asq
cd interp && $(MAKE) all-axiomsys
all-algebra: all-interpsys all-share all-hyper-pre
@ $(mkdir_p) algebra/strap
- cd algebra && ${MAKE}
+ 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}
+ cd etc && $(MAKE) $@
all-hyper-post: all-algebra
cd hyper && $(MAKE) all-hyper-post
all-graph: all-lib
- cd graph && ${MAKE}
+ cd graph && $(MAKE) $@
.PHONY: all-check
all-check:
diff --git a/src/Makefile.pamphlet b/src/Makefile.pamphlet
index f7a0d007..261fea0b 100644
--- a/src/Makefile.pamphlet
+++ b/src/Makefile.pamphlet
@@ -57,7 +57,7 @@ to GNU Readline.
<<clefdir>>=
all-clef: all-lib
@$(mkdir_p) "$(axiom_target_bindir)"
- cd clef && ${MAKE}
+ cd clef && $(MAKE) $@
@
\subsection{The \File{sman/} directory}
@@ -68,7 +68,7 @@ processes including \Tool{axiom}, \Tool{clef}, nagman, graphics, and hyperdoc
all-sman: all-lib all-driver
$(mkdir_p) "$(axiom_target_bindir)"
$(mkdir_p) "$(axiom_target_libdir)"
- cd sman && ${MAKE}
+ cd sman && $(MAKE) $@
@
\subsection{The \File{hyper/} directory}
@@ -78,7 +78,7 @@ Hyperdoc is the Axiom document browser.
all-hyper: all-lib
$(mkdir_p) "$(axiom_target_bindir)"
$(mkdir_p) "$(axiom_target_datadir)"
- cd hyper && ${MAKE}
+ cd hyper && $(MAKE) $@
@
\subsection{The \File{share/} directory}
@@ -89,7 +89,7 @@ system.
<<sharedir>>=
all-share:
$(mkdir_p) "$(axiom_target_libdir)"
- cd share && ${MAKE}
+ cd share && $(MAKE) $@
@
\subsection{The \File{lib/} directory}
@@ -176,7 +176,7 @@ the normal Makefile information.
<<algebradir>>=
all-algebra: all-interpsys all-share all-hyper-pre
@ $(mkdir_p) algebra/strap
- cd algebra && ${MAKE}
+ cd algebra && $(MAKE) $@
all-hyper-pre: all-lib
cd hyper && $(MAKE) all-hyper-pre
@@ -212,7 +212,7 @@ for finding detailed information about domains, packages, and
categories from the shell without running Axiom.
<<etcdir>>=
all-asq: all-hyper-post
- cd etc && ${MAKE}
+ cd etc && $(MAKE) $@
all-hyper-post: all-algebra
cd hyper && $(MAKE) all-hyper-post
@@ -223,14 +223,14 @@ The \File{doc/} directory contains code used for documenting Axiom.
<<docdir>>=
all-doc:
- cd doc && ${MAKE}
+ cd doc && $(MAKE) $@
@
\subsection{The \File{graph/} directory}
<<graphdir>>=
all-graph: all-lib
- cd graph && ${MAKE}
+ cd graph && $(MAKE) $@
@
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index e9fdae1c..df2fa13f 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -852,7 +852,7 @@ check:
${OUT}/%.$(FASLEXT): %.NRLIB/code.$(FASLEXT)
- cp $*.NRLIB/code.$(FASLEXT) ${OUT}/$*.$(FASLEXT)
+ cp $< $@
.PRECIOUS: %.NRLIB/code.$(FASLEXT)
diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet
index 3be6b201..b5236fdb 100644
--- a/src/algebra/Makefile.pamphlet
+++ b/src/algebra/Makefile.pamphlet
@@ -1784,7 +1784,7 @@ deriving the dependencies by scanning the ``Loading ...'' messages.
<<genericDotOfiles>>=
${OUT}/%.$(FASLEXT): %.NRLIB/code.$(FASLEXT)
- cp $*.NRLIB/code.$(FASLEXT) ${OUT}/$*.$(FASLEXT)
+ cp $< $@
@