aboutsummaryrefslogtreecommitdiff
path: root/src/graph
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2007-12-27 17:49:22 +0000
committerdos-reis <gdr@axiomatics.org>2007-12-27 17:49:22 +0000
commit225f2afb7e52720f4cf38a4d566a791c4bf7d898 (patch)
treec6fc40fcad0e53e15beb3012e391996225cc1d91 /src/graph
parent77a615c46dd001e67b0b1b22c3208c022e2fabb6 (diff)
downloadopen-axiom-225f2afb7e52720f4cf38a4d566a791c4bf7d898.tar.gz
Remove more Makefile pamphlets
Diffstat (limited to 'src/graph')
-rw-r--r--src/graph/ChangeLog4
-rw-r--r--src/graph/Gdraws/ChangeLog4
-rw-r--r--src/graph/Gdraws/Makefile.in34
-rw-r--r--src/graph/Gdraws/Makefile.pamphlet229
-rw-r--r--src/graph/Makefile.in33
-rw-r--r--src/graph/Makefile.pamphlet341
-rw-r--r--src/graph/view2D/ChangeLog4
-rw-r--r--src/graph/view2D/Makefile.in33
-rw-r--r--src/graph/view2D/Makefile.pamphlet104
-rw-r--r--src/graph/view3D/ChangeLog4
-rw-r--r--src/graph/view3D/Makefile.in31
-rw-r--r--src/graph/view3D/Makefile.pamphlet110
-rw-r--r--src/graph/viewAlone/ChangeLog4
-rw-r--r--src/graph/viewAlone/Makefile.in32
-rw-r--r--src/graph/viewAlone/Makefile.pamphlet99
-rw-r--r--src/graph/viewman/ChangeLog4
-rw-r--r--src/graph/viewman/Makefile.in32
-rw-r--r--src/graph/viewman/Makefile.pamphlet97
18 files changed, 219 insertions, 980 deletions
diff --git a/src/graph/ChangeLog b/src/graph/ChangeLog
index 8ecdd75a..a4b479ae 100644
--- a/src/graph/ChangeLog
+++ b/src/graph/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-27 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * Makefile.pamphlet: Remove.
+
2007-07-29 Gabriel Dos Reis <gdr@cs.tamu.edu>
* Makefile.pamphlet: Propagate libtoolization changes.
diff --git a/src/graph/Gdraws/ChangeLog b/src/graph/Gdraws/ChangeLog
index fb486345..bfb542f5 100644
--- a/src/graph/Gdraws/ChangeLog
+++ b/src/graph/Gdraws/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-27 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * Makefile.pamphlet: Remove.
+
2007-07-29 Gabriel Dos Reis <gdr@cs.tamu.edu>
* Makefile.pamphlet: Propagate libtoolization changes.
diff --git a/src/graph/Gdraws/Makefile.in b/src/graph/Gdraws/Makefile.in
index 2c053558..b098aa70 100644
--- a/src/graph/Gdraws/Makefile.in
+++ b/src/graph/Gdraws/Makefile.in
@@ -1,3 +1,37 @@
+# Copyright (C) 2007, Gabriel Dos Reis.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# - Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# - Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+#
+# - Neither the name of The Numerical Algorithms Group Ltd. nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+
IN= $(axiom_src_srcdir)/graph/Gdraws
OUT= $(axiom_target_libdir)
PS= $(axiom_target_libdir)/graph
diff --git a/src/graph/Gdraws/Makefile.pamphlet b/src/graph/Gdraws/Makefile.pamphlet
deleted file mode 100644
index 40b013c6..00000000
--- a/src/graph/Gdraws/Makefile.pamphlet
+++ /dev/null
@@ -1,229 +0,0 @@
-%% Oh Emacs, this is a -*- Makefile -*-, so give me tabs.
-\documentclass{article}
-\usepackage{axiom}
-
-\title{\$SPAD/src/graph/Gdraws Makefile}
-\author{Timothy Daly \and Gabriel Dos~Reis}
-
-\begin{document}
-\maketitle
-
-\begin{abstract}
-\end{abstract}
-\eject
-
-\tableofcontents
-\eject
-
-\section{Gdraws}
-
-This directory consists of all the Gdraw functions along with a local
-testing protocol to test out these functions.
-The subdirectory PS contains all the ps drawing functions in support of
-the Gdraw functions.
-
-\subsection{GDRAW}
-
-A Gdraw function, using a draw option dFlsg as input, provides drawings
-capability on different output devices. Currently, Gdraw supports routines
-both in Xwindows functions, and in postscript functions on
-a postscript printer/interpreter.
-
-The general drawing functions are (see file for description of functionality)
-\begin{verbatim}
- 1. Gdrawarc.c
- 2. Gdrawstring.c
- 3. Gdraw.c
- 4. Gdrawline.c
- 5. Gdrfilled.c
- 6. GdrawFrame.c
- 7. Gdrawlines.c
- 8. Gfillarc.c
- 9. GdrawIstr.c
- 10. Gdrawrect.c
- 11. Gmisc.c
- 12. GinitPS.c
- 13. GCreatePS.c
- 14. PSFill.c
- 15. ../include/G.h
- header information needed by all the Gdraw routines and
- view3D/view2D as well.
- 16. ps.h
- header information needed by only the Gdraw routines.
-
-\subsection{POSTSCRIPT}
-
-A PostScript file can be generated by using a button on the control
-panel of a viewAlone picture, or in Axiom, with the command write,
-option Postscript. This file can be submitted to the postsctipt
-printer to be printed, or viewed using the postscript interpreter.
-It will draw a window, title, and picture clipped to fit inside of the
-window.
-
-In order to generate a postscript output, we first initializ file names and
-paths to be used by our program by using
-\begin{verbatim}
- InitPs(viewWindow, titleWindow) [in GinitPS.c]
-\end{verbatim}
-then call the G draw routines with option "PS", which would generate postscript
-drawing commands. Then create the output file (OUTPUT.ps by default) by using
-\begin{verbatim}
- makePSfile(viewWindow, titleWindow, title) [in GcreatePS.c]
-\end{verbatim}
-
-The output file would be in local directory, i.e., the directory where Axiom
-or viewAlone, etc., was started up.
-
-The following routines are used to test out the Gdraw functions:
-\begin{verbatim}
-1. main.c creates windows, and titles and processes Xwindow events.
-2. data.c creates data for drawing and call Gdraw routines.
-3. menu.c draws menu when mouse clicks in viewWindow
-4. yesORno.c determines if mouse click in menu means "yes" or "no".
-5. loadFont.c loads font for display
-\end{verbatim}
-
-The Gdraw routines have been written in such a way that they are usable by
-both view3D and view2D.
-
-\subsection{TO USE G FUNCTIONS}
-
-In order to draw in postscript, use GSetForeground to set the foreground
-colors for the drawing (and fill) functions. Use GSetLineAttributes
-to set line attributes. And finally, replace the XDraw commands with the
-corresponding GDraw commands with the appropriate parameters. In addition,
-we need to: draw frame, set GC variable names, create GCs, initialize
-postscript data structures, cat all the procedures used together.
-
-{\bf IMPORTANT}:\\
-In order to create postscript command file, we need environment
-variable DEVE (i.e., setenv DEVE /u/jimwen/3D/version28) or AXIOM (e.g., setenv
-AXIOM /spad/mnt/rt in case Gdraws directory has been installed on the server).
-Without this path, the program would not know where the postscript files (in
-Gdraws/PS) are.
-
-{\bf LIMITATIONS} of current implementation:\\
-A picture is printed with 1 inch x direction, and 1 inch y direction
-offset, and the largest complete picutre is the size of the page
-with the offest.
-
-{\bf BUGS}:\\
-The region box is not drawn correctly when perspective is altered.
-
-
-{\bf FUTURE DIRECTIONS}:
-\begin{itemize}
-\item for view3D color rendering, may want to convert LINE drawing color
-to the appropriate grayscale. Right now, they're all drawn in black.
-\item for view3D's routines for color rendering, may want to implement
-color drawing for postscript functions just in case someone does
-have access to a color postscript printer.
-\item implement more functionality for attributes used in GC, i.e., dashed
-line, dotted line etc.
-\item implement a display postscript menu to set things like picture size,
-landscape/portrait orientation, picture centered, left, right, up,
-down, etc., reversed video.
-\item make font an attribute in postscripts's graphics context so the
-font can be set in user program. Right now, it uses only 1 font.
-\item for view2D's stuff, implement a smaller font for the drawing the
-units on the axes.
-\end{itemize}
-
-\section{environment variables}
-<<environment>>=
-IN= $(axiom_src_srcdir)/graph/Gdraws
-OUT= $(axiom_target_libdir)
-PS= $(axiom_target_libdir)/graph
-DOC= $(axiom_target_docdir)/src/graph
-
-# local include files shared by graphics
-LINC= $(axiom_src_srcdir)/graph/include
-
-# global include files shared by everyone
-GINC= $(axiom_src_srcdir)/include
-
-# include files in Hyperdoc
-HINC= $(axiom_src_srcdir)/hyper
-
-# bitmaps for cursors
-BIT= $(axiom_src_srcdir)/graph/include/bitmaps
-
-# a .h file stuck in a really wierd place
-DOTH= $(axiom_src_srcdir)/graph/viewman
-
-# a .c file in the library subdirectory
-DOTC= $(axiom_src_srcdir)/lib
-
-pamphlets = Gfun.c.pamphlet psFiles.pamphlet Makefile.pamphlet
-
-AXIOM_CFLAGS = ${CCF} -I${LINC} -I${GINC} -I$(srcdir) -I${HINC} \
- $(axiom_includes) ${AXIOM_X11_CFLAGS}
-
-@
-\section{Gdraw code}
-\subsection{Gfun}
-<<Gfun.c>>=
-Gfun.c: $(srcdir)/Gfun.c.pamphlet
- $(axiom_build_document) --tangle --output=$@ $<
-
-@
-
-<<Gfun.o>>=
-Gfun.$(OBJEXT): ${HEADERS}
-
-Gfun.$(OBJEXT): $(builddir)/Gfun.c
- ${COMPILE} -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $<
-
-@
-
-<<*>>=
-<<environment>>
-
-subdir = src/graph/Gdraws/
-
-pamphlets = Makefile.pamphlet Gfun.c.pamphlet psFiles.pamphlet
-
-HEADERS = ${IN}/Gdraws0.h ${LINC}/G.h ${LINC}/Gfun.H1 \
- ${GINC}/hash.h ${GINC}/hash.H1 ${GINC}/useproto.h \
- $(axiom_c_macros_h)
-
-PSFiles= ${PS}/colorpoly.ps ${PS}/colorwol.ps ${PS}/draw.ps \
- ${PS}/drawIstr.ps ${PS}/drawarc.ps ${PS}/drawcolor.ps \
- ${PS}/drawline.ps ${PS}/drawlines.ps ${PS}/drawpoint.ps \
- ${PS}/drawrect.ps ${PS}/drawstr.ps ${PS}/drwfilled.ps \
- ${PS}/end.ps ${PS}/fillarc.ps ${PS}/fillpoly.ps \
- ${PS}/fillwol.ps ${PS}/header.ps ${PS}/setup.ps
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .h .ps
-
-.PHONY: all all-ax all-Gdraws
-all: all-ax
-all-ax all-Gdraws: stamp
- @ echo finished making $(axiom_src_srcdir)/Gdraws
-
-.PHONY: PSfiles.post
-stamp: Gfun.$(OBJEXT) $(PSfiles)
- @rm -f stamp
- $(STAMP) stamp
-
-$(PS)/%.ps: $(srcdir)/psFiles.pamphlet
- $(axiom_build_document) --tangle=$* --output=$@ $<
-
-<<Gfun.c>>
-<<Gfun.o>>
-
-mostlyclean-local:
- @rm -f Gfun.$(OBJEXT)
-
-clean-local: mostlyclean-local
- @rm -f $(PSFiles)
-
-distclean-local: clean-local
-
-@
-\eject
-\begin{thebibliography}{99}
-\bibitem{1} nothing
-\end{thebibliography}
-\end{document}
diff --git a/src/graph/Makefile.in b/src/graph/Makefile.in
index cd6362dd..47297295 100644
--- a/src/graph/Makefile.in
+++ b/src/graph/Makefile.in
@@ -1,3 +1,36 @@
+# Copyright (C) 2007, Gabriel Dos Reis.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# - Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# - Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+#
+# - Neither the name of The Numerical Algorithms Group Ltd. nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
SUBDIRS = Gdraws viewman view2D view3D viewAlone
pamphlets = fileformats.pamphlet Makefile.pamphlet
diff --git a/src/graph/Makefile.pamphlet b/src/graph/Makefile.pamphlet
deleted file mode 100644
index c68dc98e..00000000
--- a/src/graph/Makefile.pamphlet
+++ /dev/null
@@ -1,341 +0,0 @@
-%% Oh Emacs, this is a -*- Makefile -*-, so give me tabs.
-\documentclass{article}
-\usepackage{axiom}
-
-\title{\$SPAD/src/graph Makefile}
-\author{Timothy Daly \and Gabriel Dos~Reis}
-
-\begin{document}
-\maketitle
-
-\begin{abstract}
-\end{abstract}
-\eject
-
-\tableofcontents
-\eject
-
-\section{General Comments}
-
-This directory contains the C source code for the Scratchpad's
-graphics. Comments given to the maintenance program refer to
-version numbers. The versions are documented below, starting with
-version23.
-\begin{verbatim}
-version23: (first version after returning from Europe)
- added a $DEVE environment variable - if it exists, the viewport manager
- tries those executable files first; if it was unsuccessful or, if the
- $DEVE variable was not defined, the $SPAD variable is used tube.c:
- changed order of crossedLines(p,q... to crossedLines(q,p... in order to
- use segNum info (which segment of the second polygon the first polygon
- crosses) and using splitPolygon() rather than splitAndMove()
- tube.c: changed crossedLines() to generalPartialSplit() - an algorithms
- i hope would work. it is not taken from any literature as all the
- literature i have looked into and tried out had design flaws or lacked
- precise specifications (including Foley & van Dam volume I, Newman &
- Sprouill and others)
- viewport3D.c: xPts now malloced as a global variable in makeView3D and
- not freed up at the end. quadMesh is also not freed anymore (shouldn't
- be as it was changed to a global some time ago).
- made eyeDistance (3D stuff) into a float (from integer)
- added outlineRender (outlineOnOff in actions.h) field. note that this
- and the previous change both affected the following files:
- view3D/: main.c, process.c, viewport3D.c, spadAction.c, write.c
- viewman/: fun3D.c make3D.c
- viewAlone/: spoon3D.c spoonTube.c
- spad/: view3D.spad (viewport3D, makeViewport3D and the Rep)
- 3D: ability to write Stellar recognizable data files for Tube types
- spad additions: write(v,fn,listOfTypes)
- fixed perspective, added min/max range of eyeDistance
-
-version24: view3D/tube.c: put in calculations for xmin,xmax,ymin,ymax
- >>> took them out again - doesn't the viewport manager do that?
- polygon list saved if previous render/opaque (hidden surface)
- was completed so that subsequent draws would be faster
- view3D: added NIL(pType) macro which checks for a null pointer
- >>> need same change in view2D (after testing)
- totalShades is now a global variable (to be decremented if color trouble)
- >>> need same change in view2D (after testing)
- cleaning up: added exitWithAck(info,size,i) macro to send spad
- acknowledge right before exit of a troubled program. this
- should avoid some of the causes of entering spad break loops
- not enough colors could be allocated; now, only a message is given.
- viewman: adding checks for abnormal exits of child processes (from
- people who use the "Cancel" command from the X server).
- deadBaby() and brokenPipe() in the works.
- view3D: hey! there was a bug in the projections: with perspective on,
- it turns out the Z-axis was rotating opposite of the rest of
- the system...?...
- fixed perspective
- added box (with back face removal)
- function of 2 variables now has it's own substructure, like tube, and
- shares the (now) general hidden surface subroutine used for the
- tube stuff when the perspective is turned on (when perspective is
- off, a simple back to front routine is sufficient and fast but the
- property that allows that is not preserved in the perspective projection)
- seems like (in tube.c) the overlap list property is not preserved (see
- notes) so now, routine needs to check, for polygon i, polygons
- i+1 through N, always.
- affects ALL: added deltaZ to all the stuff
- (spad, viewman, viewAlone, view3D) - though not used yet
- error messages: if the .Xdefault not found (or .Xdefault wasn't defined)
- then view2D and view3D will a predefined default set of fonts. it that
- still doesn't work, a (more or less useful) error message is displayed
- and an error signal is sent to Scratchpad to prevent a freeze-up situation.
- viewpack.spad (package VIEW) and view2D.spad (domain GRIMAGE) now check for
- lists that contain illegal empty lists (i.e. point list contains nothing).
- warnings are issued for lists containing both legal point lists and empty
- point lists, errors are issued for lists containing nothing but empty lists.
- made spadcolors30.c into an archived library by the name of libColors.a,
- source file changed to spadcolors.c; makeColors' arguments have changed
- and now returns the number of colors allocated - not a pointer to the
- pixel map
- saymem, check, etc. moved to util.c for library archive
- added a view.h file, with macros to be used by all view programs
- monoColor(x) macro (in view.h) replaces spadColors[x] calls in case
- display is monochromatic (in global variable mono)
- tube.c: connecting of slices - polygon points changed to outline the
- rectangular regions without the diagonals (may be prettier when outlines
- are sketched...slightly, if no split occurs).
- clipping model: both against the hither plane as well as with a
- clipping volume
- viewport3D.c: made polygon list for functions of two variables so
- that it could call the general hidden surface algorithm (in tube.c) as
- well (turns out that back to front property of 3D explicit equations is
- not preserved when viewed with perspective)
- added volume.c, volume.h for the frustrum (perspective), projected clipping
- and clip volume interface
-
-version25:
- view3D: added long jump to address signals that arrive while in the
- XNextEvent call. spadSignalHandler() now calls spadAction()
- if a signal is received.
- view2D: added query button and messages for each graph image
- (viewport2D.c, control.c, process.c)
- view3D: tube.c: improved speed of drawPolygon by creating overlapped
- list for unmoved polygon, and list for moved polygon that
- may be smaller than the entire list.
- see "Notes on the Depth Sort Algorithm" for strategy, etc.
- tube.c: moved the resetting of the variables relevant to recalc
- from process.c to tube.c (rotated, switchedPerspective,
- changedEyeDistance)
- GraphImage now supports 2D primitives like point(), component(), addPoint()
- ViewportDefaultsPackage now exports viewXPos() and stuff; all references
- to integers have been replaced by the more restrictive subdomains
- (e.g. PositiveInteger, NonNegativeInteger)
- ViewportPackage has dwindled to just drawCurves() and graphCurves()
- view2D, view3D: put in more robust signal handling routines so that
- signals from the viewport manager (Scratchpad) are all processed properly.
- the condition where the user is not allowed to use the control panel of the
- viewport that Scratchpad is sending commands to no longer exists!!!! wow!!!
- simultaneous processing without a race condition occuring (sorta) should
- not occur anymore.
- view3D: modification to keepDrawingViewport() so that signals also causes
- a return of no. this allows Scratchpad input files to be indistinguishable
- from interactive commands from a control panel! (that is, drawViewport()
- no longer need to complete the drawing if it was called from Scratchpad.)
- view2D: spadAction(): now only redraws viewport if the info was received for
- a graph image that is being shown
- view2D: fixed up pick/drop hangup problem. the "dodat" variable in process.c
- needed to be reset earlier, and in each separate routine (pick, drop and
- query) that required sequential button clicks (e.g.
- "Drop" + graph number "1").
- view2D: added global variable queriedGraph - so that the last queried graph
- will always be the one displayed.
- view2D.spad: default to points off
- added inverse and monochrome fields in .Xdefaults
- (e.g. view3D*monochrome : on)
- BUG FIXED: clipping of wire mesh for tubes
- view3D.spad: function of three variables for color specifications ==> changes
- in viewman, viewAlone, and view3D to accept additional information.
- structure of fun2VarModel in view3D.h changes *** not backwards
- compatible with version24.
- BUG FOUND: viewport3D.c still drawing the function of 2 variables
- without perspective (painter's algorithm without processing) wrong!
- BUG FIXED: this time, for shur. flipped quadrants II and IV to remedy bug
- found in painter's algorithm in viewport3D.c.
- tube.c (view3D): changed routine that redraws quickly from the saved up list
- of processed polygons from the hidden surface algorithm so that each polygon
-
-version 26:
- view3D: switched over to a generalized subspace points definition.
- so far, wire meshes work for existing types. code in viewport3D.c and tube.c
- are replaced by one more general in component.c; size reduced in half.
- include: modified=[view3D.h] new=[component.h]
- view3D: modified=[viewport3D.c, tube.c] new=[component.c]
- viewman: modified=[fun3D.c, make3D.c]
- representation should also handle future 3D things - like space curves,
- points and stuff without new data structures.
- NEED: take out unused code
- component.spad there temporarily to handle the new representation on the
- algebra side point.spad deals with the new representation in more
- generality on the algebra side
- NEED: interface to rest of algebra world
- view2D: draw dashed line if ticks are too close. view2D:
- modified=[viewport2D.c]
- coord.spad added for coordinate transformation
- XSpadFill.c in the src/ directory for shade dithering in color - affects:
- src: modified=[spadcolors.c, spadcolors.h] new=[XSpadFill.c]
- view3D: modified=[globals.h, main.c, tube.c]
- view2D: added tick labels for 2D
- view2D: modified=[viewport2D.c]
- view3D: tube.c replaced by surface.c and project.c
- viewman: for hue and shade fields in 2D, spad is one based and the viewport
- stuff is 0 based. modified=[makeGraph.c]
- --- backed up on tape ---
- replaced sprintf of XGetDefault value with direct assignment since
- XGetDefault may return a NULL value which causes sprintf to freak out
- (xDefault is now pointer to char rather than a character array)
- view2D: modified=[globals.h, main.c]
- view3D: modified=[globals.h, main.c]
- BUG FOUND: on the PS2, redraws of hidden surface with saved data (quickList)
- bombs.
- BUG FIXED: no more bombs of quick draws
- view3D: modified=[surface.c (previously, tube.c)]
- put in SIGTERM handlers so that a kill signal to viewman would cause it
- exit cleanly (that is, kill all the child processes and then exit)
- viewman: modified=[viewman.h, viewman.c, cleanup.c]
- view3D: modified=[main.c]
- view2D: modified=[main.c]
- viewWoman: modified=[viewWoman.c]
-
-version27:
- 3D primitives: added type flag to polygon structure (for 3D primitives) -
- may or may not actually be used
- include: modified=[tube.c]
- added "#define smwattDefaultToFast" which, when defined, defaults to the
- simple back-to-front draw rather than the full depth sort processes
- (click middle button to switch)
- BUG FIXED: title reading in viewAlone (to add \0 on top of the \newline
- fgets reads in)
- viewAlone: modified=[spoon2D.c, spoonComp.c]
- points in 3D stored as references (indices) into a pool of points
- include: modified=[tube.h, component.h]
- view3D: modified=[main.c, project.c, surface.c, component.c]
- added (maybe last version...?) window manager override flag in override.h
- file which sets to true or false (e.g. Presentation Manager may need
- override=false)
- BUG FIXED: after the 3D stuff saves the ordering of polygons, the quick draw
- misses the last polygon...had to change doNotStopDraw flag to affect the
- subsequent polygon.
- view3D: modified=[surface.c]
- added a development header file for temporary defines
- include: added=[DEVE.h]
- part II:
- BUG FOUND: 3D color bar goes off the positive end
- BUG FIXED: the color bar error
- view3D: modified=[process.c]
- put XMapWindow after the drawViewport in make3DComponents - fixes the
- problem of having an empty viewport window come up with no well defined data
- view3D: modified=[component.c]
- view3D: initialize the numOfPolygons and polygons field right before they're
- used (as opposed to whereever i had them before)
- view3D: modified=[component.c]
-\end{verbatim}
-
-\section{Directory overview}
-
-\subsection{Environment variables}
-
-<<environment>>=
-SUBDIRS = Gdraws viewman view2D view3D viewAlone
-
-pamphlets = fileformats.pamphlet Makefile.pamphlet
-@
-
-\subsection{The viewman directory}
-
-<<viewmandir>>=
-all-viewman: all-Gdraws
- cd viewman && ${MAKE}
-@
-
-\subsection{The Gdraws directory}
-
-<<Gdrawsdir>>=
-all-Gdraws:
- @$(mkinstalldirs) $(axiom_target_libdir)/graph
- cd Gdraws && ${MAKE}
-@
-
-\subsection{The view3D directory}
-
-<<view3Ddir>>=
-all-view3D: all-Gdraws
- cd view3D && ${MAKE}
-@
-
-\subsection{The view2D directory}
-
-<<view2Ddir>>=
-all-view2D: all-Gdraws
- cd view2D && ${MAKE}
-@
-
-\subsection{The viewAlone directory}
-
-<<viewAlonedir>>=
-all-viewAlone: all-Gdraws
- cd viewAlone && ${MAKE}
-@
-
-\section{Documentation}
-
-\subsection{environment variables}
-
-<<fileformats>>=
-
-parabola/data parabola/graph0: $(srcdir)/fileformats.pamphlet
- $(axiom_build_document) --tangle=`basename $@` --output=$@ $<
-@
-
-<<*>>=
-<<environment>>
-
-subdir = src/graph/
-
-pamphlets = Makefile.pamphlet
-
-.PHONY: all all-ax all-graph
-all: all-ax
-
-all-ax all-graph: stamp
- @ echo 24 finished ${IN}
-
-stamp: all-subdirs parabola/data parabola/graph0
- $(STAMP) stamp
-
-.PHONY: all-subdirs
-all-subdirs: all-subdirs.pre all-subdirs.rest
-
-.PHONY: all-subdirs.pre
-all-subdirs.pre:
- -rm -f stamp
- $(mkinstalldirs) parabola
-
-.PHONY: all-subdirs.rest
-all-subdirs.rest: all-subdirs.pre all-Gdraws all-viewman \
- all-view2D all-view3D all-viewAlone
-
-
-<<viewmandir>>
-<<Gdrawsdir>>
-<<view3Ddir>>
-<<view2Ddir>>
-<<viewAlonedir>>
-
-<<fileformats>>
-
-mostlyclean-local:
-
-clean-local: mostlyclean-local
- @rm -f parabola/data parabola/graph0
-
-distclean-local: clean-local
-
-@
-\eject
-\begin{thebibliography}{99}
-\bibitem{1} nothing
-\end{thebibliography}
-\end{document}
diff --git a/src/graph/view2D/ChangeLog b/src/graph/view2D/ChangeLog
index 6d3a68d7..77e0b12d 100644
--- a/src/graph/view2D/ChangeLog
+++ b/src/graph/view2D/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-27 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * Makefile.pamphlet: Remove.
+
2007-07-29 Gabriel Dos Reis <gdr@cs.tamu.edu>
* Makefile.pamphlet: Propagate libtoolization changes.
diff --git a/src/graph/view2D/Makefile.in b/src/graph/view2D/Makefile.in
index 2cf338f5..dcff96f4 100644
--- a/src/graph/view2D/Makefile.in
+++ b/src/graph/view2D/Makefile.in
@@ -1,3 +1,36 @@
+# Copyright (C) 2007, Gabriel Dos Reis.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# - Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# - Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+#
+# - Neither the name of The Numerical Algorithms Group Ltd. nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
# local include files shared by graphics
LINC= $(axiom_src_srcdir)/graph/include
diff --git a/src/graph/view2D/Makefile.pamphlet b/src/graph/view2D/Makefile.pamphlet
deleted file mode 100644
index 80570d24..00000000
--- a/src/graph/view2D/Makefile.pamphlet
+++ /dev/null
@@ -1,104 +0,0 @@
-%% Oh Emacs, this is a -*- Makefile -*-, so give me tabs.
-\documentclass{article}
-\usepackage{axiom}
-
-\title{\$SPAD/src/graph/view2D Makefile}
-\author{Timothy Daly \and Gabriel Dos~Reis}
-
-\begin{document}
-\maketitle
-
-\begin{abstract}
-\end{abstract}
-\eject
-
-\tableofcontents
-\eject
-
-\section{environment variables}
-<<environment>>=
-# local include files shared by graphics
-LINC= $(axiom_src_srcdir)/graph/include
-
-# global include files shared by everyone
-GINC= $(axiom_src_srcdir)/include
-
-build_libdir = $(abs_top_builddir)/src/lib
-
-bin_PROGRAMS = view2D$(EXEEXT)
-
-view2D_sources = buttons2d.c control2d.c graph2d.c main2d.c pot2d.c \
- process2d.c spadAction2d.c stuff2d.c viewport2D.c write2d.c
-
-view2D_SOURCES = $(addsuffix .pamphlet, $(view2D_sources))
-
-view2D_objects = $(view2D_sources:.c=.lo)
-
-Gfun_objects = ../Gdraws/Gfun.lo
-
-view2D_LDADD = $(axiom_target_libdir)/libspad.la
-
-view2D_DEPENDENCIES = $(Gfun_objects)
-@
-
-\section{view2D code}
-
-<<view2D code>>=
-$(axiom_target_libdir)/view2D$(EXEEXT): $(view2D_objects) $(view2D_DEPENDENCIES)
- $(LINK) -o $@ $(view2D_objects) $(Gfun_objects) \
- $(view2D_LDADD) $(AXIOM_X11_LDFLAGS) -lm
-
-.PRECIOUS: %.c
-.PRECIOUS: %.lo
-
-%.$(OBJEXT): $(HEADERS)
-
-%.lo: $(builddir)/%.c $(axiom_c_macros.h)
- $(COMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $<
-
-%.c: $(srcdir)/%.c.pamphlet
- $(axiom_build_document) --tangle --output=$@ $<
-@
-
-<<*>>=
-<<environment>>
-
-subdir = src/graph/view2D/
-
-pamphlets = Makefile.pamphlet $(view2D_SOURCES)
-
-AXIOM_CFLAGS = ${CCF} ${AXIOM_X11_CFLAGS} -I${LINC} -I${GINC} -I$(srcdir) \
- $(axiom_includes)
-
-GDRAW_OBJS = ../Gdraws/Gfun.lo
-
-HEADERS = $(srcdir)/header2.h $(srcdir)/globals2.h ${LINC}/view2D.h \
- ${LINC}/actions.h ${LINC}/viewCommand.h ${GINC}/view.h ${LINC}/G.h
-
-.PHONY: all all-ax all-view2D
-
-all: all-ax
-
-all-ax all-view2D: stamp
- @ echo finished $(builddir)
-
-stamp: $(axiom_target_libdir)/view2D
- @rm -f stamp
- $(STAMP) stamp
-
-<<view2D code>>
-
-mostlyclean-local:
-
-clean-local: mostlyclean-local
- @rm -f $(view2D_sources) $(view2D_objects)
- @rm -f $(axiom_target_libdir)/view2D$(EXEEXT)
-
-distclean-local: clean-local
-@
-
-\eject
-\begin{thebibliography}{99}
-\bibitem{1} nothing
-\end{thebibliography}
-\end{document}
diff --git a/src/graph/view3D/ChangeLog b/src/graph/view3D/ChangeLog
index 3d018ddf..8d726e90 100644
--- a/src/graph/view3D/ChangeLog
+++ b/src/graph/view3D/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-27 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * Makefile.pamphlet: Remove.
+
2007-07-29 Gabriel Dos Reis <gdr@cs.tamu.edu>
* Makefile.pamphlet: Propagate libtoolization changes.
diff --git a/src/graph/view3D/Makefile.in b/src/graph/view3D/Makefile.in
index 74739790..914d79a6 100644
--- a/src/graph/view3D/Makefile.in
+++ b/src/graph/view3D/Makefile.in
@@ -1,3 +1,34 @@
+# Copyright (C) 2007, Gabriel Dos Reis.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# - Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# - Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+#
+# - Neither the name of The Numerical Algorithms Group Ltd. nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
IN= $(axiom_src_srcdir)/graph/view3D
diff --git a/src/graph/view3D/Makefile.pamphlet b/src/graph/view3D/Makefile.pamphlet
deleted file mode 100644
index 694219bb..00000000
--- a/src/graph/view3D/Makefile.pamphlet
+++ /dev/null
@@ -1,110 +0,0 @@
-%% Oh Emacs, this is a -*- Makefile -*-, so give me tabs.
-\documentclass{article}
-\usepackage{axiom}
-
-\title{no title}
-\author{The Axiom Team}
-
-\begin{document}
-\maketitle
-
-\begin{abstract}
-\end{abstract}
-\eject
-
-\tableofcontents
-\eject
-
-
-\section{environment}
-<<environment>>=
-
-IN= $(axiom_src_srcdir)/graph/view3D
-
-# local include files shared by graphics
-LINC= $(axiom_src_srcdir)/graph/include
-
-# global include files shared by everyone
-GINC= $(axiom_src_srcdir)/include
-
-# bitmaps for cursors
-BIT= $(axiom_src_srcdir)/graph/include/purty
-
-build_libdir = $(abs_top_builddir)/src/lib
-
-bin_PROGRAMS = view3D$(EXEEXT)
-
-view3D_sources = buttons3d.c closeView3d.c component3d.c control3d.c \
- illuminate3d.c lightbut3d.c lighting3d.c main3d.c \
- mesh3d.c msort3d.c pot3d.c process3d.c project3d.c \
- quitbut3d.c quit3d.c save3d.c savebut3d.c smoothShade3d.c \
- spadAction3d.c stuff3d.c surface3d.c transform3d.c \
- viewport3d.c volume3d.c write3d.c
-
-view3D_SOURCES = $(addsuffix .pamphlet, $(view3D_sources))
-
-view3D_objects = $(addprefix $(builddir)/, $(view3D_sources:.c=.lo))
-
-Gfun_objects = ../Gdraws/Gfun.lo
-
-
-view3D_LDADD = $(axiom_target_libdir)/libspad.la
-view3D_DEPENDENCIES = $(Gfun_objects)
-
-pamphlets = Makefile.pamphlet $(view3D_SOURCES)
-@
-
-\section{view3D}
-<<view3D>>=
-$(axiom_target_libdir)/view3D$(EXEEXT): $(view3D_objects) $(view3D_DEPENDENCIES)
- $(LINK) -o $@ $(view3D_objects) $(Gfun_objects) \
- $(view3D_LDADD) $(AXIOM_X11_LDFLAGS) -lm
-
-.PRECIOUS: %.lo
-.PRECIOUS: %.c
-
-%.lo: $(HEADERS)
-
-%.lo: %.c
- $(COMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $<
-
-%.c: $(srcdir)/%.c.pamphlet
- $(axiom_build_document) --tangle --output=$@ $<
-@
-
-<<*>>=
-<<environment>>
-
-subdir = src/graph/view3D/
-
-AXIOM_CFLAGS = ${CCF} ${AXIOM_X11_CFLAGS} -I${LINC} -I${GINC} -I${IN} \
- $(axiom_includes)
-
-HEADERS = ${IN}/header.h ${IN}/globals.h \
- ${LINC}/component.h ${LINC}/view3D.h ${LINC}/tube.h \
- ${LINC}/actions.h ${LINC}/viewCommand.h \
- ${GINC}/view.h ${LINC}/G.h $(axiom_c_macros.h)
-
-.PHONY: all all-ax all-view3D
-all: all-ax
-all-ax all-view3D: stamp
- @echo finished $(srcdir)
-
-stamp: $(axiom_target_libdir)/view3D$(EXEEXT)
- @rm -f stamp
- $(STAMP) stamp
-
-<<view3D>>
-
-mostly-clean:
-
-clean-clean: mostlyclean-clean
-
-distclean-local: clean-local
-@
-\eject
-
-\begin{thebibliography}{99}
-\bibitem{1} nothing
-\end{thebibliography}
-\end{document}
diff --git a/src/graph/viewAlone/ChangeLog b/src/graph/viewAlone/ChangeLog
index e536b037..28189556 100644
--- a/src/graph/viewAlone/ChangeLog
+++ b/src/graph/viewAlone/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-27 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * Makefile.pamphlet: Remove.
+
2007-08-06 Gabriel Dos Reis <gdr@cs.tamu.edu>
* Makefile.pamphlet (clean-local): Fix thinko.
diff --git a/src/graph/viewAlone/Makefile.in b/src/graph/viewAlone/Makefile.in
index deedc596..dc65043a 100644
--- a/src/graph/viewAlone/Makefile.in
+++ b/src/graph/viewAlone/Makefile.in
@@ -1,3 +1,35 @@
+# Copyright (C) 2007, Gabriel Dos Reis.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# - Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# - Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+#
+# - Neither the name of The Numerical Algorithms Group Ltd. nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
# local include files shared by graphics
LINC= $(axiom_src_srcdir)/graph/include
diff --git a/src/graph/viewAlone/Makefile.pamphlet b/src/graph/viewAlone/Makefile.pamphlet
deleted file mode 100644
index 2bd8d723..00000000
--- a/src/graph/viewAlone/Makefile.pamphlet
+++ /dev/null
@@ -1,99 +0,0 @@
-%% Oh Emacs, this is a -*- Makefile -*-, so give me tabs.
-\documentclass{article}
-\usepackage{axiom}
-
-\title{\File{src/graph/viewAlone/Makefile} Pamphlet}
-\author{Timothy Daly \and Gabriel Dos~Reis}
-
-\begin{document}
-\maketitle
-
-\begin{abstract}
-\end{abstract}
-\eject
-
-\tableofcontents
-\eject
-
-\section{environment}
-
-<<environment>>=
-# local include files shared by graphics
-LINC= $(axiom_src_srcdir)/graph/include
-
-# global include files shared by everyone
-GINC= $(axiom_src_srcdir)/include
-
-build_libdir = $(abs_top_builddir)/src/lib
-
-bin_PROGRAMS = viewAlone$(EXEEXT)
-
-viewAlone_sources = viewAlone.c spoonComp.c spoon2D.c
-
-viewAlone_SOURCES = $(addsuffix .pamphlet, $(viewAlone_sources))
-
-viewAlone_objects = $(viewAlone_sources:.c=.lo)
-
-viewAlone_LDADD = $(axiom_target_libdir)/libspad.la
-viewAlone_DEPENDENCIES =
-
-pamphlets = Makefile.pamphlet $(viewAlone_SOURCES)
-@
-
-\section{viewAlone}
-<<viewAlone>>=
-$(axiom_target_bindir)/viewAlone$(EXEEXT): $(viewAlone_objects) \
- $(viewAlone_DEPENDENCIES)
- $(LINK) -o $@ $(viewAlone_objects) $(viewAlone_LDADD) \
- $(AXIOM_X11_LDFLAGS)
-
-.PRECIOUS: %.lo
-.PRECIOUS: %.c
-
-%.lo: $(HEADERS)
-
-%.lo: %.c $(axiom_c_macros_h)
- $(COMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $<
-
-%.c: $(srcdir)/%.c.pamphlet
- $(axiom_build_document) --tangle --output=$@ $<
-@
-
-<<*>>=
-<<environment>>
-
-subdir = src/graph/viewAlone/
-
-AXIOM_CFLAGS = ${CCF} ${AXIOM_X11_CFLAGS} -I$(srcdir) -I${LINC} -I${GINC} \
- $(axiom_includes)
-
-HEADERS= $(srcdir)/viewAlone.h ${LINC}/component.h ${LINC}/view2D.h \
- ${LINC}/view3D.h ${LINC}/tube.h ${LINC}/actions.h \
- ${LINC}/viewCommand.h
-
-.PHONY: all all-ax all-viewAlone
-all: all-ax
-
-all-ax all-viewAlone: stamp
- @echo finished $(builddir)
-
-stamp: $(axiom_target_bindir)/viewAlone$(EXEEXT)
- @rm -f stamp
- $(STAMP) stamp
-
-<<viewAlone>>
-
-mostlyclean-local:
-
-clean-local: mostlyclean-local
- @rm -f $(viewAlone_sources) $(viewAlone_objects)
- @rm -f $(axiom_target_bindir)/viewAlone$(EXEEXT)
-
-distclean-local: clean-local
-
-@
-\eject
-\begin{thebibliography}{99}
-\bibitem{1} nothing
-\end{thebibliography}
-\end{document}
diff --git a/src/graph/viewman/ChangeLog b/src/graph/viewman/ChangeLog
index b676ec78..ef6c1b61 100644
--- a/src/graph/viewman/ChangeLog
+++ b/src/graph/viewman/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-27 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * Makefile.pamphlet: Remove.
+
2007-12-13 Gregory Vanuxem <g.vanuxem@orange.fr>
* makeGraph.c.pamphlet (discardGraph): Fix thinko.
diff --git a/src/graph/viewman/Makefile.in b/src/graph/viewman/Makefile.in
index 7d02bbed..07578c6f 100644
--- a/src/graph/viewman/Makefile.in
+++ b/src/graph/viewman/Makefile.in
@@ -1,3 +1,35 @@
+# Copyright (C) 2007, Gabriel Dos Reis.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# - Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# - Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+#
+# - Neither the name of The Numerical Algorithms Group Ltd. nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
# local include files shared by graphics
LINC= $(axiom_src_srcdir)/graph/include
diff --git a/src/graph/viewman/Makefile.pamphlet b/src/graph/viewman/Makefile.pamphlet
deleted file mode 100644
index ec05317e..00000000
--- a/src/graph/viewman/Makefile.pamphlet
+++ /dev/null
@@ -1,97 +0,0 @@
-%% Oh Emacs, this is a -*- Makefile -*-, so give me tabs.
-\documentclass{article}
-\usepackage{axiom}
-\begin{document}
-\title{src/graph/viewman Makefile}
-\author{The Axiom Team}
-\maketitle
-\begin{abstract}
-\end{abstract}
-\eject
-\tableofcontents
-\eject
-\section{environment}
-<<environment>>=
-# local include files shared by graphics
-LINC= $(axiom_src_srcdir)/graph/include
-
-# global include files shared by everyone
-GINC= $(axiom_src_srcdir)/include
-
-build_libdir = $(abs_top_builddir)/src/lib
-
-bin_PROGRAMS = viewman$(EXEEXT)
-
-viewman_sources = cleanup.c fun2D.c fun3D.c make2D.c make3D.c \
- makeGraph.c readView.c sselect.c viewman.c
-
-viewman_SOURCES = $(addsuffix .pamphlet, $(viewman_sources))
-
-viewman_objects = $(viewman_sources:.c=.lo)
-
-viewman_headers = $(srcdir)/viewman.h \
- $(addprefix $(axiom_src_srcdir)/graph/include/,\
- component.h view2D.h view3D.h tube.h \
- actions.h viewCommand.h) \
- $(axiom_src_srcdir)/include/com.h
-
-
-viewman_DEPENDENCIES =
-viewman_LDFLAGS = $(axiom_target_libdir)/libspad.la
-
-pamphlets = Makefile.pamphlet $(viewman_SOURCES)
-@
-
-\section{viewman}
-<<viewman>>=
-$(axiom_target_libdir)/viewman$(EXEEXT): $(viewman_objects) $(viewman_DEPENDENCIES)
- $(LINK) -o $@ $(viewman_objects) $(viewman_LDFLAGS) \
- $(AXIOM_X11_LDFLAGS)
-@
-
-<<*>>=
-<<environment>>
-
-subdir = src/graph/viewman/
-
-AXIOM_CFLAGS = ${CCF} ${AXIOM_X11_CFLAGS} -I${LINC} -I${GINC} -I$(srcdir) \
- $(axiom_includes)
-
-.PHONY: all all-ax all-viewman
-all: all-ax
-
-all-ax all-viewman: stamp
- @ echo 30 finished $(srcdir)
-
-stamp: $(axiom_target_libdir)/viewman$(EXEEXT)
- @rm -f stamp
- $(STAMP) stamp
-
-
-.PRECIOUS: %.c
-.PRECIOUS: %.lo
-
-%.lo: $(viewman_HEADERS)
-
-%.lo: %.c $(axiom_c_macros_h)
- $(COMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $<
-
-%.c: $(srcdir)/%.c.pamphlet
- $(axiom_build_document) --tangle --output=$@ $<
-
-<<viewman>>
-
-mostlyclean-local:
-
-clean-local: mostlyclean-local
- @rm -f $(viewman_sources) $(viewman_objects)
- @rm -f $(axiom_target_libdir)/viewman$(EXEEXT)
-
-distclean-local: clean-local
-
-@
-\eject
-\begin{thebibliography}{99}
-\bibitem{1} nothing
-\end{thebibliography}
-\end{document}