[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Axiom-developer] [build-improvements] progress on X11 locations
|
From: |
Gabriel Dos Reis |
|
Subject: |
[Axiom-developer] [build-improvements] progress on X11 locations |
|
Date: |
06 Aug 2006 07:25:32 +0200 |
Hi,
The patch below takes a step further in dealing with X11 header
files and archive locations. As I mentioned earlier, the solution is
to delegate this delicate problem to Autoconf. Indeed, Autoconf comes
with a macro (AC_PATH_XTRA) that does quite extensive and elaborate
tests to figure out which -I, -L, and -l flags are needed to compiler
and link a program using X11. If you believe that this problem can be
easily dealt with by special-casing makefiles, have a look at the
configure file generated by Autoconf -- that should give you an idea
of the extent of the variabilities.
Concretely, this patch takes care of the build failure I reported
here
http://lists.nongnu.org/archive/html/axiom-developer/2006-07/msg00242.html
I complete a successful build on that machine. I suspect this cures
the problems on many other platforms that are not special-cased in the
top-level Makefiles. I suspect I also break builds on some other
machines, so you can test, please give it a try. Check out the
build-improvements branch, configure, and make.
There remains the issue of Xpm. That library is very curious. It
had been deprecated, replaced with xpm-nox, resurrected, and still not
widely supported. A long term fix in Axiom is to move away from it
(no, don't think about including a copy of it in Axiom!). A
short-term fix may be of:
(1) abort configuration if Xpm is missing -- not my favour
(2) don't build parts of Axiom that uses Xpm, if it is missing.
(3) do (2), but allow users to specify Xpm locations.
(4) do (3), but include configure test to detect it -- sounds nice.
I'm including toward (4) but I don't have time to implement it right now.
Generated files are not included in the patch.
Tested on x86_64-suse-linux
i686-suse-linux
-- Gaby
2006-08-05 Gabriel Dos Reis <address@hidden>
* Makefile.pamphlet (AWK): Define as substituted variable.
(PATCH): Likewise.
(TAR): Likewise.
(AXIOM_X11_CFLAGS): New. Define as substituted variable. Document.
(AXIOM_X11_LDFLAGS): Likewise.
(\subsection{Environment}): Include AXIOM_X11_CFLAGS and
AXIOM_X11_CFLAGS in ENV.
(\subsubsection{The XLIB variable}): Remove.
* Makefile.in: Regenerate.
* Throughout, remove special-case definition of TAR, XLIB, PATCH.
Remove XLIB from ENV.
* configure.ac.pamphlet (\section{Old Story}): Remove.
(\section{Where is X11?}): New.
Add test for detecting include files and libraries directories for
X11. Punt on Xpm for the moment.
* configure.ac: Likewise.
* configure: Likewise.
src/graph/view2D/
2006-08-06 Gabriel Dos Reis <address@hidden>
* Makefile.pamphlet: Remove explicit mention of X11 and Xpm.
src/graph/view3D/
2006-08-06 Gabriel Dos Reis <address@hidden>
* Makefile.pamphlet: Remove explicit mention of X11 and Xpm.
src/graph/viewAlone/
2006-08-06 Gabriel Dos Reis <address@hidden>
* Makefile.pamphlet: Remove explicit mention of X11 and Xpm.
2006-08-06 Gabriel Dos Reis <address@hidden>
* Makefile.pamphlet: Remove explicit mention of X11 and Xpm.
2006-08-06 Gabriel Dos Reis <address@hidden>
* Makefile.pamphlet: Remove explicit mention of X11 and Xpm.
PATH_EXPORTS = address@hidden@; export AXIOM; address@hidden@/bin:$${PATH}
=== Makefile.pamphlet
==================================================================
--- Makefile.pamphlet (revision 15029)
+++ Makefile.pamphlet (local)
@@ -163,6 +163,20 @@
will return the string following the final slash and would thus return
the empty string.
+\subsubsection{AXIOM\_X11\_CFLAGS}
+
+The variable [[AXIOM_X11_CFLAGS]] holds the C compiler flags necessary
+to compile part of Axiom that depends on the X Window System. It is
+computed at configure-time, based on the characteristics of the target
+platform.
+
+\subsubsection{AXIOM\_X11\_LDFLAGS}
+
+The variable [[AXIOM_X11_LDFLAGS]] holds the linker flags necessary
+for parts of Axiom thar depends on the X Window System. It is
+computed at configure-time, based on the characteristics of the target
+platform.
+
\subsubsection{SRC}
The [[SRC]] subdirectory is a hand-generated, read-only top level
directory containing the source code. This is assumed to be completely
@@ -306,7 +320,6 @@
SPAD=${SPD}/mnt/${SYS}
LSP=${SPD}/lsp
<<GCLVERSION>>
-AWK=gawk
GCLDIR=${LSP}/${GCLVERSION}
SRC=${SPD}/src
INT=${SPD}/int
@@ -323,8 +336,14 @@
TANGLE=${SPADBIN}/lib/notangle
WEAVE=${SPADBIN}/lib/noweave
NOISE="-o ${TMP}/trace"
-PATCH=patch
+AWK = @AWK@
+PATCH = @PATCH@
+TAR = @TAR@
+
+AXIOM_X11_CFLAGS = @X_CFLAGS@
+AXIOM_X11_LDFLAGS = @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
+
<<part>>
ENV= SPAD=${SPAD} SYS=${SYS} SPD=${SPD} LSP=${LSP} GCLDIR=${GCLDIR} \
@@ -332,7 +351,8 @@
SPADBIN=${SPADBIN} INC=${INC} CCLBASE=${CCLBASE} PART=${PART} \
SUBPART=${SUBPART} NOISE=${NOISE} GCLVERSION=${GCLVERSION} \
TANGLE=${TANGLE} VERSION=${VERSION} PATCH=${PATCH} DOCUMENT=${DOCUMENT} \
- WEAVE=${WEAVE}
+ WEAVE=${WEAVE} AXIOM_X11_CFLAGS="${AXIOM_X11_CFLAGS}" \
+ AXIOM_X11_LDFLAGS="${AXIOM_X11_LDFLAGS}"
@
\subsection{rootdirs}
@@ -728,10 +748,6 @@
so [[${SRC}/share/algebra/*.daase]] will be the
Axiom bootstrap database files.
-\subsubsection{The XLIB variable}
-The XLIB variable tells us where the X11 libraries live.
-Axiom needs to use libXpm.a to build the graph subdirectory.
-
\subsubsection{The [[SRCDIRS]] variable}
The [[SRCDIRS]] variable is used in the [[src/Makefile.pamphlet]]
to decide what directories to build on a given platform. This is
@@ -813,21 +829,18 @@
AWK="/systems/pub/bin.alpha/gawk -W version -W compat"
RANLIB=ranlib
TOUCH=/bin/touch
-TAR=tar
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
LISP=lisp
DAASE=${SRC}/share
# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -859,21 +872,17 @@
AWK=/systems/pub/bin.alpha/gawk -W compat
RANLIB=ranlib
TOUCH=/bin/touch
-TAR=tar
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
LISP=lisp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -897,9 +906,9 @@
# Platform variable
PLF= HP10platform
# C compiler flags
-CCF=" +O2 +Onolimit -D${PLF} -D_HPUX_SOURCE -I /usr/include/X11R6"
+CCF=" +O2 +Onolimit -D${PLF} -D_HPUX_SOURCE"
# Loader flags
-LDF= -L /usr/lib/X11R6 -Wl,+vnocompatwarnings
+LDF= -Wl,+vnocompatwarnings
# C compiler to use
CC= c89
AWK="/usr/local/bin/gawk -W version -W compat"
@@ -911,15 +920,12 @@
BYE=bye
LISP=lisp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -943,9 +949,9 @@
# Platform variable
PLF= HP10platform
# C compiler flags
-CCF=" +O2 +Onolimit -D${PLF} -D_HPUX_SOURCE -I /usr/include/X11R6"
+CCF=" +O2 +Onolimit -D${PLF} -D_HPUX_SOURCE"
# Loader flags
-LDF= -L /usr/lib/X11R6 -Wl,+vnocompatwarnings -lnsl
+LDF="-Wl,+vnocompatwarnings -lnsl"
# C compiler to use
CC= c89
AWK="/usr/local/bin/gawk -W version -W compat"
@@ -957,15 +963,12 @@
BYE=bye
LISP=lisp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -989,9 +992,9 @@
# Platform variable
PLF= HP9platform
# C compiler flags
-CCF=" -D${PLF} -Ae -I /usr/include/X11R5"
+CCF=" -D${PLF} -Ae"
# Loader flags
-LDF= -L /usr/lib/X11R5
+LDF=
# C compiler to use
CC= cc -O
AWK="/usr/local/bin/gawk -W version -W compat"
@@ -1003,15 +1006,12 @@
BYE=bye
LISP=lisp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -1040,7 +1040,6 @@
LDF=
# C compiler to use
CC= cc
-AWK=awk
RANLIB=echo
TOUCH=touch
TAR=gnutar
@@ -1049,15 +1048,12 @@
BYE=bye
LISP=lisp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -1085,7 +1081,6 @@
LDF=
# C compiler to use
CC= cc -mips3 -n32
-AWK=awk
RANLIB=echo
TOUCH=touch
TAR=gnutar
@@ -1094,15 +1089,12 @@
BYE=bye
LISP=lisp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -1131,29 +1123,24 @@
# Platform variable
PLF=BSDplatform
# C compiler flags
-CCF="-O2 -pipe -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF}
-I/usr/X11R6/include -I/usr/local/include"
+CCF="-O2 -pipe -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF}
-I/usr/local/include"
# Loader flags
-LDF="-L/usr/X11R6/lib -L/usr/local/lib"
+LDF="-L/usr/local/lib"
# C compiler to use
CC=gcc
-AWK=gawk
RANLIB=ranlib
TOUCH=touch
-TAR=tar
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
LISP=lsp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH} TANGLE=${TANGLE}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -1186,27 +1173,22 @@
# C compiler flags
CCF="-O2 -Wall -D_GNU_SOURCE -D${PLF}"
# Loader flags
-LDF= -L/usr/X11R6/lib
+LDF=
# C compiler to use
CC=gcc
-AWK=awk
RANLIB=ranlib
TOUCH=touch
-TAR=tar
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
LISP=lsp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS>>
SRCDIRS=bootdir interpdir sharedir algebradir etcdir docdir inputdir
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -1235,29 +1217,24 @@
# Platform variable
PLF=LINUXplatform
# C compiler flags
-CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF} -I/usr/X11/include"
+CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF}"
# Loader flags
-LDF= -L/usr/X11R6/lib
+LDF=
# C compiler to use
CC=gcc
-AWK=gawk
RANLIB=ranlib
TOUCH=touch
-TAR=tar
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
LISP=lsp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -1289,29 +1266,24 @@
# Platform variable
PLF=LINUXplatform
# C compiler flags
-CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF} -I/usr/X11/include"
+CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF}"
# Loader flags
-LDF= -L/usr/X11R6/lib
+LDF=
# C compiler to use
CC=gcc
-AWK=gawk
RANLIB=ranlib
TOUCH=touch
-TAR=tar
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
LISP=lsp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS-LOCBFD>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -1333,36 +1305,31 @@
Fedora Core 2 on the AMD 64 uses 64 bit libraries. We need to change the
loader flags so these libraries are used otherwise the graphics won't build.
<<fedora64 loader flags>>=
-LDF="-L/usr/X11R6/lib64 -L/usr/local/lib64 -L/usr/openwin/lib64 -L/usr/lib64 "
+LDF="-L/usr/local/lib64 -L/usr/openwin/lib64 -L/usr/lib64 "
@
<<Makefile.fedora64>>=
# System dependent Makefile for the Intel/Linux platform
# Platform variable
PLF=LINUXplatform
# C compiler flags
-CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF} -I/usr/X11/include"
+CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF}"
# Loader flags
<<fedora64 loader flags>>
# C compiler to use
CC=gcc
-AWK=gawk
RANLIB=ranlib
TOUCH=touch
-TAR=tar
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
LISP=lsp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -1387,29 +1354,24 @@
# Platform variable
PLF=LINUXplatform
# C compiler flags
-CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF} -I/usr/X11/include"
+CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF}"
# Loader flags
-LDF= -L/usr/X11R6/lib
+LDF=
# C compiler to use
CC=gcc
-AWK=gawk
RANLIB=ranlib
TOUCH=touch
-TAR=tar
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
LISP=lsp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS-LOCBFD>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -1433,29 +1395,24 @@
# Platform variable
PLF= LINUXplatform
# C compiler flags
-CCF=" -O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF}
-I/usr/X11R6/include"
+CCF=" -O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF}"
# Loader flags
-LDF= -L/usr/X11R6/lib #-lefence
+LDF=
# C compiler to use
CC= gcc
-AWK=awk
RANLIB=ranlib
TOUCH=/usr/5bin/touch
-TAR=tar
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
LISP=lisp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -1479,29 +1436,24 @@
# Platform variable
PLF= LINUXplatform
# C compiler flags
-CCF=" -g -Wall -D_GNU_SOURCE -D${PLF} -I/usr/X11R6/include"
+CCF=" -g -Wall -D_GNU_SOURCE -D${PLF}"
# Loader flags
-LDF= -L/usr/X11R6/lib
+LDF=
# C compiler to use
CC= gcc
-AWK=awk
RANLIB=ranlib
TOUCH=/usr/5bin/touch
-TAR=tar
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
LISP=lisp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -1530,29 +1482,24 @@
# Platform variable
PLF=LINUXplatform
# C compiler flags
-CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF} -I/usr/X11/include"
+CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF}"
# Loader flags
-LDF= -L/usr/X11R6/lib
+LDF=
# C compiler to use
CC=gcc
-AWK=gawk
RANLIB=ranlib
TOUCH=touch
-TAR=gtar
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
LISP=lsp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS-LOCBFD>>
<<SRCDIRS>>
-PATCH=gpatch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -1590,15 +1537,12 @@
BYE=bye
LISP=lisp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -1636,15 +1580,12 @@
BYE=bye
LISP=lisp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -1682,15 +1623,12 @@
BYE=bye
LISP=lisp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -1728,15 +1666,12 @@
BYE=bye
LISP=lisp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -1767,22 +1702,18 @@
CC= cc
AWK=/systems/pub/sun4/gawk
TOUCH=/bin/touch
-TAR=tar
RANLIB= ar tvs
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
LISP=lisp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -1813,22 +1744,18 @@
CC= gcc
AWK=/systems/pub/sun4/gawk
TOUCH=/bin/touch
-TAR=tar
RANLIB= ar tvs
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
LISP=lisp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -1859,22 +1786,18 @@
CC= cc
AWK=/systems/pub/sun4/gawk
TOUCH=/bin/touch
-TAR=tar
RANLIB= ar tvs
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
LISP=lisp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -1912,15 +1835,12 @@
BYE=bye
LISP=lisp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
@@ -1961,29 +1881,25 @@
PLF=MACOSXplatform
# C compiler flags
CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF} \
- -I/usr/X11/include -I/usr/include -I/usr/include/sys"
+ -I/usr/include -I/usr/include/sys"
# Loader flags
-LDF= -L/usr/X11R6/lib
+LDF=
# C compiler to use
CC=gcc
AWK=awk
RANLIB=ranlib
TOUCH=touch
-TAR=tar
AXIOMXLROOT=${AXIOM}/compiler
O=o
BYE=bye
LISP=lsp
DAASE=${SRC}/share
-# where the libXpm.a library lives
-XLIB=/usr/X11R6/lib
<<GCLOPTS-CUSTRELOC>>
<<SRCDIRS>>
-PATCH=patch
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} XLIB=${XLIB} GCLOPTS=${GCLOPTS} \
+ LISP=${LISP} DAASE=${DAASE} GCLOPTS=${GCLOPTS} \
SRCDIRS=${SRCDIRS} PATCH=${PATCH}
all: rootdirs noweb srcsetup lspdir srcdir
=== configure.ac.pamphlet
==================================================================
--- configure.ac.pamphlet (revision 15029)
+++ configure.ac.pamphlet (local)
@@ -45,176 +45,7 @@
poor masochist who will be debugging the generated \file{configure}
file.
-\section{Old Story}
-The contents of top-level \file{configure} file from mainline is
-reproduced below. It will serve as the initial basis for the new,
-improved, build machinery.
-
-\begin{verbatim}
-# The sysname function uses uname -s to try to decode what kind of
-# system to build. Currently the return value of uname is mapped as
-# Linux --> linux
-# MINGW32_NT-5.1 --> windows
-# SunOS --> Solaris9
-# Fedora Core 3 --> fedora3
-# freebsd --> freebsd
-#
-# The solaris platform needs patch->gpatch, awk->gawk, tar->gtar
-
-sysname () {
-if [ -f /etc/redhat-release ] ;
- then
- SYSNAME=`cat /etc/redhat-release`
- if [ "$SYSNAME" = "Fedora Core release 3 (Heidelberg)" ] ;
- then SYSNAME=fedora3
- fi
- echo SYSNAME=$SYSNAME
-fi
-if [ ! "$SYSNAME" = "fedora3" ] ;
- then
- SYSNAME=`uname -s`
- echo $SYSNAME
- if [ "$SYSNAME" = "Linux" ] ; then SYSNAME=linux
- elif [ "$SYSNAME" = "MINGW32_NT-5.1" ] ; then SYSNAME=windows
- elif [ "$SYSNAME" = "SunOS" ] ; then SYSNAME=solaris9
- elif [ "$SYSNAME" = "freebsd" ] ; then SYSNAME=freebsd
- else
- echo Your system name is $SYSNAME
- echo We do not know how to build for this kind of system
- echo Send a note to address@hidden about it
- echo
- exit 0
- fi
-fi
-
-}
-
-# This function checks for the gawk command.
-# If it exists then AWKNAME is the complete pathname
-
-checkgawk() {
-AWKNAME=`which gawk 2>>trace`
-if [ -n "$AWKNAME" ] ; then
- if [ -x $AWKNAME ] ; then
- echo
- fi
-fi
-}
-
-# This function checks for the nawk command.
-# If it exists then AWKNAME is the complete pathname
-
-checknawk() {
-AWKNAME=`which nawk 2>>trace`
-if [ -n "$AWKNAME" ] ; then
- if [ -x $AWKNAME ] ; then
- echo
- fi
-fi
-}
-
-# This function checks for the awk command.
-# If it exists then AWKNAME is the complete pathname
-
-checkawk() {
-AWKNAME=`which awk 2>>trace`
-if [ -n "$AWKNAME" ] ; then
- if [ -x $AWKNAME ] ; then
- echo
- fi
-fi
-}
-
-# This function uses the check*awk functions to decide
-# whether the system can build noweb. If one of gawk, nawk or awk
-# are not found we fail.
-needAwk ()
-{
-checkgawk
-if [ -z "$AWKNAME" ] ; then
- checknawk
- if [ -z "$AWKNAME" ] ; then
- checkawk
- if [ -z "$AWKNAME" ] ; then
- echo We need the commands gawk, nawk, or awk
- exit 0
- fi
- fi
-fi
-}
-
-# The mustSet function tells the user what needs to be typed on the
-# command line. If any extra variables need to be set we add them here.
-# Currently the only thing we check if for the presence of gawk, which
-# is the default in the Makefile. If gawk does not exist we can use
-# either nawk or awk but the user has to specify that on the command line.
-
-# We check the system we are using with the uname command and try to
-# generate the appropriate value. We fail otherwise.
-
-# We generate the appropriate command line that the user should use.
-
-mustSet() {
-echo
-echo ===================================================
-echo You must set your AXIOM and PATH variables. Type:
-echo
-echo To build the rest of the system type:
-echo
-echo export AXIOM=`pwd`/mnt/$SYSNAME
-echo 'export PATH=$AXIOM/bin:$PATH'
-if [ "$SYSNAME" = "freebsd" ] ; then
- echo Note that freebsd usually has noweb available
- echo If you wish to use the standard version you must type
- echo touch noweb
- echo If you wish to use a pre-installed GCL you must type
- echo make GCLVERSION=gcl-system
-fi
-if [ "$SYSNAME" = "solaris9" ] ;
- then echo make AWK=gawk TAR=gtar PATCH=gpatch
-elif [ "`basename $AWKNAME`" = "gawk" ] ;
- then echo make
- else echo make AWK=$AWKNAME
-fi
-echo
-echo configure finished.
-}
-
-#########################################################################
-# This is the main line of configure logic.
-# (1) We test to see if we understand this system name. So far
-# the recognized strings from uname -s are translated as:
-# Linux --> linux
-# MINGW32_NT-5.1 --> windows
-# SunOS --> Solaris9
-# Fedora Core 3 --> fedora3
-# freebsd --> freebsd
-# (1) We test for the AWK variable. We need one of gawk, nawk, or awk
-# in order to build the noweb software.
-# (2) Then we output the final message for the user.
-#
-# The solaris platform needs patch->gpatch, awk->gawk, tar->gtar
-#########################################################################
-
-sysname
-needAwk
-
-if [ "x$AXIOM" = "x" ] ;
- then mustSet
- else
- if [ ! "`dirname $AXIOM`" = "`pwd`/mnt" ]
- then mustSet
- else
- echo Configure complete. Now type
- echo
- echo make
- echo
- fi
-fi
-\end{verbatim}
-
-
\section{Basic Setup}
\subsection{Autoconf Initialization}
@@ -271,6 +102,7 @@
\subsection{Build Environment}
+\subsubsection{Canonical triplets}
Standard build environments consist of
\begin{enumerate}
\item the \emph{host} platform,
@@ -286,6 +118,7 @@
AC_CANONICAL_SYSTEM
@
+\subsubsection{Cross compilation}
For the moment, Axiom supports neither cross-compilation, nor Canadian cross.
Consequently, we must bail out if the build is not native.
<<check cross-compilation>>=
@@ -294,6 +127,7 @@
fi
@
+\subsubsection{Build utilities}
Most of the tools we're testing for are with respect to the build
environment, neither the host nor the target.
@@ -361,6 +195,8 @@
[make], [AC_MSG_ERROR([`make' program missing.])])
@
+
+\subsubsection{Old behaviour}
Here, we replicate the behaviour of the old configure, waiting for
a better alternative, e.g. where it is not needed. THIS WILL BE
REMOVED IN THE NEAR FUTURE.
@@ -418,12 +254,58 @@
AC_SUBST(AXIOM)
@
+\subsubsection{Instantiating configuration files}
+
<<instantiate config files>>=
AC_CONFIG_FILES(Makefile)
AC_OUTPUT
@
+\section{Where is X11?}
+One of the thorniest issues with programs that use the X Window System
+is portability. There exist many implementations of the X11
+specification, each with its own variations, extensions, and what
+not. Designing hand-written, makefiles for such programs can be a
+daunting task, fraut with all kinds of traps. Fortunately, Autoconf
+provides us with some help, namely the macro [[AC_PATH_X]] and
+[[AC_PATH_XTRA]]. The former searches the directories where the
+include files and the libraries file for X11 reside. The later is an
+enhanced version that:
+\begin{itemize}
+\item computes the C compiler flags required by X;
+\item computes the linker flags required by X;
+\item checks for special libraries that some systems need in order to
+ compile X programs;
+\item checks for special X11R6 libraries that need to be linked before
+ the flag [[-lX11]].
+\end{itemize}
+
+<<locate X11>>=
+AC_PATH_XTRA
+## Output directives for the C compiler
+AC_SUBST(X_CLFAGS)
+## Output directives for the linker
+AC_SUBST(X_LIBS)
+## Output any extra libraries required by X11
+AC_SUBST(X_EXTRA_LIBS)
+
+## Finally, output the list of libraries that need to appear before -lX11
+## Some part of Axiom depends on Xpm. That library has kind uncertain
+## future. At some point in the past, it was deprecated, to be
+## replaced by xpm-nox; then came back again. So, its support may
+## vary from system to system. For the moment, we assume that if X11
+## is found then, Xpm is already present. Though, clearly that is a
+## very optimistic assumption. Long term, Axiom should get rid of
+## dependence on Xpm. A nearly fool-proof test would be probably
+## inspired by AC_PATH_XTRA. I don't have time to get to that
+## complication right now. Will fix later.
+X_PRE_LIBS="-lXpm ${X_PRE_LIBS}"
+AC_SUBST(X_PRE_LIBS)
+@
+
+\section{configure.ac}
+
<<*>>=
<<Autoconf init>>
@@ -449,6 +331,8 @@
<<check for make>>
+<<locate X11>>
+
<<replicate old behaviour>>
<<instantiate config files>>
@
=== src/graph/view2D/Makefile.pamphlet
==================================================================
--- src/graph/view2D/Makefile.pamphlet (revision 15029)
+++ src/graph/view2D/Makefile.pamphlet (local)
@@ -283,7 +283,7 @@
${OUT}/view2D: ${VIEW2D_OBJS} ${GDRAW_OBJS} ${LIBFILES}
@ echo 34 linking ${OUT}/view2D
@ ${CC} ${VIEW2D_OBJS} ${GDRAW_OBJS} ${LIBFILES} \
- -o ${OUT}/view2D ${XLIB}/libXpm.a $(LDFLAGS)
+ -o ${OUT}/view2D $(LDFLAGS)
@
\section{axiom.sty}
@@ -300,8 +300,8 @@
<<environment>>
-CFLAGS = ${CCF} -I${LINC} -I${GINC} -I${IN}
-LDFLAGS = ${LDF} ${STATIC} -lX11 -lm ${LDF}
+CFLAGS = ${CCF} ${AXIOM_X11_CFLAGS} -I${LINC} -I${GINC} -I${IN}
+LDFLAGS = ${AXIOM_X11_LDFLAGS} -lm
DOCFILES= ${DOC}/buttons2d.c.dvi ${DOC}/control2d.c.dvi \
${DOC}/graph2d.c.dvi ${DOC}/main2d.c.dvi \
=== src/graph/view3D/Makefile.pamphlet
==================================================================
--- src/graph/view3D/Makefile.pamphlet (revision 15029)
+++ src/graph/view3D/Makefile.pamphlet (local)
@@ -702,8 +702,8 @@
${DOC}/viewport3d.c.dvi ${DOC}/volume3d.c.dvi \
${DOC}/write3d.c.dvi
-CFLAGS = ${CCF} -I${LINC} -I${GINC} -I${IN}
-LDFLAGS = ${LDF} ${STATIC} -lX11 -lm
+CFLAGS = ${CCF} ${AXIOM_X11_CFLAGS} -I${LINC} -I${GINC} -I${IN}
+LDFLAGS = ${AXIOM_X11_LDFLAGS} -lm
OBJS = \
${MIDOBJ}/buttons3d.o ${MIDOBJ}/closeView3d.o ${MIDOBJ}/component3d.o \
=== src/graph/viewAlone/Makefile.pamphlet
==================================================================
--- src/graph/viewAlone/Makefile.pamphlet (revision 15029)
+++ src/graph/viewAlone/Makefile.pamphlet (local)
@@ -28,7 +28,7 @@
<<viewAlone>>=
${OUT}/viewAlone: $(OBJS) ${OBJ}/${SYS}/lib/util.o
@ echo 1 linking viewAlone
- @ ${CC} $(OBJS) ${OBJ}/${SYS}/lib/util.o -o ${OUT}/viewAlone ${LDFLAGS}
-lX11
+ @ ${CC} $(OBJS) ${OBJ}/${SYS}/lib/util.o -o ${OUT}/viewAlone ${LDFLAGS}
<<viewAlone.c (MIDINT from IN)>>=
${MIDINT}/viewAlone.c: ${IN}/viewAlone.c.pamphlet
@@ -120,8 +120,8 @@
DOCFILES= ${DOC}/viewAlone.c.dvi ${DOC}/spoonComp.c.dvi \
${DOC}/spoon2D.c.dvi
-CFLAGS = ${CCF} -I${IN} -I${LINC} -I${GINC}
-LDFLAGS= ${LDF}
+CFLAGS = ${CCF} ${AXIOM_X11_CFLAGS} -I${IN} -I${LINC} -I${GINC}
+LDFLAGS= ${AXIOM_X11_LDFLAGS}
OBJS= ${MIDOBJ}/viewAlone.o ${MIDOBJ}/spoonComp.o ${MIDOBJ}/spoon2D.o
=== src/graph/viewman/Makefile.pamphlet
==================================================================
--- src/graph/viewman/Makefile.pamphlet (revision 15029)
+++ src/graph/viewman/Makefile.pamphlet (local)
@@ -268,8 +268,8 @@
<<*>>=
<<environment>>
-CFLAGS = ${CCF} -I${LINC} -I${GINC} -I${IN}
-LDFLAGS = ${LDF} -lX11
+CFLAGS = ${CCF} ${AXIOM_X11_CFLAGS} -I${LINC} -I${GINC} -I${IN}
+LDFLAGS = ${AXIOM_X11_LDFLAGS}
DOCFILES=${DOC}/viewman.c.dvi ${DOC}/sselect.c.dvi ${DOC}/cleanup.c.dvi \
${DOC}/fun2D.c.dvi ${DOC}/make2D.c.dvi ${DOC}/makeGraph.c.dvi \
=== src/hyper/Makefile.pamphlet
==================================================================
--- src/hyper/Makefile.pamphlet (revision 15029)
+++ src/hyper/Makefile.pamphlet (local)
@@ -36,8 +36,8 @@
# this is where the hypertex documentation files are
HYPER=${MNT}/${SYS}/doc/hypertex
-CFLAGS= ${CCF} -I${MID}
-LDFLAGS= -L${LIB} -lspad ${LDF}
+CFLAGS= ${CCF} -I${MID} ${AXIOM_X11_CFLAGS}
+LDFLAGS= -L${LIB} -lspad ${AXIOM_X11_LDFLAGS} -lm
HTADD=${OUT}/htadd
@@ -1058,7 +1058,7 @@
(cd ${OUT} ; \
${CC} -g ${HYPER_OBJS} -o ${OUT}/hypertex ${LIB}/sockio-c.o \
${LIB}/pixmap.o ${LIB}/spadcolors.o ${LIB}/util.o \
- ${LIB}/bsdsignal.o ${LDFLAGS} ${XLIB}/libXpm.a -lX11 -lm -L${LIB} )
+ ${LIB}/bsdsignal.o ${LDFLAGS})
@
\section{htsearch binary}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Axiom-developer] [build-improvements] progress on X11 locations,
Gabriel Dos Reis <=