[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Axiom-developer] 20080608.03.tpd.patch (remove src/graph, use bookvol8)
|
From: |
daly |
|
Subject: |
[Axiom-developer] 20080608.03.tpd.patch (remove src/graph, use bookvol8) |
|
Date: |
Sun, 8 Jun 2008 07:53:27 -0500 |
The src/graph directory no longer exists.
The whole graphics subsystem is now in book volume 8.
=========================================================================
diff --git a/books/bookvol8.pamphlet b/books/bookvol8.pamphlet
index ecef4e1..c42ff93 100644
--- a/books/bookvol8.pamphlet
+++ b/books/bookvol8.pamphlet
@@ -1156,50 +1156,50 @@ x*x
\section{all-2d.h1}
<<include/all-2d.h1>>=
/* declarations in view2d */
-#include "buttons2d.h1"
-#include "control2d.h1"
-#include "graph2d.h1"
-#include "main2d.h1"
-#include "pot2d.h1"
-#include "process2d.h1"
-#include "spadaction2d.h1"
-#include "stuff2d.h1"
-#include "viewport2d.h1"
-#include "write2d.h1"
+<<include/buttons2d.h1>>
+<<include/control2d.h1>>
+<<include/graph2d.h1>>
+<<include/main2d.h1>>
+<<include/pot2d.h1>>
+<<include/process2d.h1>>
+<<include/spadaction2d.h1>>
+<<include/stuff2d.h1>>
+<<include/viewport2d.h1>>
+<<include/write2d.h1>>
@
\section{all-3d.h1}
<<include/all-3d.h1>>=
-#include "stuff3d.h1"
-#include "buttons3d.h1"
-#include "write3d.h1"
-#include "volume3d.h1"
-#include "control3d.h1"
-#include "transform3d.h1"
-#include "closeview3d.h1"
-#include "illuminate3d.h1"
-#include "msort3d.h1"
-#include "surface3d.h1"
-#include "mesh3d.h1"
-#include "project3d.h1"
-#include "lighting3d.h1"
-#include "lightbut3d.h1"
-#include "spadaction3d.h1"
-#include "viewport3d.h1"
-#include "pot3d.h1"
-#include "process3d.h1"
-#include "quitbut3d.h1"
-#include "quit3d.h1"
-#include "component3d.h1"
-#include "smoothshade3d.h1"
-#include "savebut3d.h1"
-#include "save3d.h1"
-#include "main3d.h1"
+<<include/stuff3d.h1>>
+<<include/buttons3d.h1>>
+<<include/write3d.h1>>
+<<include/volume3d.h1>>
+<<include/control3d.h1>>
+<<include/transform3d.h1>>
+<<include/closeview3d.h1>>
+<<include/illuminate3d.h1>>
+<<include/msort3d.h1>>
+<<include/surface3d.h1>>
+<<include/mesh3d.h1>>
+<<include/project3d.h1>>
+<<include/lighting3d.h1>>
+<<include/lightbut3d.h1>>
+<<include/spadaction3d.h1>>
+<<include/viewport3d.h1>>
+<<include/pot3d.h1>>
+<<include/process3d.h1>>
+<<include/quitbut3d.h1>>
+<<include/quit3d.h1>>
+<<include/component3d.h1>>
+<<include/smoothshade3d.h1>>
+<<include/savebut3d.h1>>
+<<include/save3d.h1>>
+<<include/main3d.h1>>
@
\section{all-alone.h1}
<<include/all-alone.h1>>=
-#include "spoon2d.h1"
-#include "spooncomp.h1"
-#include "viewalone.h1"
+<<include/spoon2d.h1>>
+<<include/spooncomp.h1>>
+<<include/viewalone.h1>>
@
\section{buttons2d.h1}
<<include/buttons2d.h1>>=
@@ -1222,6 +1222,8 @@ extern void goodbye(int sig);
extern void closeViewport(void);
@
\section{colors.h}
+This include file appears not to be used.
+However, the moColor macro IS used but not included.
<<include/colors.h>>=
/*
colors.h
@@ -2668,12 +2670,12 @@ static char volumeMask_bits[] = {
#include <sys/wait.h>
<<viewman/viewman.h>>
-#include "actions.h"
+<<include/actions.h>>
#include "util.h1"
-#include "cleanup.h1"
-#include "makegraph.h1"
-#include "readview.h1"
+<<include/cleanup.h1>>
+<<include/makegraph.h1>>
+<<include/readview.h1>>
void
brokenPipe(int sig)
@@ -2841,13 +2843,13 @@ goodbye(int sig)
<<viewman/viewman.h>>
-#include "actions.h"
+<<include/actions.h>>
#include "util.h1"
#include "sockio-c.h1"
-#include "fun2d.h1"
-#include "readview.h1"
-#include "make2d.h1"
+<<include/fun2d.h1>>
+<<include/readview.h1>>
+<<include/make2d.h1>>
#define writeEach
@@ -3184,13 +3186,13 @@ sendGraphToView2D(int i,int there,viewManager *viewport,
<<viewman/viewman.h>>
<<include/mode.h>>
-#include "actions.h"
+<<include/actions.h>>
#include "util.h1"
#include "sockio-c.h1"
-#include "fun3d.h1"
-#include "make3d.h1"
-#include "readview.h1"
+<<include/fun3d.h1>>
+<<include/make3d.h1>>
+<<include/readview.h1>>
void
funView3D(int viewCommand)
@@ -3535,7 +3537,7 @@ extern char propertyBuffer[];
<<viewman/viewman.h>>
#include "sockio-c.h1"
-#include "make2d.h1"
+<<include/make2d.h1>>
void
makeView2DFromSpadData(view2DStruct *viewdata,graphStateStruct graphState[])
@@ -3584,7 +3586,7 @@ makeView2DFromSpadData(view2DStruct
*viewdata,graphStateStruct graphState[])
<<include/mode.h>>
#include "sockio-c.h1"
-#include "make3d.h1"
+<<include/make3d.h1>>
void
makeView3DFromSpadData(view3DStruct *viewdata,int typeOfViewport)
@@ -3709,14 +3711,7 @@ OUT= ${MNT}/${SYS}/lib
LIB= ${OBJ}/${SYS}/lib
DOC= ${MNT}/${SYS}/doc/src/graph
-# local include files shared by graphics
-LINC= ${SRC}/graph/include
-
-# global include files shared by everyone
-GINC= ${SRC}/include
-
-
-CFLAGS = ${CCF} -I${LINC} -I${GINC}
+CFLAGS = ${CCF} -I${SRC}/include
LDFLAGS = ${LDF} -lX11
OBJS= ${MIDOBJ}/viewman.o ${MIDOBJ}/readview.o ${MIDOBJ}/make3d.o \
@@ -3724,10 +3719,6 @@ OBJS= ${MIDOBJ}/viewman.o ${MIDOBJ}/readview.o
${MIDOBJ}/make3d.o \
${MIDOBJ}/fun2d.o ${MIDOBJ}/cleanup.o ${MIDOBJ}/sselect.o \
${OBJ}/${SYS}/lib/sockio-c.o
-HEADERS= ${LINC}/component.h ${LINC}/view2d.h \
- ${LINC}/view3d.h ${LINC}/tube.h ${LINC}/actions.h \
- ${LINC}/viewcommand.h ${GINC}/com.h
-
all: ${OBJS} ${OUT}/viewman
@ echo 30 finished viewman from bookvol8
@@ -3741,7 +3732,7 @@ ${MIDINT}/viewman.c: ${BOOK}
@( cd ${MIDINT} ; \
${TANGLE} -R"viewman/viewman.c" ${BOOK} >viewman.c )
-${MIDOBJ}/viewman.o: ${HEADERS} ${MIDINT}/viewman.c
+${MIDOBJ}/viewman.o: ${SRC}/include/com.h ${MIDINT}/viewman.c
@ echo 3 making ${MIDOBJ}/viewman.o from ${MIDINT}/viewman.c
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/viewman.c )
@@ -3750,7 +3741,7 @@ ${MIDINT}/sselect.c: ${BOOK}
@( cd ${MIDINT} ; \
${TANGLE} -R"viewman/sselect.c" ${BOOK} >sselect.c )
-${MIDOBJ}/sselect.o: ${HEADERS} ${MIDINT}/sselect.c
+${MIDOBJ}/sselect.o: ${SRC}/include/com.h ${MIDINT}/sselect.c
@ echo 6 making ${MIDOBJ}/sselect.o from ${MIDINT}/sselect.c
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/sselect.c )
@@ -3759,7 +3750,7 @@ ${MIDINT}/cleanup.c: ${BOOK}
@( cd ${MIDINT} ; \
${TANGLE} -R"viewman/cleanup.c" ${BOOK} >cleanup.c )
-${MIDOBJ}/cleanup.o: ${HEADERS} ${MIDINT}/cleanup.c
+${MIDOBJ}/cleanup.o: ${SRC}/include/com.h ${MIDINT}/cleanup.c
@ echo 9 making ${MIDOBJ}/cleanup.o from ${MIDINT}/cleanup.c
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/cleanup.c )
@@ -3768,7 +3759,7 @@ ${MIDINT}/fun2d.c: ${BOOK}
@( cd ${MIDINT} ; \
${TANGLE} -R"viewman/fun2d.c" ${BOOK} >fun2d.c )
-${MIDOBJ}/fun2d.o: ${HEADERS} ${MIDINT}/fun2d.c
+${MIDOBJ}/fun2d.o: ${SRC}/include/com.h ${MIDINT}/fun2d.c
@ echo 12 making ${MIDOBJ}/fun2d.o from ${MIDINT}/fun2d.c
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/fun2d.c )
@@ -3777,7 +3768,7 @@ ${MIDINT}/make2d.c: ${BOOK}
@( cd ${MIDINT} ; \
${TANGLE} -R"viewman/make2d.c" ${BOOK} >make2d.c )
-${MIDOBJ}/make2d.o: ${HEADERS} ${MIDINT}/make2d.c
+${MIDOBJ}/make2d.o: ${SRC}/include/com.h ${MIDINT}/make2d.c
@ echo 15 making ${MIDOBJ}/make2d.o from ${MIDINT}/make2d.c
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/make2d.c )
@@ -3786,7 +3777,7 @@ ${MIDINT}/makegraph.c: ${BOOK}
@( cd ${MIDINT} ; \
${TANGLE} -R"viewman/makegraph.c" ${BOOK} >makegraph.c )
-${MIDOBJ}/makegraph.o: ${HEADERS} ${MIDINT}/makegraph.c
+${MIDOBJ}/makegraph.o: ${SRC}/include/com.h ${MIDINT}/makegraph.c
@ echo 18 making ${MIDOBJ}/makegraph.o from ${MIDINT}/makegraph.c
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/makegraph.c )
@@ -3795,7 +3786,7 @@ ${MIDINT}/fun3d.c: ${BOOK}
@( cd ${MIDINT} ; \
${TANGLE} -R"viewman/fun3d.c" ${BOOK} >fun3d.c )
-${MIDOBJ}/fun3d.o: ${HEADERS} ${MIDINT}/fun3d.c
+${MIDOBJ}/fun3d.o: ${SRC}/include/com.h ${MIDINT}/fun3d.c
@ echo 21 making ${MIDOBJ}/fun3d.o from ${MIDINT}/fun3d.c
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/fun3d.c )
@@ -3804,7 +3795,7 @@ ${MIDINT}/make3d.c: ${BOOK}
@( cd ${MIDINT} ; \
${TANGLE} -R"viewman/make3d.c" ${BOOK} >make3d.c )
-${MIDOBJ}/make3d.o: ${HEADERS} ${MIDINT}/make3d.c
+${MIDOBJ}/make3d.o: ${SRC}/include/com.h ${MIDINT}/make3d.c
@ echo 24 making ${MIDOBJ}/make3d.o from ${MIDINT}/make3d.c
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/make3d.c )
@@ -3813,7 +3804,7 @@ ${MIDINT}/readview.c: ${BOOK}
@( cd ${MIDINT} ; \
${TANGLE} -R"viewman/readview.c" ${BOOK} >readview.c )
-${MIDOBJ}/readview.o: ${HEADERS} ${MIDINT}/readview.c
+${MIDOBJ}/readview.o: ${SRC}/include/com.h ${MIDINT}/readview.c
@ echo 27 making ${MIDOBJ}/readview.o from ${MIDINT}/readview.c
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/readview.c )
@@ -3828,7 +3819,7 @@ ${MIDOBJ}/readview.o: ${HEADERS} ${MIDINT}/readview.c
<<viewman/viewman.h>>
#include "sockio-c.h1"
-#include "makegraph.h1"
+<<include/makegraph.h1>>
graphStruct *
makeGraphFromSpadData(void)
@@ -3931,7 +3922,7 @@ discardGraph (graphStruct *theGraph)
<<viewman/viewman.h>>
-#include "cleanup.h1"
+<<include/cleanup.h1>>
int
readViewport (viewManager *viewPort,void *info,int size)
@@ -3961,8 +3952,8 @@ again:
#include "sockio-c.h1"
#include "bsdsignal.h1"
-#include "cleanup.h1"
-#include "sselect.h1"
+<<include/cleanup.h1>>
+<<include/sselect.h1>>
/*******************************************
* int superSelect(n, rd, wr, ex, timeout) *
@@ -4026,7 +4017,7 @@ superSelect(int n, int *rd, int *wr, int *ex, char
*timeout)
<<viewman/viewman.h>>
<<include/mode.h>>
-#include "actions.h"
+<<include/actions.h>>
<<include/viewcommand.h>>
#include "bsdsignal.h"
@@ -4034,12 +4025,12 @@ superSelect(int n, int *rd, int *wr, int *ex, char
*timeout)
#include "bsdsignal.h1"
#include "util.h1"
#include "sockio-c.h1"
-#include "fun2d.h1"
-#include "fun3d.h1"
-#include "makegraph.h1"
-#include "readview.h1"
-#include "cleanup.h1"
-#include "sselect.h1"
+<<include/fun2d.h1>>
+<<include/fun3d.h1>>
+<<include/makegraph.h1>>
+<<include/readview.h1>>
+<<include/cleanup.h1>>
+<<include/sselect.h1>>
/************* global variables **************/
@@ -4229,8 +4220,8 @@ main (void)
@
\subsection{viewman.h}
<<viewman/viewman.h>>=
-#include "view2d.h"
-#include "view3d.h"
+<<include/view2d.h>>
+<<include/view3d.h>>
/* Viewport Commands */
#define makeViewport -1
@@ -4261,54 +4252,35 @@ MIDOBJ= ${OBJ}/${SYS}/graph/viewalone
OUT= ${MNT}/${SYS}/bin
TESTFILE=${MNT}/${SYS}/graph/parabola.view
-# local include files shared by graphics
-LINC= ${SRC}/graph/include
-
-# global include files shared by everyone
-GINC= ${SRC}/include
-
-CFLAGS = ${CCF} -I${LINC} -I${GINC}
+CFLAGS = ${CCF} -I${SRC}/include
LDFLAGS= ${LDF}
OBJS= ${MIDOBJ}/viewalone.o ${MIDOBJ}/spooncomp.o ${MIDOBJ}/spoon2d.o
-HEADERS= ${LINC}/component.h ${LINC}/view2d.h \
- ${LINC}/view3d.h ${LINC}/tube.h ${LINC}/actions.h \
- ${LINC}/viewcommand.h
+all: ${OUT}/viewalone ${TESTFILE}
+ @echo 12 finished viewalone from ${BOOK}
-all: ${OBJS} ${OUT}/viewalone ${TESTFILE}
- @echo 12 finished ${IN}
-
-${OUT}/viewalone: $(OBJS) ${OBJ}/${SYS}/lib/util.o
+${OUT}/viewalone: ${OBJS} ${OBJ}/${SYS}/lib/util.o
@ echo 1 linking viewalone
@ ${CC} $(OBJS) ${OBJ}/${SYS}/lib/util.o \
-o ${OUT}/viewalone ${LDFLAGS} -lX11
-${MIDINT}/viewalone.c: ${BOOK}
- @ echo 2 making ${MIDINT}/viewalone.c from ${BOOK}
+${MIDOBJ}/viewalone.o: ${BOOK}
+ @ echo 3 making ${MIDOBJ}/viewalone.o from ${BOOK}
@ ( cd ${MIDINT} ; \
- ${TANGLE} -R"viewalone/viewalone.c" ${BOOK} >viewalone.c )
-
-${MIDOBJ}/viewalone.o: ${HEADERS} ${MIDINT}/viewalone.c
- @ echo 3 making ${MIDOBJ}/viewalone.o from ${MIDINT}/viewalone.c
+ ${TANGLE} -R"viewalone/viewalone.c" ${BOOK} >viewalone.c )
@ ( cd ${MIDOBJ} ; ${CC} -c ${CFLAGS} ${MIDINT}/viewalone.c )
-${MIDINT}/spooncomp.c: ${BOOK}
- @ echo 5 making ${MIDINT}/spooncomp.c from ${BOOK}
+${MIDOBJ}/spooncomp.o: ${BOOK}
+ @ echo 6 making ${MIDOBJ}/spooncomp.o from ${BOOK}
@ ( cd ${MIDINT} ; \
- ${TANGLE} -R"viewalone/spooncomp.c" ${BOOK} >spooncomp.c )
-
-${MIDOBJ}/spooncomp.o: ${HEADERS} ${MIDINT}/spooncomp.c
- @ echo 6 making ${MIDOBJ}/spooncomp.o from ${MIDINT}/spooncomp.c
+ ${TANGLE} -R"viewalone/spooncomp.c" ${BOOK} >spooncomp.c )
@ ( cd ${MIDOBJ} ; ${CC} -c ${CFLAGS} ${MIDINT}/spooncomp.c )
-${MIDINT}/spoon2d.c: ${BOOK}
- @ echo 8 making ${MIDINT}/spoon2d.c from ${BOOK}
+${MIDOBJ}/spoon2d.o: ${BOOK}
+ @ echo 9 making ${MIDOBJ}/spoon2d.o from ${BOOK}
@ ( cd ${MIDINT} ; \
- ${TANGLE} -R"viewalone/spoon2d.c" ${BOOK} >spoon2d.c )
-
-${MIDOBJ}/spoon2d.o: ${HEADERS} ${MIDINT}/spoon2d.c
- @ echo 9 making ${MIDOBJ}/spoon2d.o from ${MIDINT}/spoon2d.c
+ ${TANGLE} -R"viewalone/spoon2d.c" ${BOOK} >spoon2d.c )
@ ( cd ${MIDOBJ} ; ${CC} -c ${CFLAGS} ${MIDINT}/spoon2d.c )
${TESTFILE}: ${BOOK}
@@ -4331,7 +4303,7 @@ ${TESTFILE}: ${BOOK}
#include "util.h1"
-#include "all-alone.h1"
+<<include/all-alone.h1>>
/* #define huhDEBUG */
@@ -4659,7 +4631,7 @@ makeView2DFromFileData(view2DStruct *doView2D)
<<include/mode.h>>
#include "util.h1"
-#include "all-alone.h1"
+<<include/all-alone.h1>>
@@ -4893,7 +4865,7 @@ makeView3DFromFileData(int type)
#include <stdlib.h>
<<viewalone/viewalone.h>>
-#include "all-alone.h1"
+<<include/all-alone.h1>>
/************* global variables **************/
@@ -4970,9 +4942,9 @@ int main (int argc,char *argv[])
\section{viewalone.h}
<<viewalone/viewalone.h>>=
#include <stdio.h>
-#include "view3d.h"
-#include "view2d.h"
-#include "actions.h"
+<<include/view3d.h>>
+<<include/view2d.h>>
+<<include/actions.h>>
<<include/viewcommand.h>>
/* Viewport Commands */
@@ -5011,8 +4983,7 @@ extern char pathname[256];
#include <string.h>
<<view2d/header2.h>>
-#include "buttons2d.h1"
-#include "all-2d.h1"
+<<include/all-2d.h1>>
@@ -5697,9 +5668,8 @@ initButtons (buttonStruct *buttons)
#include <X11/Xutil.h>
<<view2d/header2.h>>
-#include "buttons2d.h1"
-#include "all-2d.h1"
-#include "gfun.h1"
+<<include/all-2d.h1>>
+<<include/gfun.h1>>
#include "xspadfill.h1"
#include "util.h1"
@@ -6306,7 +6276,7 @@ extern Atom wm_delete_window;
<<view2d/header2.h>>
-#include "all-2d.h1"
+<<include/all-2d.h1>>
#include "util.h1"
@@ -6431,13 +6401,13 @@ freeGraph(int i)
#define view2d
#include "hash.h"
-#include "nox10.h"
+<<include/nox10.h>>
<<include/view.h>>
-#include "view2d.h"
+<<include/view2d.h>>
<<include/actions.h>>
<<include/viewcommand.h>>
<<include/xdefs.h>>
-#include "override.h"
+<<include/override.h>>
<<include/g.h>>
#define carefullySetFont(gc,font) if (font != serverFont)
XSetFont(dsply,gc,font->fid)
@@ -6686,8 +6656,8 @@ typedef struct _xPointStruct {
#include "bsdsignal.h"
<<view2d/globals2.h>>
#include "bsdsignal.h1"
-#include "all-2d.h1"
-#include "gfun.h1"
+<<include/all-2d.h1>>
+<<include/gfun.h1>>
#include "util.h1"
#include "xspadfill.h1"
@@ -7142,15 +7112,9 @@ MIDOBJ= ${OBJ}/${SYS}/graph/view2d
LIB= ${OBJ}/${SYS}/lib
OUT= ${MNT}/${SYS}/lib
-# local include files shared by graphics
-LINC= ${SRC}/graph/include
-
-# global include files shared by everyone
-GINC= ${SRC}/include
-
LDFLAGS = ${LDF} ${STATIC} -lX11 -lm ${LDF}
-CFLAGS = ${CCF} -I${LINC} -I${GINC}
+CFLAGS = ${CCF} -I${SRC}/include
VIEW2D_OBJS= \
${MIDOBJ}/buttons2d.o ${MIDOBJ}/control2d.o ${MIDOBJ}/graph2d.o \
@@ -7166,7 +7130,7 @@ LIBFILES=${LIB}/bsdsignal.o ${LIB}/util.o
${LIB}/pixmap.o \
${LIB}/halloc.o ${LIB}/spadcolors.o ${LIB}/xspadfill.o \
${LIB}/xdither.o ${LIB}/xshade.o
-all: ${VIEW2D_OBJS} ${GDRAW_OBJS} ${LIBFILES} ${OUT}/view2d
+all: ${GDRAW_OBJS} ${LIBFILES} ${OUT}/view2d
@ echo 36 finished bookvol8 view2d
${OUT}/view2d: ${VIEW2D_OBJS} ${GDRAW_OBJS} ${LIBFILES}
@@ -7174,89 +7138,59 @@ ${OUT}/view2d: ${VIEW2D_OBJS} ${GDRAW_OBJS} ${LIBFILES}
@ ${CC} ${VIEW2D_OBJS} ${GDRAW_OBJS} ${LIBFILES} \
-o ${OUT}/view2d $(LDFLAGS)
-${MIDINT}/buttons2d.c: ${BOOK}
- @ echo 1 making ${MIDINT}/buttons2d.c from ${BOOK}
+${MIDOBJ}/buttons2d.o: ${BOOK}
+ @ echo 2 making ${MIDOBJ}/buttons2d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view2d/buttons2d.c" ${BOOK} >buttons2d.c )
-
-${MIDOBJ}/buttons2d.o: ${MIDINT}/buttons2d.c
- @ echo 2 making ${MIDOBJ}/buttons2d.o from ${MIDINT}/buttons2d.c
+ ${TANGLE} -R"view2d/buttons2d.c" ${BOOK} >buttons2d.c )
@ ( cd ${MIDOBJ} ; ${CC} -c ${CFLAGS} ${MIDINT}/buttons2d.c )
-${MIDINT}/control2d.c: ${BOOK}
- @ echo 4 making ${MIDINT}/control2d.c from ${BOOK}
+${MIDOBJ}/control2d.o: ${BOOK}
+ @ echo 5 making ${MIDOBJ}/control2d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view2d/control2d.c" ${BOOK} >control2d.c )
-
-${MIDOBJ}/control2d.o: ${MIDINT}/control2d.c
- @ echo 5 making ${MIDOBJ}/control2d.o from ${MIDINT}/control2d.c
+ ${TANGLE} -R"view2d/control2d.c" ${BOOK} >control2d.c )
@ ( cd ${MIDOBJ} ; ${CC} -c ${CFLAGS} ${MIDINT}/control2d.c )
-${MIDINT}/graph2d.c: ${BOOK}
- @ echo 7 making ${MIDINT}/graph2d.c from ${BOOK}
+${MIDOBJ}/graph2d.o: ${BOOK}
+ @ echo 8 making ${MIDOBJ}/graph2d.o from ${BOOK}
@( cd ${MIDINT} ; ${TANGLE} -R"view2d/graph2d.c" ${BOOK} >graph2d.c )
-
-${MIDOBJ}/graph2d.o: ${MIDINT}/graph2d.c
- @ echo 8 making ${MIDOBJ}/graph2d.o from ${MIDINT}/graph2d.c
@ ( cd ${MIDOBJ} ; ${CC} -c ${CFLAGS} ${MIDINT}/graph2d.c )
-${MIDINT}/main2d.c: ${BOOK}
- @ echo 10 making ${MIDINT}/main2d.c from ${BOOK}
+${MIDOBJ}/main2d.o: ${BOOK}
+ @ echo 11 making ${MIDOBJ}/main2d.o from ${BOOK}
@( cd ${MIDINT} ; ${TANGLE} -R"view2d/main2d.c" ${BOOK} >main2d.c )
-
-${MIDOBJ}/main2d.o: ${MIDINT}/main2d.c
- @ echo 11 making ${MIDOBJ}/main2d.o from ${MIDINT}/main2d.c
@ ( cd ${MIDOBJ} ; ${CC} -c ${CFLAGS} ${MIDINT}/main2d.c )
-${MIDINT}/pot2d.c: ${BOOK}
- @ echo 13 making ${MIDINT}/pot2d.c from ${BOOK}
+${MIDOBJ}/pot2d.o: ${BOOK}
+ @ echo 14 making ${MIDOBJ}/pot2d.o from ${BOOK}
@( cd ${MIDINT} ; ${TANGLE} -R"view2d/pot2d.c" ${BOOK} >pot2d.c )
-
-${MIDOBJ}/pot2d.o: ${MIDINT}/pot2d.c
- @ echo 14 making ${MIDOBJ}/pot2d.o from ${MIDINT}/pot2d.c
@ ( cd ${MIDOBJ} ; ${CC} -c ${CFLAGS} ${MIDINT}/pot2d.c )
-${MIDINT}/process2d.c: ${BOOK}
- @ echo 16 making ${MIDINT}/process2d.c from ${BOOK}
+${MIDOBJ}/process2d.o: ${BOOK}
+ @ echo 17 making ${MIDOBJ}/process2d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view2d/process2d.c" ${BOOK} >process2d.c )
-
-${MIDOBJ}/process2d.o: ${MIDINT}/process2d.c
- @ echo 17 making ${MIDOBJ}/process2d.o from ${MIDINT}/process2d.c
+ ${TANGLE} -R"view2d/process2d.c" ${BOOK} >process2d.c )
@ ( cd ${MIDOBJ} ; ${CC} -c ${CFLAGS} ${MIDINT}/process2d.c )
-${MIDINT}/spadaction2d.c: ${BOOK}
- @ echo 19 making ${MIDINT}/spadaction2d.c from ${BOOK}
+${MIDOBJ}/spadaction2d.o: ${BOOK}
+ @ echo 20 making ${MIDOBJ}/spadaction2d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view2d/spadaction2d.c" ${BOOK} >spadaction2d.c )
-
-${MIDOBJ}/spadaction2d.o: ${MIDINT}/spadaction2d.c
- @ echo 20 making ${MIDOBJ}/spadaction2d.o from ${MIDINT}/spadaction2d.c
+ ${TANGLE} -R"view2d/spadaction2d.c" ${BOOK} >spadaction2d.c )
@ ( cd ${MIDOBJ} ; ${CC} -c ${CFLAGS} ${MIDINT}/spadaction2d.c )
-${MIDINT}/stuff2d.c: ${BOOK}
- @ echo 25 making ${MIDINT}/stuff2d.c from ${BOOK}
+${MIDOBJ}/stuff2d.o: ${BOOK}
+ @ echo 26 making ${MIDOBJ}/stuff2d.o from ${BOOK}
@( cd ${MIDINT} ; ${TANGLE} -R"view2d/stuff2d.c" ${BOOK} >stuff2d.c )
-
-${MIDOBJ}/stuff2d.o: ${MIDINT}/stuff2d.c
- @ echo 26 making ${MIDOBJ}/stuff2d.o from ${MIDINT}/stuff2d.c
@ ( cd ${MIDOBJ} ; ${CC} -c ${CFLAGS} ${MIDINT}/stuff2d.c )
-${MIDINT}/viewport2d.c: ${BOOK}
- @ echo 28 making ${MIDINT}/viewport2d.c from ${BOOK}
+${MIDOBJ}/viewport2d.o: ${BOOK}
+ @ echo 29 making ${MIDOBJ}/viewport2d.o from ${BOOK}
@( cd ${MIDINT} ; \
${TANGLE} -R"view2d/viewport2d.c" ${BOOK} >viewport2d.c )
-
-${MIDOBJ}/viewport2d.o: ${MIDINT}/viewport2d.c
- @ echo 29 making ${MIDOBJ}/viewport2d.o from ${MIDINT}/viewport2d.c
@ ( cd ${MIDOBJ} ; ${CC} -c ${CFLAGS} ${MIDINT}/viewport2d.c )
-${MIDINT}/write2d.c: ${BOOK}
- @ echo 31 making ${MIDINT}/write2d.c from ${IN}/write2d.c.pamphlet
+${MIDOBJ}/write2d.o: ${BOOK}
+ @ echo 32 making ${MIDOBJ}/write2d.o from ${BOOK}
@( cd ${MIDINT} ; ${TANGLE} -R"view2d/write2d.c" ${BOOK} >write2d.c )
-
-${MIDOBJ}/write2d.o: ${MIDINT}/write2d.c ${LINC}/write.h
- @ echo 32 making ${MIDOBJ}/write2d.o from ${MIDINT}/write2d.c
@ ( cd ${MIDOBJ} ; ${CC} -c ${CFLAGS} ${MIDINT}/write2d.c )
@
@@ -7266,7 +7200,7 @@ ${MIDOBJ}/write2d.o: ${MIDINT}/write2d.c ${LINC}/write.h
<<view2d/header2.h>>
-#include "all-2d.h1"
+<<include/all-2d.h1>>
mouseCoord
getPotValue(short eX,short eY,short xH,short yH)
@@ -7301,9 +7235,9 @@ getPotValue(short eX,short eY,short xH,short yH)
<<view2d/header2.h>>
-#include "all-2d.h1"
+<<include/all-2d.h1>>
#include "util.h1"
-#include "gfun.h1"
+<<include/gfun.h1>>
#include "xspadfill.h1"
@@ -8165,7 +8099,7 @@ clickedOnGraph (int i,int bKey)
<<view2d/header2.h>>
-#include "all-2d.h1"
+<<include/all-2d.h1>>
#include "util.h1"
@@ -8420,8 +8354,8 @@ spadAction(void)
<<view2d/header2.h>>
-#include "all-2d.h1"
-#include "gfun.h1"
+<<include/all-2d.h1>>
+<<include/gfun.h1>>
#include "util.h1"
@@ -8512,8 +8446,8 @@ goodbye(int sig)
<<view2d/header2.h>>
-#include "all-2d.h1"
-#include "gfun.h1"
+<<include/all-2d.h1>>
+<<include/gfun.h1>>
#include "util.h1"
#include "xspadfill.h1"
@@ -9163,9 +9097,9 @@ makeView2D(view2DStruct *viewdata)
<<view2d/header2.h>>
<<include/write.h>>
-#include "all-2d.h1"
+<<include/all-2d.h1>>
#include "pixmap.h1"
-#include "gfun.h1"
+<<include/gfun.h1>>
#define numBits (8*sizeof(int))
@@ -9328,7 +9262,7 @@ writeViewport(int thingsToWrite)
<<view3d/header.h>>
<<view3d/cpanel.h>>
-#include "all-3d.h1"
+<<include/all-3d.h1>>
#define BH 31 /* button window height */
#define PH 80 /* potentiometer window height */
#define XEDGE 5 /* leftmost button starts here */
@@ -9720,8 +9654,8 @@ initButtons (buttonStruct *buttons)
<<view3d/header.h>>
#include "util.h1"
-#include "gfun.h1"
-#include "all-3d.h1"
+<<include/gfun.h1>>
+<<include/all-3d.h1>>
@@ -9777,11 +9711,11 @@ closeViewport (void)
<<view3d/header.h>>
<<view3d/draw.h>>
-#include "gfun.h1"
+<<include/gfun.h1>>
#include "util.h1"
#include "xspadfill.h1"
-#include "all-3d.h1"
+<<include/all-3d.h1>>
#define axisLength 1.0 /* use 100.0, if data is not to be normalized */
@@ -12224,8 +12158,8 @@ update_contour_latitude(void)
#include "util.h1"
#include "xshade.h1"
#include "xspadfill.h1"
-#include "gfun.h1"
-#include "all-3d.h1"
+<<include/gfun.h1>>
+<<include/all-3d.h1>>
/* Defines the pixmap for the arrow displayed in the scale window */
#define zoomArrowN 11
@@ -13497,11 +13431,11 @@ extern Atom wm_delete_window;
<<include/view.h>>
-#include "view3d.h"
-#include "actions.h"
+<<include/view3d.h>>
+<<include/actions.h>>
<<include/viewcommand.h>>
<<include/xdefs.h>>
-#include "override.h"
+<<include/override.h>>
<<include/g.h>>
#define swap(a,b) {a^=b; b^=a; a^=b;}
@@ -13835,7 +13769,7 @@ typedef struct _controlXY {
<<view3d/header.h>>
<<view3d/draw.h>>
-#include "all-3d.h1"
+<<include/all-3d.h1>>
/***********************
* void phong(pt,N) *
@@ -13989,7 +13923,7 @@ hlsTOrgb(float h,float l,float s)
<<view3d/header.h>>
<<view3d/cpanel.h>>
-#include "all-3d.h1"
+<<include/all-3d.h1>>
/*****************************************************
* int initLightButtons (lightButtons) *
* *
@@ -14113,9 +14047,9 @@ initLightButtons (buttonStruct *lightButtons)
<<view3d/cpanel.h>>
<<view3d/volume.h>>
-#include "gfun.h1"
+<<include/gfun.h1>>
#include "xspadfill.h1"
-#include "all-3d.h1"
+<<include/all-3d.h1>>
#define lightMASK ExposureMask
#define lightCursorForeground lightingTitleColor
@@ -14670,10 +14604,10 @@ drawLightingPanel(void)
#include "bsdsignal.h1"
#include "util.h1"
-#include "gfun.h1"
+<<include/gfun.h1>>
#include "xspadfill.h1"
#include "xshade.h1"
-#include "all-3d.h1"
+<<include/all-3d.h1>>
/**********************/
/** global variables **/
@@ -15267,14 +15201,7 @@ DOC= ${MNT}/${SYS}/doc/src/graph
LIB= ${OBJ}/${SYS}/lib
GDRAW= ${OBJ}/${SYS}/graph/gdraws
-# local include files shared by graphics
-LINC= ${SRC}/graph/include
-
-# global include files shared by everyone
-GINC= ${SRC}/include
-
-
-CFLAGS = ${CCF} -I${LINC} -I${GINC}
+CFLAGS = ${CCF} -I${SRC}/include
LDFLAGS = ${LDF} ${STATIC} -lX11 -lm
OBJS = \
@@ -15290,246 +15217,167 @@ OBJS = \
GDRAW_OBJS = ${GDRAW}/gfun.o ${OBJ}/${SYS}/lib/hash.o
-all: ${OBJS} ${GDRAW_OBJS} ${OUT}/view3d ${DOCFILES}
- @echo 78 finished bookvol8 view3d
+all: ${OUT}/view3d
+ @echo 78 finished view3d from bookvol8
+
+${OUT}/view3d: ${OBJS} ${GDRAW_OBJS} ${LIB}/bsdsignal.o ${LIB}/util.o \
+ ${LIB}/xshade.o ${LIB}/halloc.o ${LIB}/pixmap.o \
+ ${LIB}/spadcolors.o ${LIB}/xspadfill.o ${LIB}/xdither.o
+ @ echo 76 linking ${OUT}/view3d $(LDFLAGS)
+ @ ${CC} ${OBJS} ${GDRAW_OBJS} ${LIB}/bsdsignal.o \
+ ${LIB}/util.o ${LIB}/xshade.o ${LIB}/halloc.o \
+ ${LIB}/pixmap.o ${LIB}/spadcolors.o ${LIB}/xspadfill.o \
+ ${LIB}/xdither.o -o ${OUT}/view3d $(LDFLAGS) -lXpm
-${MIDINT}/buttons3d.c: ${BOOK}
- @ echo 1 ${MIDINT}/buttons3d.c from ${BOOK}
+${MIDOBJ}/buttons3d.o: ${BOOK}
+ @ echo 2 making ${MIDOBJ}/buttons3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/buttons3d.c" ${BOOK} >buttons3d.c )
-
-${MIDOBJ}/buttons3d.o: ${MIDINT}/buttons3d.c
- @ echo 2 making ${MIDOBJ}/buttons3d.o from ${MIDINT}/buttons3d.c
- ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/buttons3d.c )
+ ${TANGLE} -R"view3d/buttons3d.c" ${BOOK} >buttons3d.c )
+ @ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/buttons3d.c )
-${MIDINT}/closeview3d.c: ${BOOK}
- @ echo 4 ${MIDINT}/closeview3d.c from ${BOOK}
+${MIDOBJ}/closeview3d.o: ${BOOK}
+ @ echo 5 making ${MIDOBJ}/closeview3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/closeview3d.c" ${BOOK} >closeview3d.c )
-
-${MIDOBJ}/closeview3d.o: ${MIDINT}/closeview3d.c
- @ echo 5 making ${MIDOBJ}/closeview3d.o from ${MIDINT}/closeview3d.c
+ ${TANGLE} -R"view3d/closeview3d.c" ${BOOK} >closeview3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/closeview3d.c )
-${MIDINT}/component3d.c: ${BOOK}
- @ echo 7 ${MIDINT}/component3d.c from ${BOOK}
+${MIDOBJ}/component3d.o: ${BOOK}
+ @ echo 8 making ${MIDOBJ}/component3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/component3d.c" ${BOOK} >component3d.c )
-
-${MIDOBJ}/component3d.o: ${MIDINT}/component3d.c
- @ echo 8 making ${MIDOBJ}/component3d.o from ${MIDINT}/component3d.c
+ ${TANGLE} -R"view3d/component3d.c" ${BOOK} >component3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/component3d.c )
-${MIDINT}/control3d.c: ${BOOK}
- @ echo 10 ${MIDINT}/control3d.c from ${BOOK}
+${MIDOBJ}/control3d.o: ${BOOK}
+ @ echo 11 making ${MIDOBJ}/control3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/control3d.c" ${BOOK} >control3d.c )
-
-${MIDOBJ}/control3d.o: ${MIDINT}/control3d.c
- @ echo 11 making ${MIDOBJ}/control3d.o from ${MIDINT}/control3d.c
+ ${TANGLE} -R"view3d/control3d.c" ${BOOK} >control3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/control3d.c )
-${MIDINT}/illuminate3d.c: ${BOOK}
- @ echo 13 ${MIDINT}/illuminate3d.c from ${BOOK}
+${MIDOBJ}/illuminate3d.o: ${BOOK}
+ @ echo 14 making ${MIDOBJ}/illuminate3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/illuminate3d.c" ${BOOK} >illuminate3d.c )
-
-${MIDOBJ}/illuminate3d.o: ${MIDINT}/illuminate3d.c
- @ echo 14 making ${MIDOBJ}/illuminate3d.o from ${MIDINT}/illuminate3d.c
+ ${TANGLE} -R"view3d/illuminate3d.c" ${BOOK} >illuminate3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/illuminate3d.c )
-${MIDINT}/lightbut3d.c: ${BOOK}
- @ echo 16 ${MIDINT}/lightbut3d.c from ${BOOK}
+${MIDOBJ}/lightbut3d.o: ${BOOK}
+ @ echo 17 making ${MIDOBJ}/lightbut3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/lightbut3d.c" ${BOOK} >lightbut3d.c )
-
-${MIDOBJ}/lightbut3d.o: ${MIDINT}/lightbut3d.c
- @ echo 17 making ${MIDOBJ}/lightbut3d.o from ${MIDINT}/lightbut3d.c
+ ${TANGLE} -R"view3d/lightbut3d.c" ${BOOK} >lightbut3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/lightbut3d.c )
-${MIDINT}/lighting3d.c: ${BOOK}
- @ echo 19 ${MIDINT}/lighting3d.c from ${BOOK}
+${MIDOBJ}/lighting3d.o: ${BOOK}
+ @ echo 20 making ${MIDOBJ}/lighting3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/lighting3d.c" ${BOOK} >lighting3d.c )
-
-${MIDOBJ}/lighting3d.o: ${MIDINT}/lighting3d.c
- @ echo 20 making ${MIDOBJ}/lighting3d.o from ${MIDINT}/lighting3d.c
+ ${TANGLE} -R"view3d/lighting3d.c" ${BOOK} >lighting3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/lighting3d.c )
-${MIDINT}/main3d.c: ${BOOK}
- @ echo 22 ${MIDINT}/main3d.c from ${BOOK}
+${MIDOBJ}/main3d.o: ${BOOK}
+ @ echo 23 making ${MIDOBJ}/main3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/main3d.c" ${BOOK} >main3d.c )
-
-${MIDOBJ}/main3d.o: ${MIDINT}/main3d.c
- @ echo 23 making ${MIDOBJ}/main3d.o from ${MIDINT}/main3d.c
+ ${TANGLE} -R"view3d/main3d.c" ${BOOK} >main3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/main3d.c )
-${MIDINT}/mesh3d.c: ${BOOK}
- @ echo 25 ${MIDINT}/mesh3d.c from ${BOOK}
+${MIDOBJ}/mesh3d.o: ${BOOK}
+ @ echo 26 making ${MIDOBJ}/mesh3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/mesh3d.c" ${BOOK} >mesh3d.c )
-
-${MIDOBJ}/mesh3d.o: ${MIDINT}/mesh3d.c
- @ echo 26 making ${MIDOBJ}/mesh3d.o from ${MIDINT}/mesh3d.c
+ ${TANGLE} -R"view3d/mesh3d.c" ${BOOK} >mesh3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/mesh3d.c )
-${MIDINT}/msort3d.c: ${BOOK}
- @ echo 28 ${MIDINT}/msort3d.c from ${BOOK}
+${MIDOBJ}/msort3d.o: ${BOOK}
+ @ echo 29 making ${MIDOBJ}/msort3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/msort3d.c" ${BOOK} >msort3d.c )
-
-${MIDOBJ}/msort3d.o: ${MIDINT}/msort3d.c
- @ echo 29 making ${MIDOBJ}/msort3d.o from ${MIDINT}/msort3d.c
+ ${TANGLE} -R"view3d/msort3d.c" ${BOOK} >msort3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/msort3d.c )
-${MIDINT}/pot3d.c: ${BOOK}
- @ echo 31 ${MIDINT}/pot3d.c from ${BOOK}
+${MIDOBJ}/pot3d.o: ${BOOK}
+ @ echo 32 making ${MIDOBJ}/pot3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/pot3d.c" ${BOOK} >pot3d.c )
-
-${MIDOBJ}/pot3d.o: ${MIDINT}/pot3d.c
- @ echo 32 making ${MIDOBJ}/pot3d.o from ${MIDINT}/pot3d.c
+ ${TANGLE} -R"view3d/pot3d.c" ${BOOK} >pot3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/pot3d.c )
-${MIDINT}/process3d.c: ${BOOK}
- @ echo 34 ${MIDINT}/process3d.c from ${BOOK}
+${MIDOBJ}/process3d.o: ${BOOK}
+ @ echo 35 making ${MIDOBJ}/process3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/process3d.c" ${BOOK} >process3d.c )
-
-${MIDOBJ}/process3d.o: ${MIDINT}/process3d.c
- @ echo 35 making ${MIDOBJ}/process3d.o from ${MIDINT}/process3d.c
+ ${TANGLE} -R"view3d/process3d.c" ${BOOK} >process3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/process3d.c )
-${MIDINT}/project3d.c: ${BOOK}
- @ echo 37 ${MIDINT}/project3d.c from ${BOOK}
+${MIDOBJ}/project3d.o: ${BOOK}
+ @ echo 38 making ${MIDOBJ}/project3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/project3d.c" ${BOOK} >project3d.c )
-
-${MIDOBJ}/project3d.o: ${MIDINT}/project3d.c
- @ echo 38 making ${MIDOBJ}/project3d.o from ${MIDINT}/project3d.c
+ ${TANGLE} -R"view3d/project3d.c" ${BOOK} >project3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/project3d.c )
-${MIDINT}/quitbut3d.c: ${BOOK}
- @ echo 40 ${MIDINT}/quitbut3d.c from ${BOOK}
- @( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/quitbut3d.c" ${BOOK} >quitbut3d.c )
-
-${MIDOBJ}/quitbut3d.o: ${MIDINT}/quitbut3d.c
+${MIDOBJ}/quitbut3d.o: ${BOOK}
@ echo 41 making ${MIDOBJ}/quitbut3d.o from ${MIDINT}/quitbut3d.c
+ @( cd ${MIDINT} ; \
+ ${TANGLE} -R"view3d/quitbut3d.c" ${BOOK} >quitbut3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/quitbut3d.c )
-${MIDINT}/quit3d.c: ${BOOK}
- @ echo 43 ${MIDINT}/quit3d.c from ${BOOK}
+${MIDOBJ}/quit3d.o: ${BOOK}
+ @ echo 44 making ${MIDOBJ}/quit3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/quit3d.c" ${BOOK} >quit3d.c )
-
-${MIDOBJ}/quit3d.o: ${MIDINT}/quit3d.c
- @ echo 44 making ${MIDOBJ}/quit3d.o from ${MIDINT}/quit3d.c
+ ${TANGLE} -R"view3d/quit3d.c" ${BOOK} >quit3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/quit3d.c )
-${MIDINT}/save3d.c: ${BOOK}
- @ echo 46 ${MIDINT}/save3d.c from ${BOOK}
+${MIDOBJ}/save3d.o: ${BOOK}
+ @ echo 47 making ${MIDOBJ}/savebut3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/save3d.c" ${BOOK} >save3d.c )
-
-${MIDOBJ}/save3d.o: ${MIDINT}/save3d.c
- @ echo 47 making ${MIDOBJ}/savebut3d.o from ${MIDINT}/savebut3d.c
+ ${TANGLE} -R"view3d/save3d.c" ${BOOK} >save3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/save3d.c )
-${MIDINT}/savebut3d.c: ${BOOK}
- @ echo 49 ${MIDINT}/savebut3d.c from ${BOOK}
+${MIDOBJ}/savebut3d.o: ${BOOK}
+ @ echo 50 making ${MIDOBJ}/savebutbut3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/savebut3d.c" ${BOOK} >savebut3d.c )
-
-${MIDOBJ}/savebut3d.o: ${MIDINT}/savebut3d.c
- @ echo 50 making ${MIDOBJ}/savebutbut3d.o from ${MIDINT}/savebutbut3d.c
+ ${TANGLE} -R"view3d/savebut3d.c" ${BOOK} >savebut3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/savebut3d.c )
-${MIDINT}/smoothshade3d.c: ${BOOK}
- @ echo 52 ${MIDINT}/smoothshade3d.c from ${BOOK}
+${MIDOBJ}/smoothshade3d.o: ${BOOK}
+ @ echo 53 making ${MIDOBJ}/smoothShadebut3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/smoothshade3d.c" ${BOOK} >smoothshade3d.c )
-
-${MIDOBJ}/smoothshade3d.o: ${MIDINT}/smoothshade3d.c
- @ echo 53 making ${MIDOBJ}/smoothShadebut3d.o \
- from ${MIDINT}/smoothShadebut3d.c
+ ${TANGLE} -R"view3d/smoothshade3d.c" ${BOOK} >smoothshade3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/smoothshade3d.c )
-${MIDINT}/spadaction3d.c: ${BOOK}
- @ echo 55 ${MIDINT}/spadaction3d.c from ${BOOK}
+${MIDOBJ}/spadaction3d.o: ${BOOK}
+ @ echo 56 making ${MIDOBJ}/spadActionbut3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/spadaction3d.c" ${BOOK} >spadaction3d.c )
-
-${MIDOBJ}/spadaction3d.o: ${MIDINT}/spadaction3d.c
- @ echo 56 making ${MIDOBJ}/spadActionbut3d.o \
- from ${MIDINT}/spadActionbut3d.c
+ ${TANGLE} -R"view3d/spadaction3d.c" ${BOOK} >spadaction3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/spadaction3d.c )
-${MIDINT}/stuff3d.c: ${BOOK}
- @ echo 58 ${MIDINT}/stuff3d.c from ${BOOK}
+${MIDOBJ}/stuff3d.o: ${BOOK}
+ @ echo 59 making ${MIDOBJ}/stuffbut3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/stuff3d.c" ${BOOK} >stuff3d.c )
-
-${MIDOBJ}/stuff3d.o: ${MIDINT}/stuff3d.c
- @ echo 59 making ${MIDOBJ}/stuffbut3d.o from ${MIDINT}/stuffbut3d.c
+ ${TANGLE} -R"view3d/stuff3d.c" ${BOOK} >stuff3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/stuff3d.c )
-${MIDINT}/surface3d.c: ${BOOK}
- @ echo 61 ${MIDINT}/surface3d.c from ${BOOK}
+${MIDOBJ}/surface3d.o: ${BOOK}
+ @ echo 62 making ${MIDOBJ}/surfacebut3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/surface3d.c" ${BOOK} >surface3d.c )
-
-${MIDOBJ}/surface3d.o: ${MIDINT}/surface3d.c
- @ echo 62 making ${MIDOBJ}/surfacebut3d.o from ${MIDINT}/surfacebut3d.c
+ ${TANGLE} -R"view3d/surface3d.c" ${BOOK} >surface3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/surface3d.c )
-${MIDINT}/transform3d.c: ${BOOK}
- @ echo 64 ${MIDINT}/transform3d.c from ${BOOK}
+${MIDOBJ}/transform3d.o: ${BOOK}
+ @ echo 65 making ${MIDOBJ}/transformbut3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/transform3d.c" ${BOOK} >transform3d.c )
-
-${MIDOBJ}/transform3d.o: ${MIDINT}/transform3d.c
- @ echo 65 making ${MIDOBJ}/transformbut3d.o \
- from ${MIDINT}/transformbut3d.c
+ ${TANGLE} -R"view3d/transform3d.c" ${BOOK} >transform3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/transform3d.c )
-${MIDINT}/viewport3d.c: ${BOOK}
- @ echo 67 ${MIDINT}/viewport3d.c from ${BOOK}
+${MIDOBJ}/viewport3d.o: ${BOOK}
+ @ echo 68 making ${MIDOBJ}/viewportbut3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/viewport3d.c" ${BOOK} >viewport3d.c )
-
-${MIDOBJ}/viewport3d.o: ${MIDINT}/viewport3d.c
- @ echo 68 making ${MIDOBJ}/viewportbut3d.o \
- from ${MIDINT}/viewportbut3d.c
+ ${TANGLE} -R"view3d/viewport3d.c" ${BOOK} >viewport3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/viewport3d.c )
-${MIDINT}/volume3d.c: ${BOOK}
- @ echo 70 ${MIDINT}/volume3d.c from ${BOOK}
+${MIDOBJ}/volume3d.o: ${BOOK}
+ @ echo 71 making ${MIDOBJ}/volumebut3d.o from ${BOOK}
@( cd ${MIDINT} ; \
- ${TANGLE} -R"view3d/volume3d.c" ${BOOK} >volume3d.c )
-
-${MIDOBJ}/volume3d.o: ${MIDINT}/volume3d.c
- @ echo 71 making ${MIDOBJ}/volumebut3d.o from ${MIDINT}/volumebut3d.c
+ ${TANGLE} -R"view3d/volume3d.c" ${BOOK} >volume3d.c )
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/volume3d.c )
-${MIDINT}/write3d.c: ${BOOK}
- @ echo 73 ${MIDINT}/write3d.c from ${BOOK}
+${MIDOBJ}/write3d.o: ${BOOK}
+ @ echo 74 making ${MIDOBJ}/writebut3d.o from ${BOOK}
@( cd ${MIDINT} ; ${TANGLE} -R"view3d/write3d.c" ${BOOK} >write3d.c )
-
-${MIDOBJ}/write3d.o: ${MIDINT}/write3d.c
- @ echo 74 making ${MIDOBJ}/writebut3d.o from ${MIDINT}/writebut3d.c
@ ( cd ${MIDOBJ} ; ${CC} ${CFLAGS} -c ${MIDINT}/write3d.c )
-${OUT}/view3d: ${OBJS} ${GDRAW_OBJS} ${LIB}/bsdsignal.o ${LIB}/util.o \
- ${LIB}/xshade.o ${LIB}/halloc.o ${LIB}/pixmap.o \
- ${LIB}/spadcolors.o ${LIB}/xspadfill.o ${LIB}/xdither.o
- @ echo 76 linking ${OUT}/view3d $(LDFLAGS)
- @ ${CC} ${OBJS} ${GDRAW_OBJS} ${LIB}/bsdsignal.o \
- ${LIB}/util.o ${LIB}/xshade.o ${LIB}/halloc.o \
- ${LIB}/pixmap.o ${LIB}/spadcolors.o ${LIB}/xspadfill.o \
- ${LIB}/xdither.o -o ${OUT}/view3d $(LDFLAGS) -lXpm
-
@
\section{mesh3d.c}
<<view3d/mesh3d.c>>=
@@ -15537,7 +15385,7 @@ ${OUT}/view3d: ${OBJS} ${GDRAW_OBJS} ${LIB}/bsdsignal.o
${LIB}/util.o \
#include <math.h>
<<view3d/header.h>>
-#include "all-3d.h1"
+<<include/all-3d.h1>>
/***************************************************************************
*** void getMeshNormal(x0,y0,z0,x1,y1,z1,x2,y2,z2,zMin,zRange,Normal); ***
@@ -15667,7 +15515,7 @@ dotProduct(float * a,float *b,int size)
<<view3d/header.h>>
-#include "all-3d.h1"
+<<include/all-3d.h1>>
#define linkThing poly
@@ -15754,7 +15602,7 @@ msort(linkThing *p,int min,int max,int
(*compare)(linkThing *, linkThing *))
#define _POT3D_C
<<view3d/header.h>>
-#include "all-3d.h1"
+<<include/all-3d.h1>>
/****************************/
/*** void getPotValue() ***/
@@ -15825,11 +15673,11 @@ getLinearPotValue(short eX,short eY,short xH,short yH)
#include "util.h1"
-#include "gfun.h1"
+<<include/gfun.h1>>
#include "pixmap.h1"
#include "xshade.h1"
#include "xspadfill.h1"
-#include "all-3d.h1"
+<<include/all-3d.h1>>
#define inside(A,B) (((XButtonEvent *)event)->x >= A && \
((XButtonEvent *)event)->x <= B)
@@ -17384,7 +17232,7 @@ processEvents(void)
<<view3d/draw.h>>
<<include/mode.h>>
-#include "all-3d.h1"
+<<include/all-3d.h1>>
/*******************************************
* void project(aViewTriple,someXpoints,i) *
@@ -17746,9 +17594,9 @@ projectStuff(float x,float y,float z,int *px,int
*py,float *Pz)
<<include/purty/volume.mask>>
#include "util.h1"
-#include "gfun.h1"
+<<include/gfun.h1>>
#include "xspadfill.h1"
-#include "all-3d.h1"
+<<include/all-3d.h1>>
#define quitMASK ExposureMask
#define quitCursorForeground monoColor(55)
@@ -17872,7 +17720,7 @@ drawQuitPanel(void)
<<view3d/header.h>>
<<view3d/cpanel.h>>
-#include "all-3d.h1"
+<<include/all-3d.h1>>
@@ -17927,9 +17775,9 @@ initQuitButtons (buttonStruct *quitButtons)
<<include/purty/volume.bitmap>>
<<include/purty/volume.mask>>
-#include "gfun.h1"
+<<include/gfun.h1>>
#include "xspadfill.h1"
-#include "all-3d.h1"
+<<include/all-3d.h1>>
#define saveMASK ExposureMask
#define saveCursorForeground monoColor(55)
@@ -18048,7 +17896,7 @@ drawSavePanel(void)
<<view3d/header.h>>
<<view3d/cpanel.h>>
-#include "all-3d.h1"
+<<include/all-3d.h1>>
int
initSaveButtons (buttonStruct *saveButtons)
{
@@ -18112,13 +17960,13 @@ initSaveButtons (buttonStruct *saveButtons)
<<view3d/header.h>>
<<view3d/draw.h>>
<<view3d/volume.h>>
-#include "mode.h" /* for #define components */
+<<include/mode.h>>
#include "spadcolors.h1"
-#include "gfun.h1"
+<<include/gfun.h1>>
#include "util.h1"
#include "xspadfill.h1"
-#include "all-3d.h1"
+<<include/all-3d.h1>>
#define SAFE_VALUE 892347
@@ -19103,7 +18951,7 @@ drawPhong(int dFlag)
<<view3d/draw.h>>
#include "util.h1"
-#include "all-3d.h1"
+<<include/all-3d.h1>>
int
readViewman (void *info,int size)
@@ -19495,11 +19343,11 @@ static float labels[basicScreen][7] = {
-#include "gfun.h1"
+<<include/gfun.h1>>
/*#include "spadcolors.h"*/
#include "util.h1"
-#include "all-3d.h1"
+<<include/all-3d.h1>>
/*****************************
*** traverse(n) ***
*** returns the nth point ***
@@ -19623,8 +19471,8 @@ goodbye(int sig)
#include "xspadfill.h1"
#include "xshade.h1"
#include "util.h1"
-#include "gfun.h1"
-#include "all-3d.h1"
+<<include/gfun.h1>>
+<<include/all-3d.h1>>
/**** useful defines ****/
@@ -20363,10 +20211,10 @@ equal (float x,float y)
#include "bsdsignal.h1"
#include "util.h1"
-#include "gfun.h1"
+<<include/gfun.h1>>
#include "xspadfill.h1"
#include "xshade.h1"
-#include "all-3d.h1"
+<<include/all-3d.h1>>
<<include/purty/spadbitmap.bitmap>>
<<include/purty/spadmask.mask>>
@@ -20917,7 +20765,7 @@ main(void)
<<view3d/header.h>>
-#include "all-3d.h1"
+<<include/all-3d.h1>>
void
matrixMultiply4x4(float xxA[4][4],float xxB[4][4],float array[4][4])
@@ -21032,9 +20880,9 @@ TRANSLATE(float x,float y,float z,float xxT[4][4])
<<include/mode.h>>
#include "util.h1"
-#include "gfun.h1"
+<<include/gfun.h1>>
#include "xspadfill.h1"
-#include "all-3d.h1"
+<<include/all-3d.h1>>
#define axesOffset 5
@@ -21883,8 +21731,8 @@ keepDrawingViewport(void)
#include "xspadfill.h1"
-#include "gfun.h1"
-#include "all-3d.h1"
+<<include/gfun.h1>>
+<<include/all-3d.h1>>
#define eyeDistMessX (frusX(eyeWinX+27))
#define eyeDistMessY (frusY(eyeWinY-5))
@@ -22824,9 +22672,9 @@ drawVolumePanel (void)
#include "pixmap.h1"
#include "xshade.h1"
-#include "gfun.h1"
+<<include/gfun.h1>>
-#include "all-3d.h1"
+<<include/all-3d.h1>>
/* upper limit as to how many kinds of files could be written (numBits-1) */
#define numBits (8*sizeof(int))
@@ -23105,8 +22953,8 @@ units on the axes.
/* Data file to test out Gdraw functions */
<<gdraws/gdraws0.h>>
-#include "../view3d/header.h"
-#include "nox10.h"
+<<view3d/header.h>>
+<<include/nox10.h>>
extern GC gc, gc1;
@@ -23389,7 +23237,7 @@ extern char *envAXIOM; /* environment
variable AXIOM or DEVE */
#include "hash.h"
#include "hash.h1"
-#include "gfun.h1"
+<<include/gfun.h1>>
/*
@@ -24691,7 +24539,7 @@ Gdraws_load_font(XFontStruct **font_info, char
*fontname)
/* main procedure to test out Gdraw functions in this directory */
#include <stdio.h>
<<gdraws/gdraws0.h>>
-#include "../view3d/header.h"
+<<view3d/header.h>>
GC gc, gc1;
Display *dsply;
@@ -24857,28 +24705,9 @@ MIDOBJ= ${OBJ}/${SYS}/graph/gdraws
OUT= ${MNT}/${SYS}/lib
PS= ${MNT}/${SYS}/lib/graph
-# local include files shared by graphics
-LINC= ${SRC}/graph/include
-
-# global include files shared by everyone
-GINC= ${SRC}/include
+CFLAGS = ${CCF} -I${SRC}/include -I${SRC}/hyper
-# include files in Hyperdoc
-HINC= ${SRC}/hyper
-
-# bitmaps for cursors
-BIT= ${SRC}/graph/include/bitmaps
-
-# a .h file stuck in a really wierd place
-DOTH= ${SRC}/graph/viewman
-
-# a .c file in the library subdirectory
-DOTC= ${SRC}/lib
-
-CFLAGS = ${CCF} -I${LINC} -I${GINC} -I${HINC}
-
-HEADERS = ${LINC}/g.h ${LINC}/gfun.h1 \
- ${GINC}/hash.h ${GINC}/hash.h1
+HEADERS = ${SRC}/include/hash.h ${SRC}/include/hash.h1
PSFiles= ${PS}/colorpoly.ps ${PS}/colorwol.ps ${PS}/draw.ps \
${PS}/drawIstr.ps ${PS}/drawarc.ps ${PS}/drawcolor.ps \
@@ -24890,12 +24719,9 @@ PSFiles= ${PS}/colorpoly.ps ${PS}/colorwol.ps
${PS}/draw.ps \
all: ${MIDOBJ}/gfun.o ${PSFiles}
@ echo 21 finished making gdraws from ${BOOK}
-${MIDINT}/gfun.c: ${BOOK}
- @ echo 1 making ${MIDINT}/gfun.c from ${BOOK}
+${MIDOBJ}/gfun.o: ${HEADERS} ${BOOK}
+ @ echo 2 making ${MIDOBJ}/gfun.o from ${BOOK}
@( cd ${MIDINT} ; ${TANGLE} -R"gdraws/gfun.c" ${BOOK} >gfun.c )
-
-${MIDOBJ}/gfun.o: ${HEADERS} ${MIDINT}/gfun.c
- @ echo 2 making ${MIDOBJ}/gfun.o from ${MIDINT}/gfun.c
@ ( cd ${MIDOBJ} ; ${CC} -c ${CFLAGS} ${MIDINT}/gfun.c )
${PS}/colorpoly.ps: ${BOOK}
@@ -25634,216 +25460,66 @@ Gdraws_pressed_yes(int win_width, int win_height,
int x, int y)
}
@
\chapter{Makefile}
-\section{Directory overview}
-\subsection{Environment variables}
-DIRS is a list of directories with the suffix {\bf dir}.
-DOCS is the same list with {\bf dir} suffix replaced with {\bf document}.
-CLNS is the same list with {\bf dir} suffix replaced with {\bf clean}.
-
-Thus if we have a new directory {\bf foo} add it to the {\bf DIRS}
-variable as {\bf foodir}. It will automatically be added to {\bf DOCS}
-as {\bf foodocument} and {\bf CLNS} as {\bf fooclean}.
-
-These variables are used to drive the make, make document, and
-make clean processes, respectively.
-<<environment>>=
-DIRS=viewmandir gdrawsdir view2ddir view3ddir viewalonedir
-DOCS=${DIRS:dir=document}
-CLNS=${DIRS:dir=clean}
+<<*>>=
+BOOK=${SPD}/books/bookvol8.pamphlet
-@
-\subsection{The viewman directory}
-<<viewmandir>>=
-viewmandir: ${SRC}/graph/viewman/Makefile
- @ echo 1 making ${SRC}/graph/viewman
- @ mkdir -p ${INT}/graph/viewman
+all: viewmandir gdrawsdir view2ddir view3ddir viewalonedir
+ @ echo 24 finished ${IN}
+
+viewmandir: ${BOOK}
+ @ echo 1 making viewman from ${BOOK}
@ mkdir -p ${OBJ}/${SYS}/graph/viewman
@ mkdir -p ${OBJ}/${SYS}/lib
@ mkdir -p ${MNT}/${SYS}/lib
@ mkdir -p ${MNT}/${SYS}/doc/src/graph
- @(cd viewman ; ${ENV} ${MAKE} )
-
-${SRC}/graph/viewman/Makefile: ${SRC}/graph/viewman/Makefile.pamphlet
- @echo 2 making ${SRC}/graph/viewman/Makefile from
${SRC}/graph/viewman/Makefile.pamphlet
- @( cd viewman ; \
- ${DOCUMENT} ${NOISE} Makefile ; \
- cp Makefile.dvi ${MNT}/${SYS}/doc/src/graph.viewman.Makefile.dvi )
-
-viewmandocument: ${SRC}/graph/viewman/Makefile
- @echo 3 documenting ${SRC}/graph/viewman
- @( cd viewman ; ${ENV} ${MAKE} document )
-
-viewmanclean: ${SRC}/graph/viewman/Makefile
- @echo 4 cleaning ${SRC}/graph/viewman
- @( cd viewman ; ${ENV} ${MAKE} clean )
- @rm -f ${SRC}/graph/viewman/Makefile
- @rm -f ${SRC}/graph/viewman/Makefile.dvi
-
-@
-\subsection{The gdraws directory}
-<<gdrawsdir>>=
-gdrawsdir: ${SRC}/graph/gdraws/Makefile
- @echo 5 making ${SRC}/graph/gdraws
- @mkdir -p ${INT}/graph/gdraws
- @mkdir -p ${OBJ}/${SYS}/graph/gdraws
- @mkdir -p ${MNT}/${SYS}/lib
- @mkdir -p ${MNT}/${SYS}/lib/graph
- @mkdir -p ${MNT}/${SYS}/doc/src/graph
- @(cd gdraws ; ${ENV} ${MAKE} )
-
-${SRC}/graph/gdraws/Makefile: ${SRC}/graph/gdraws/Makefile.pamphlet
- @echo 6 making ${SRC}/graph/gdraws/Makefile from
${SRC}/graph/gdraws/Makefile.pamphlet
- @( cd gdraws ; \
- ${DOCUMENT} ${NOISE} Makefile ; \
- cp Makefile.dvi ${MNT}/${SYS}/doc/src/graph.gdraws.Makefile.dvi )
-
-gdrawsdocument: ${SRC}/graph/gdraws/Makefile
- @echo 7 documenting ${SRC}/graph/gdraws
- @( cd gdraws ; ${ENV} ${MAKE} document )
-
-gdrawsclean: ${SRC}/graph/gdraws/Makefile
- @echo 8 cleaning ${SRC}/graph/gdraws
- @( cd gdraws ; ${ENV} ${MAKE} clean )
- @rm -f ${SRC}/graph/gdraws/Makefile
- @rm -f ${SRC}/graph/gdraws/Makefile.dvi
-
-@
-\subsection{The view3d directory}
-<<view3ddir>>=
-view3ddir: ${SRC}/graph/view3d/Makefile
- @echo 9 making ${SRC}/graph/view3d
- @mkdir -p ${INT}/graph/view3d
- @mkdir -p ${OBJ}/${SYS}/graph/view3d
- @mkdir -p ${OBJ}/${SYS}/lib
- @mkdir -p ${OBJ}/${SYS}/graph/gdraws
- @mkdir -p ${MNT}/${SYS}/lib
- @mkdir -p ${MNT}/${SYS}/doc/src/graph
- @(cd view3d ; ${ENV} ${MAKE} )
-
-${SRC}/graph/view3d/Makefile: ${SRC}/graph/view3d/Makefile.pamphlet
- @echo 10 making ${SRC}/graph/view3d/Makefile from
${SRC}/graph/view3d/Makefile.pamphlet
- @( cd view3d ; \
- ${DOCUMENT} ${NOISE} Makefile ; \
- cp Makefile.dvi ${MNT}/${SYS}/doc/src/graph.view3d.Makefile.dvi )
-
-view3ddocument: ${SRC}/graph/view3d/Makefile
- @echo 11 documenting ${SRC}/graph/view3d
- @( cd view3d ; ${ENV} ${MAKE} document )
-
-view3dclean: ${SRC}/graph/view3d/Makefile
- @echo 12 cleaning ${SRC}/graph/view3d
- @( cd view3d ; ${ENV} ${MAKE} clean )
- @rm -f ${SRC}/graph/view3d/Makefile
- @rm -f ${SRC}/graph/view3d/Makefile.dvi
-
-@
-\subsection{The view2d directory}
-<<view2ddir>>=
-view2ddir: ${SRC}/graph/view2d/Makefile
- @echo 13 making ${SRC}/graph/view2d
- @mkdir -p ${INT}/graph/view2d
- @mkdir -p ${OBJ}/${SYS}/graph/view2d
- @mkdir -p ${OBJ}/${SYS}/lib
- @mkdir -p ${MNT}/${SYS}/lib
- @mkdir -p ${MNT}/${SYS}/doc/src/graph
- @(cd view2d ; ${ENV} ${MAKE} )
-
-${SRC}/graph/view2d/Makefile: ${SRC}/graph/view2d/Makefile.pamphlet
- @echo 14 making ${SRC}/graph/view2d/Makefile from
${SRC}/graph/view2d/Makefile.pamphlet
- @( cd view2d ; \
- ${DOCUMENT} ${NOISE} Makefile ; \
- cp Makefile.dvi ${MNT}/${SYS}/doc/src/graph.view2d.Makefile.dvi )
-
-view2ddocument: ${SRC}/graph/view2d/Makefile
- @echo 15 documenting ${SRC}/graph/view2d
- @( cd view2d ; ${ENV} ${MAKE} document )
-
-view2dclean: ${SRC}/graph/view2d/Makefile
- @echo 16 cleaning ${SRC}/graph/view2d
- @( cd view2d ; ${ENV} ${MAKE} clean )
- @rm ${SRC}/graph/view2d/Makefile
- @rm ${SRC}/graph/view2d/Makefile.dvi
-
-@
-\subsection{The viewalone directory}
-<<viewalonedir>>=
-viewalonedir: ${SRC}/graph/viewalone/Makefile
- @echo 17 making ${SRC}/graph/viewalone
- @mkdir -p ${INT}/graph/viewalone
- @mkdir -p ${OBJ}/${SYS}/graph/viewalone
- @mkdir -p ${MNT}/${SYS}/bin
- @mkdir -p ${MNT}/${SYS}/doc/src/graph
- @(cd viewalone ; ${ENV} ${MAKE} )
-
-${SRC}/graph/viewalone/Makefile: ${SRC}/graph/viewalone/Makefile.pamphlet
- @echo 18 making ${SRC}/graph/viewalone/Makefile from
${SRC}/graph/viewalone/Makefile.pamphlet
- @( cd viewalone ; \
- ${DOCUMENT} ${NOISE} Makefile ; \
- cp Makefile.dvi ${MNT}/${SYS}/doc/src/graph.viewalone.Makefile.dvi )
-
-viewalonedocument: ${SRC}/graph/viewalone/Makefile
- @echo 19 documenting ${SRC}/graph/viewalone
- @( cd viewalone ; ${ENV} ${MAKE} document )
-
-viewaloneclean: ${SRC}/graph/viewalone/Makefile
- @echo 20 cleaning ${SRC}/graph/viewalone
- @( cd viewalone ; ${ENV} ${MAKE} clean )
- @rm -f ${SRC}/graph/viewalone/Makefile
- @rm -f ${SRC}/graph/viewalone/Makefile.dvi
-
-@
-\section{Documentation}
-\subsection{environment variables}
-DOC is the directory where we store final documentation.
-DOCFILES is the list of documents to create.
-<<docenviroment>>=
-IN=${SRC}/graph
-MID=${INT}/graph/parabola
-DOC=${MNT}/${SYS}/doc/src/graph
-DOCFILES=${DOC}/fileformats.dvi
-
-@
-\subsection{file formats}
-<<fileformats (DOC from IN)>>=
-${DOC}/fileformats.dvi: ${IN}/fileformats.pamphlet
- @echo 21 making ${DOC}/fileformats.dvi from ${IN}/fileformats.pamphlet
- @(cd ${DOC} ; \
- cp ${IN}/fileformats.pamphlet ${DOC} ; \
- ${DOCUMENT} ${NOISE} fileformats ; \
- rm -f ${DOC}/fileformats.pamphlet ; \
- rm -f ${DOC}/fileformats.tex ; \
- rm -f ${DOC}/fileformats )
-
-@
-<<fileformats (MID from IN)>>=
-${MID}/data: ${IN}/fileformats.pamphlet
- @echo 22 making ${MID}/data from ${IN}/fileformats.pamphlet
- @(cd ${MID} ; \
- ${TANGLE} -R"data" ${IN}/fileformats.pamphlet >data ; \
- ${TANGLE} -R"graph0" ${IN}/fileformats.pamphlet >graph0 )
-
-@
-<<*>>=
-<<environment>>
-<<docenviroment>>
-
-all: ${DIRS} ${DOCFILES} ${MID}/data
- @ echo 24 finished ${IN}
-
-<<viewmandir>>
-<<gdrawsdir>>
-<<view3ddir>>
-<<view2ddir>>
-<<viewalonedir>>
-
-<<fileformats (DOC from IN)>>
-<<fileformats (MID from IN)>>
-
-clean: ${CLNS}
- @ echo 25 cleaning ${SRC}/graph
+ @ mkdir -p ${INT}/graph/viewman
+ @( cd ${INT}/graph/viewman ; \
+ ${TANGLE} -t8 -R"viewman/Makefile" ${BOOK} >Makefile ; \
+ ${ENV} ${MAKE} )
-document: ${DIRS}
- @ echo 26 documenting graph
+gdrawsdir: ${BOOK}
+ @ echo 5 making gdraws from ${BOOK}
+ @ mkdir -p ${OBJ}/${SYS}/graph/gdraws
+ @ mkdir -p ${MNT}/${SYS}/lib
+ @ mkdir -p ${MNT}/${SYS}/lib/graph
+ @ mkdir -p ${MNT}/${SYS}/doc/src/graph
+ @ mkdir -p ${INT}/graph/gdraws
+ @( cd ${INT}/graph/gdraws ; \
+ ${TANGLE} -t8 -R"gdraws/Makefile" ${BOOK} >Makefile ; \
+ ${ENV} ${MAKE} )
+
+view3ddir: ${BOOK}
+ @ echo 9 making view3d from ${BOOK}
+ @ mkdir -p ${OBJ}/${SYS}/graph/view3d
+ @ mkdir -p ${OBJ}/${SYS}/lib
+ @ mkdir -p ${OBJ}/${SYS}/graph/gdraws
+ @ mkdir -p ${MNT}/${SYS}/lib
+ @ mkdir -p ${MNT}/${SYS}/doc/src/graph
+ @ mkdir -p ${INT}/graph/view3d
+ @( cd ${INT}/graph/view3d ; \
+ ${TANGLE} -t8 -R"view3d/Makefile" ${BOOK} >Makefile ; \
+ ${ENV} ${MAKE} )
+
+view2ddir: ${BOOK}
+ @ echo 13 making view2d from ${BOOK}
+ @ mkdir -p ${OBJ}/${SYS}/graph/view2d
+ @ mkdir -p ${OBJ}/${SYS}/lib
+ @ mkdir -p ${MNT}/${SYS}/lib
+ @ mkdir -p ${MNT}/${SYS}/doc/src/graph
+ @ mkdir -p ${INT}/graph/view2d
+ @( cd ${INT}/graph/view2d ; \
+ ${TANGLE} -t8 -R"view2d/Makefile" ${BOOK} >Makefile ; \
+ ${ENV} ${MAKE} )
+
+viewalonedir: ${BOOK}
+ @ echo 17 making viewalone from ${BOOK}
+ @ mkdir -p ${OBJ}/${SYS}/graph/viewalone
+ @ mkdir -p ${MNT}/${SYS}/bin
+ @ mkdir -p ${MNT}/${SYS}/doc/src/graph
+ @ mkdir -p ${INT}/graph/viewalone
+ @( cd ${INT}/graph/viewalone ; \
+ ${TANGLE} -t8 -R"viewalone/Makefile" ${BOOK} >Makefile ; \
+ ${ENV} ${MAKE} )
@
\begin{thebibliography}{99}
diff --git a/changelog b/changelog
index af63055..e4f1b86 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,5 @@
+20080608 tpd src/Makefile remove src/graph (use bookvol8)
+20080608 tpd books/bookvol8 remove src/graph (use bookvol8)
20080608 tpd src/graph/gdraws/Makefile deleted, (use bookvol8)
20080608 tpd src/graph/gdraws/data.c deleted, (use bookvol8)
20080608 tpd src/graph/gdraws/gdraws0.h deleted, (use bookvol8)
diff --git a/src/Makefile.pamphlet b/src/Makefile.pamphlet
index ebb9f2d..5644071 100644
--- a/src/Makefile.pamphlet
+++ b/src/Makefile.pamphlet
@@ -538,32 +538,14 @@ docclean: ${SRC}/doc/Makefile
@
\subsection{The graph directory}
<<graphdir>>=
-graphdir: ${SRC}/graph/Makefile
- @echo 45 making ${SRC}/graph
+graphdir: ${SPD}/books/bookvol8.pamphlet
+ @echo 45 making graph from bookvol8
@mkdir -p ${INT}/graph/parabola
@mkdir -p ${OBJ}/${SYS}/graph
- @(cd graph ; ${ENV} ${MAKE} )
-
-${SRC}/graph/Makefile: ${SRC}/graph/Makefile.pamphlet
- @echo 46 making ${SRC}/graph/Makefile from \
- ${SRC}/graph/Makefile.pamphlet
- @( cd graph ; \
- ${DOCUMENT} ${NOISE} Makefile ; \
- cp Makefile.dvi ${MNT}/${SYS}/doc/src/graph.Makefile.dvi )
-
-graphdocument: ${SRC}/graph/Makefile
- @echo 47 documenting ${SRC}/graph
- @mkdir -p ${INT}/doc/src/graph
- @( cd graph ; ${ENV} ${MAKE} document )
-
-graphclean: ${SRC}/graph/Makefile
- @echo 48 cleaning ${SRC}/graph
- @( cd graph ; ${ENV} ${MAKE} clean )
- @rm -rf ${INT}/graph
- @rm -rf ${OBJ}/${SYS}/graph
- @rm -rf ${MNT}/${SYS}/graph
- @rm -f ${SRC}/graph/Makefile
- @rm -f ${SRC}/graph/Makefile.dvi
+ @mkdir -p ${INT}/graph
+ @(cd ${INT}/graph ; \
+ ${TANGLE} -t8 ${SPD}/books/bookvol8.pamphlet >Makefile ; \
+ ${ENV} ${MAKE} )
@
\section{The Makefile}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Axiom-developer] 20080608.03.tpd.patch (remove src/graph, use bookvol8),
daly <=