this is a low hanging fruit toward simplification of the makefiles.
None of the following variables are needed in Makefile.${SYS}.
Tested on an x86_64-suse-linux
-- Gaby
2006-09-12 Gabriel Dos Reis <[EMAIL PROTECTED]>
* Makefile.pamphlet (CC): Remove explicit setting throughout.
This is now present in each makefile -- except toplevel
Makefile.${SYS} but, it is not used there anyway.
Don't pass explicitly in ENV.
(AWK): Likewise.
(TOUCH): Likewise.
(TAR): Likewise.
(RANLIB): Likewise.
(PATCH): Likewise.
*** Makefile.in (revision 15075)
--- Makefile.in (local)
*************** ENV= SPAD=${SPAD} SYS=${SYS} SPD=${SPD}
*** 32,38 ****
SRC=${SRC} INT=${INT} OBJ=${OBJ} MNT=${MNT} ZIPS=${ZIPS} TMP=${TMP} \
SPADBIN=${SPADBIN} INC=${INC} CCLBASE=${CCLBASE} PART=${PART} \
SUBPART=${SUBPART} NOISE=${NOISE} GCLVERSION=${GCLVERSION} \
! TANGLE=${TANGLE} VERSION=${VERSION} PATCH=${PATCH} \
DOCUMENT=${axiom_build_document} DAASE=$(DAASE) \
WEAVE=${WEAVE} AXIOM_X11_CFLAGS="${AXIOM_X11_CFLAGS}" \
AXIOM_X11_LDFLAGS="${AXIOM_X11_LDFLAGS}"
--- 32,38 ----
SRC=${SRC} INT=${INT} OBJ=${OBJ} MNT=${MNT} ZIPS=${ZIPS} TMP=${TMP} \
SPADBIN=${SPADBIN} INC=${INC} CCLBASE=${CCLBASE} PART=${PART} \
SUBPART=${SUBPART} NOISE=${NOISE} GCLVERSION=${GCLVERSION} \
! TANGLE=${TANGLE} VERSION=${VERSION} \
DOCUMENT=${axiom_build_document} DAASE=$(DAASE) \
WEAVE=${WEAVE} AXIOM_X11_CFLAGS="${AXIOM_X11_CFLAGS}" \
AXIOM_X11_LDFLAGS="${AXIOM_X11_LDFLAGS}"
*** Makefile.pamphlet (revision 15075)
--- Makefile.pamphlet (local)
*************** ENV= SPAD=${SPAD} SYS=${SYS} SPD=${SPD}
*** 380,386 ****
SRC=${SRC} INT=${INT} OBJ=${OBJ} MNT=${MNT} ZIPS=${ZIPS} TMP=${TMP} \
SPADBIN=${SPADBIN} INC=${INC} CCLBASE=${CCLBASE} PART=${PART} \
SUBPART=${SUBPART} NOISE=${NOISE} GCLVERSION=${GCLVERSION} \
! TANGLE=${TANGLE} VERSION=${VERSION} PATCH=${PATCH} \
DOCUMENT=${axiom_build_document} DAASE=$(DAASE) \
WEAVE=${WEAVE} AXIOM_X11_CFLAGS="${AXIOM_X11_CFLAGS}" \
AXIOM_X11_LDFLAGS="${AXIOM_X11_LDFLAGS}"
--- 380,386 ----
SRC=${SRC} INT=${INT} OBJ=${OBJ} MNT=${MNT} ZIPS=${ZIPS} TMP=${TMP} \
SPADBIN=${SPADBIN} INC=${INC} CCLBASE=${CCLBASE} PART=${PART} \
SUBPART=${SUBPART} NOISE=${NOISE} GCLVERSION=${GCLVERSION} \
! TANGLE=${TANGLE} VERSION=${VERSION} \
DOCUMENT=${axiom_build_document} DAASE=$(DAASE) \
WEAVE=${WEAVE} AXIOM_X11_CFLAGS="${AXIOM_X11_CFLAGS}" \
AXIOM_X11_LDFLAGS="${AXIOM_X11_LDFLAGS}"
*************** PLF=BSDplatform
*** 812,821 ****
CCF="-O2 -pipe -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF}
-I/usr/local/include"
# Loader flags
LDF="-L/usr/local/lib"
- # C compiler to use
- CC=gcc
- RANLIB=ranlib
- TOUCH=touch
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
--- 812,817 ----
*************** LISP=lsp
*** 823,832 ****
<<GCLOPTS>>
<<SRCDIRS>>
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} CC=${CC} AWK=${AWK} RANLIB=${RANLIB} \
! TOUCH=${TOUCH} TAR=${TAR} AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS} PATCH=${PATCH} TANGLE=${TANGLE}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 45 Makefile.FreeBSD called
--- 819,828 ----
<<GCLOPTS>>
<<SRCDIRS>>
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} \
! AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS} TANGLE=${TANGLE}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 45 Makefile.FreeBSD called
*************** PLF=MSYSplatform
*** 855,864 ****
CCF="-O2 -Wall -D_GNU_SOURCE -D${PLF}"
# Loader flags
LDF=
- # C compiler to use
- CC=gcc
- RANLIB=ranlib
- TOUCH=touch
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
--- 851,856 ----
*************** LISP=lsp
*** 866,875 ****
<<GCLOPTS>>
SRCDIRS=bootdir interpdir sharedir algebradir etcdir docdir inputdir
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} CC=${CC} AWK=${AWK} RANLIB=${RANLIB} \
! TOUCH=${TOUCH} TAR=${TAR} AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 45 Makefile.windows called
--- 858,867 ----
<<GCLOPTS>>
SRCDIRS=bootdir interpdir sharedir algebradir etcdir docdir inputdir
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} \
! AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 45 Makefile.windows called
*************** PLF=LINUXplatform
*** 896,905 ****
CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF}"
# Loader flags
LDF=
- # C compiler to use
- CC=gcc
- RANLIB=ranlib
- TOUCH=touch
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
--- 888,893 ----
*************** LISP=lsp
*** 907,916 ****
<<GCLOPTS>>
<<SRCDIRS>>
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} CC=${CC} AWK=${AWK} RANLIB=${RANLIB} \
! TOUCH=${TOUCH} TAR=${TAR} AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 45 Makefile.linux called
--- 895,904 ----
<<GCLOPTS>>
<<SRCDIRS>>
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} \
! AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 45 Makefile.linux called
*************** PLF=LINUXplatform
*** 940,949 ****
CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF}"
# Loader flags
LDF=
- # C compiler to use
- CC=gcc
- RANLIB=ranlib
- TOUCH=touch
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
--- 928,933 ----
*************** LISP=lsp
*** 951,960 ****
<<GCLOPTS-LOCBFD>>
<<SRCDIRS>>
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} CC=${CC} AWK=${AWK} RANLIB=${RANLIB} \
! TOUCH=${TOUCH} TAR=${TAR} AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 45 Makefile.linux called
--- 935,944 ----
<<GCLOPTS-LOCBFD>>
<<SRCDIRS>>
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} \
! AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 45 Makefile.linux called
*************** PLF=LINUXplatform
*** 981,990 ****
CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF}"
# Loader flags
<<fedora64 loader flags>>
- # C compiler to use
- CC=gcc
- RANLIB=ranlib
- TOUCH=touch
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
--- 965,970 ----
*************** LISP=lsp
*** 992,1001 ****
<<GCLOPTS>>
<<SRCDIRS>>
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} CC=${CC} AWK=${AWK} RANLIB=${RANLIB} \
! TOUCH=${TOUCH} TAR=${TAR} AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 45 Makefile.linux called
--- 972,981 ----
<<GCLOPTS>>
<<SRCDIRS>>
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} \
! AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 45 Makefile.linux called
*************** PLF=LINUXplatform
*** 1018,1027 ****
CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF}"
# Loader flags
LDF=
- # C compiler to use
- CC=gcc
- RANLIB=ranlib
- TOUCH=touch
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
--- 998,1003 ----
*************** LISP=lsp
*** 1029,1038 ****
<<GCLOPTS-LOCBFD>>
<<SRCDIRS>>
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} CC=${CC} AWK=${AWK} RANLIB=${RANLIB} \
! TOUCH=${TOUCH} TAR=${TAR} AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 45 Makefile.linux called
--- 1005,1014 ----
<<GCLOPTS-LOCBFD>>
<<SRCDIRS>>
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} \
! AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 45 Makefile.linux called
*************** PLF= LINUXplatform
*** 1054,1063 ****
CCF=" -O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF}"
# Loader flags
LDF=
- # C compiler to use
- CC= gcc
- RANLIB=ranlib
- TOUCH=/usr/5bin/touch
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
--- 1030,1035 ----
*************** LISP=lisp
*** 1065,1074 ****
<<GCLOPTS>>
<<SRCDIRS>>
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} CC=${CC} AWK=${AWK} RANLIB=${RANLIB} \
! TOUCH=${TOUCH} TAR=${TAR} AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 48 Makefile.linuxglibc called
--- 1037,1046 ----
<<GCLOPTS>>
<<SRCDIRS>>
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} \
! AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 48 Makefile.linuxglibc called
*************** PLF= LINUXplatform
*** 1090,1099 ****
CCF=" -g -Wall -D_GNU_SOURCE -D${PLF}"
# Loader flags
LDF=
- # C compiler to use
- CC= gcc
- RANLIB=ranlib
- TOUCH=/usr/5bin/touch
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
--- 1062,1067 ----
*************** LISP=lisp
*** 1101,1110 ****
<<GCLOPTS>>
<<SRCDIRS>>
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} CC=${CC} AWK=${AWK} RANLIB=${RANLIB} \
! TOUCH=${TOUCH} TAR=${TAR} AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 51 Makefile.linuxglibc2.1 called
--- 1069,1078 ----
<<GCLOPTS>>
<<SRCDIRS>>
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} \
! AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 51 Makefile.linuxglibc2.1 called
*************** PLF=LINUXplatform
*** 1131,1140 ****
CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF}"
# Loader flags
LDF=
- # C compiler to use
- CC=gcc
- RANLIB=ranlib
- TOUCH=touch
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
--- 1099,1104 ----
*************** LISP=lsp
*** 1142,1151 ****
<<GCLOPTS-LOCBFD>>
<<SRCDIRS>>
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} CC=${CC} AWK=${AWK} RANLIB=${RANLIB} \
! TOUCH=${TOUCH} TAR=${TAR} AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 45 Makefile.linux called
--- 1106,1115 ----
<<GCLOPTS-LOCBFD>>
<<SRCDIRS>>
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} \
! AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 45 Makefile.linux called
*************** PLF= SUN4OS5platform
*** 1168,1178 ****
CCF=" -O3 -D__EXTENSIONS__ -Wall -ansi -D${PLF} -I /usr/openwin/include"
# Loader flags
LDF=-L /usr/openwin/lib -lnsl -lsocket
- # C compiler to use
- CC= gcc
- AWK=/systems/pub/sun4/gawk
- TOUCH=/bin/touch
- RANLIB= ar tvs
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
--- 1132,1137 ----
*************** LISP=lisp
*** 1180,1189 ****
<<GCLOPTS>>
<<SRCDIRS>>
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} CC=${CC} AWK=${AWK} RANLIB=${RANLIB} \
! TOUCH=${TOUCH} TAR=${TAR} AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 69 Makefile.sun4os55g called
--- 1139,1148 ----
<<GCLOPTS>>
<<SRCDIRS>>
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} \
! AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 69 Makefile.sun4os55g called
*************** PLF= SUNplatform
*** 1206,1217 ****
CCF=" -O -D${PLF} -I/usr/openwin/include"
# Loader flags
LDF= -L/usr/openwin/lib
- # C compiler to use
- CC= gcc
- AWK="/systems/pub/sun4/gawk -W version -W compat"
- RANLIB=ranlib
- TOUCH=/usr/5bin/touch
- TAR=/usr/local/bin/gnutar
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
--- 1165,1170 ----
*************** LISP=lisp
*** 1219,1228 ****
<<GCLOPTS>>
<<SRCDIRS>>
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} CC=${CC} AWK=${AWK} RANLIB=${RANLIB} \
! TOUCH=${TOUCH} TAR=${TAR} AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 75 Makefile.sung called
--- 1172,1181 ----
<<GCLOPTS>>
<<SRCDIRS>>
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} \
! AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 75 Makefile.sung called
*************** low level C socket code (in particular,
*** 1242,1250 ****
we change the platform variable to be [[MACOSXplatform]] and create
this new stanza.
- Also it appears that the MAC OSX does not include gawk or nawk by
- default so we change the [[AWK]] variable to use [[awk]].
-
We need to add [[-I/usr/include/sys]] because [[malloc.h]] has been
moved on this platform.
--- 1195,1200 ----
*************** CCF="-O2 -fno-strength-reduce -Wall -D_G
*** 1261,1271 ****
-I/usr/include -I/usr/include/sys"
# Loader flags
LDF=
- # C compiler to use
- CC=gcc
- AWK=awk
- RANLIB=ranlib
- TOUCH=touch
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
--- 1211,1216 ----
*************** LISP=lsp
*** 1273,1282 ****
<<GCLOPTS-CUSTRELOC>>
<<SRCDIRS>>
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} CC=${CC} AWK=${AWK} RANLIB=${RANLIB} \
! TOUCH=${TOUCH} TAR=${TAR} AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 45 Makefile.linux called
--- 1218,1227 ----
<<GCLOPTS-CUSTRELOC>>
<<SRCDIRS>>
! ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} \
! AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
! SRCDIRS=${SRCDIRS}
all: stamp-rootdirs srcsetup lspdir srcdir
@echo 45 Makefile.linux called
_______________________________________________
Axiom-developer mailing list
Axiom-developer@nongnu.org
http://lists.nongnu.org/mailman/listinfo/axiom-developer
