diff options
35 files changed, 399 insertions, 1733 deletions
@@ -1,6 +1,7 @@ 2007-12-27 Gabriel Dos Reis <gdr@cs.tamu.edu> * build-setup.sh (SUBDIRS): Don't extract Makefile.in for src/lisp. + Same for src/graph, src/etc, src/sman, src/hyper, src/doc. 2007-11-30 Ralf Hemmecke <ralf@hemmecke.de> diff --git a/build-setup.sh b/build-setup.sh index d2d31f37..6b306a0f 100755 --- a/build-setup.sh +++ b/build-setup.sh @@ -22,17 +22,6 @@ SUBDIRS=" . \ src/interp \ src/share \ src/algebra \ - src/etc \ - src/clef \ - src/doc \ - src/graph \ - src/graph/Gdraws \ - src/graph/view2D \ - src/graph/view3D \ - src/graph/viewAlone \ - src/graph/viewman \ - src/sman \ - src/hyper \ src/input \ src/booklets \ " diff --git a/src/clef/ChangeLog b/src/clef/ChangeLog index 506e408a..fb78f84c 100644 --- a/src/clef/ChangeLog +++ b/src/clef/ChangeLog @@ -1,3 +1,7 @@ +2007-12-27 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * Makefile.pamphlet: Remove. + 2007-09-02 Gabriel Dos Reis <gdr@cs.tamu.edu> * Makefile.pamphlet (clef_SOURCES): Don't reference pamphlet. diff --git a/src/clef/Makefile.in b/src/clef/Makefile.in index 36427c4c..be89672c 100644 --- a/src/clef/Makefile.in +++ b/src/clef/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. + + # this is where the include files live INC= $(axiom_src_srcdir)/include diff --git a/src/clef/Makefile.pamphlet b/src/clef/Makefile.pamphlet deleted file mode 100644 index e6fb9106..00000000 --- a/src/clef/Makefile.pamphlet +++ /dev/null @@ -1,74 +0,0 @@ -%% Oh Emacs, this is a -*- Makefile -*-, so give me tabs. -\documentclass{article} -\usepackage{axiom} -\begin{document} -\title{\$SPAD/src/clef Makefile} -\author{Gabriel Dos~Reis \and Timothy Daly} -\maketitle -\begin{abstract} -\end{abstract} -\eject -\tableofcontents -\eject -\section{Environment variables} -<<environment>>= -# this is where the include files live -INC= $(axiom_src_srcdir)/include - -bin_PROGRAMS = clef$(EXEEXT) - -clef_SOURCES = edible.c - -clef_objects = $(clef_SOURCES:.c=.lo) - -clef_LDADD = $(axiom_target_libdir)/libspad.la -clef_DEPENDENCIES = -@ - -\section{The clef sources, edible} -<<edible>>= -$(axiom_target_bindir)/clef$(EXEEXT): $(clef_objects) $(clef_DEPENDENCIES) - $(LINK) -o $@ $(clef_objects) $(clef_LDADD) ${LDF} - -.SUFFIXES: -.SUFFIXES: .c .lo .h -.PRECIOUS: %.lo - -%.lo: ${INC}/useproto.h ${INC}/edible.h \ - $(axiom_configdir)/axiom-c-macros.h - -%.lo: %.c $(axiom_c_macros_h) - $(COMPILE) -o $@ ${CCF} $(axiom_includes) $< - -mostlyclean-local: - @rm -f $(clef_objects) - @rm -f stamp - -clean-local: mostlyclean-local - @rm -f $(axiom_target_bindir)/clef$(EXEEXT) - -distclean-local: clean-local -@ - -<<*>>= -<<environment>> - -subdir = src/clef/ - -pamphlets = Makefile.pamphlet - -.PHONY: all all-clef -all: all-ax - -all-ax all-clef: stamp - @ echo finished $(builddir) - -stamp: $(axiom_target_bindir)/clef$(EXEEXT) - @rm -f stamp - $(STAMP) stamp - -<<edible>> - -@ - -\end{document} diff --git a/src/doc/ChangeLog b/src/doc/ChangeLog index 0738fcf5..7819b0b5 100644 --- a/src/doc/ChangeLog +++ b/src/doc/ChangeLog @@ -1,3 +1,7 @@ +2007-12-27 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * Makefile.pamphlet: Remove. + 2007-11-19 Gabriel Dos Reis <gdr@cs.tamu.edu> * msgs/s2-us.msgs: Consistently use OpenAxiom. diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in index e7d05985..96b6fe31 100644 --- a/src/doc/Makefile.in +++ b/src/doc/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. + + IN=$(axiom_src_srcdir)/doc MID=./$(top_builddir)/int/doc OUT=$(axiom_target_bindir) diff --git a/src/doc/Makefile.pamphlet b/src/doc/Makefile.pamphlet deleted file mode 100644 index b071b536..00000000 --- a/src/doc/Makefile.pamphlet +++ /dev/null @@ -1,64 +0,0 @@ -%% Oh Emacs, this is a -*- Makefile -*-, so give me tabs. -\documentclass{article} -\usepackage{axiom} - -\title{\File{src/doc/Makefile} Pamphlet} -\author{Timothy Daly \and Gabriel Dos~Reis} - -\begin{document} -\maketitle -\begin{abstract} -\end{abstract} - -\tableofcontents -\eject - - -\section{The Makefile} - -We need to document the commands. -<<*>>= -IN=$(axiom_src_srcdir)/doc -MID=./$(top_builddir)/int/doc -OUT=$(axiom_target_bindir) -STY=${OUT}/tex -DVI=$(axiom_target_docdir) -DOC=./$(top_builddir)/int/doc - -subdir = src/doc/ - -pamphlets = axiom.sty.pamphlet \ - axiom.bib.pamphlet \ - DeveloperNotes.pamphlet \ - Rosetta.pamphlet \ - $(booklet_SOURCES) - -FILES= ${MID}/axiom.bib ${STY}/axiom.sty \ - ${DVI}/book.dvi ${DVI}/bookvol1.dvi ${DVI}/endpaper.dvi - -CMDS=$(axiom_target_bindir)/booklet - -.PHONY: all all-doc -all: all-ax - -all-ax all-doc: stamp - @echo 9 finished $(builddir) - -stamp: ${CMDS} - -rm -f stamp - $(STAMP) stamp - -dvi-local: $(FILES) - -mostlyclean-local: - -rm -f $(booklet_objects) - -clean-local: mostlyclean-local - -rm -f $(axiom_target_bindir)/booklet - -rm -f $(booklet_sources) - -distclean-local: clean-local -@ - - -\end{document} diff --git a/src/etc/ChangeLog b/src/etc/ChangeLog index 318967b8..6dff0481 100644 --- a/src/etc/ChangeLog +++ b/src/etc/ChangeLog @@ -1,3 +1,7 @@ +2007-12-27 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * Makefile.pamphlet: Remove. + 2007-10-10 Gabriel Dos Reis <gdr@cs.tamu.edu> * Makefile.pamphlet (INTERPSYS): Take system root directory and diff --git a/src/etc/Makefile.in b/src/etc/Makefile.in index 66e93c63..c872654c 100644 --- a/src/etc/Makefile.in +++ b/src/etc/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. + + INTERPSYS = ../interp/interpsys$(EXEEXT) -- --system="$(AXIOM)" \ --sysalg="$(axiom_src_datadir)/algebra/" diff --git a/src/etc/Makefile.pamphlet b/src/etc/Makefile.pamphlet deleted file mode 100644 index a47a7172..00000000 --- a/src/etc/Makefile.pamphlet +++ /dev/null @@ -1,135 +0,0 @@ -%% Oh Emacs, this is a -*- Makefile -*-, so give me tabs. -\documentclass{article} -\usepackage{axiom} - -\title{\File{src/etc/Makefile} Pamphlet} -\author{Timothy Daly \and Gabriel Dos~Reis} - -\begin{document} -\maketitle - -\begin{abstract} -\end{abstract} -\eject - -\tableofcontents -\eject - -\section{The databases} - -The databases are built in this Makefile even though the prerequisits -are actually made during the previous step in the algebra directory. -This allows us to use a simple wildcard to express the fact that -all of the [[algreba/*.NRLIB/code.\$(OBJEXT)]] files are required in -order to build -the databases. If any if any of these are changed, the databases must -be re-built. -<<dbcomplete>>= -$(axiom_targetdir)/algebra/*.daase: ../algebra/*.NRLIB/code.$(OBJEXT) - @ echo 4 rebuilding databases... - @ $(INSTALL_DATA) $(axiom_src_docdir)/topics.data ../algebra - @ (cd ../algebra ; \ - echo ')lisp (make-databases "" nil)' | ${INTERPSYS} ) - @ $(INSTALL_DATA) ../algebra/*.daase $(axiom_targetdir)/algebra - @ $(INSTALL_DATA) ../algebra/libdb.text $(axiom_targetdir)/algebra - @ $(INSTALL_DATA) ../algebra/comdb.text $(axiom_targetdir)/algebra - -@ - -\section{\Tool{summary}} - -<<summary>>= -$(axiom_target_libdir)/summary: $(srcdir)/summary - $(INSTALL_DATA) $< $@ - -@ - -\section{\File{copyright}} - -<<copyright>>= -$(axiom_target_libdir)/copyright: $(srcdir)/copyright - $(INSTALL_DATA) $< $@ - -@ - -\section{\Tool{asq}} - -\Tool{asq} is a command line tool to ask questions about \Tool{Axiom}'s -domains, packages, and categories. - -\begin{verbatim} -asq -property searchkey - property is one of the following flags: (all is the default) - (ab) abbreviation (an) ancestors - (at) attributes (ca cc) constructorcategory - (cf fo) constructorform (ck ki) constructorkind - (cm) constructormodemap (con) constructor - (cos) cosig (de) defaultdomain - (dom) domain (doc) documentation - (mo) modemaps (ni) niladic - (ob) object (op) operationalist - (pr) predicates (so) sourcefile -searchkey can be either a domain or its abbreviation. - e.g. %s -so Integer - will give the source file name written to stdout -\end{verbatim} - -<<asq>>= -bin_PROGRAMS = asq$(EXEEXT) -asq_sources = asq.c -asq_SOURCES = $(addsuffix .pamphlet, $(asq_sources)) -asq_objects = $(asq_sources:.c=.$(OBJEXT)) - -$(axiom_target_bindir)/asq$(EXEEXT): asq.c $(axiom_c_macros_h) - @echo 4 making $@ from $< - ${CC} ${CCF} $(axiom_includes) -o asq asq.c - $(INSTALL_PROGRAM) asq $(axiom_target_bindir) - -asq.c: $(srcdir)/asq.c.pamphlet - $(axiom_build_document) --tangle --output=$@ $< -@ - -<<*>>= -INTERPSYS = ../interp/interpsys$(EXEEXT) -- --system="$(AXIOM)" \ - --sysalg="$(axiom_src_datadir)/algebra/" - -subdir = src/etc/ - -pamphlets = Makefile.pamphlet $(asq_SOURCES) - - -.PHONY: all all-asq -all: all-ax - -all-ax all-asq: stamp - @echo finished $(builddir) - -stamp: $(axiom_targetdir)/algebra/*.daase $(axiom_target_bindir)/asq$(EXEEXT) \ - $(axiom_target_libdir)/summary \ - $(axiom_target_libdir)/copyright - -rm -f stamp - $(STAMP) stamp - -<<dbcomplete>> -<<asq>> -<<summary>> -<<copyright>> - -mostlyclean-local: - -rm -f $(asq_sources) $(asq_objects) - -rm -f stamp - -clean-local: mostlyclean-local - -rm -f $(axiom_target_libdir)/summary - -rm -f $(axiom_target_libdir)/copyright - -rm -f $(axiom_target_bindir)/axiom - -rm -f $(axiom_target_bindir)/asq$(EXEEXT) - -distclean-local: clean-local -@ - -\eject -\begin{thebibliography}{99} -\bibitem{1} nothing -\end{thebibliography} -\end{document} 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} diff --git a/src/hyper/ChangeLog b/src/hyper/ChangeLog index 4219fb2a..112f51b9 100644 --- a/src/hyper/ChangeLog +++ b/src/hyper/ChangeLog @@ -1,3 +1,7 @@ +2007-12-27 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * Makefile.pamphlet: Remove. + 2007-09-13 Alfredo Portes <alfredo.portes@gmail.com> Waldek Hebisch <hebisch@math.uni.wroc.pl> diff --git a/src/hyper/Makefile.in b/src/hyper/Makefile.in index 2d967868..02cef2e8 100644 --- a/src/hyper/Makefile.in +++ b/src/hyper/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. + + bin_PROGRAMS = htadd$(EXEEXT) hthits$(EXEEXT) ex2ht$(EXEEXT) ifeq ($(strip $(axiom_use_x)),yes) bin_PROGRAMS += hypertex$(EXEEXT) spadbuf$(EXEEXT) diff --git a/src/hyper/Makefile.pamphlet b/src/hyper/Makefile.pamphlet deleted file mode 100644 index f48ef5b5..00000000 --- a/src/hyper/Makefile.pamphlet +++ /dev/null @@ -1,343 +0,0 @@ -%% Oh Emacs, this is a -*- Makefile -*-, so give me tabs. -\documentclass{article} -\usepackage{axiom} - -\title{\$SPAD/src/hyper Makefile} -\author{Timothy Daly \and Gabriel Dos~Reis} - -\begin{document} - -\maketitle - -\begin{abstract} -\end{abstract} - -\tableofcontents -\eject - -NOTE: - -The programs \Tool{hypertex}, \Tool{htadd}, and \Tool{htsearch}, used -to be installed in [[$(axiom_target_bindir)]]. Now all executable -from HyperDoc component are installed in [[$(axiom_target_libdir)]]. - -\section{Environment variables} - -The programs \Tool{hypertex} and \Tool{spadbuf} require either -X11 support or socket support, or both. -<<environment>>= -bin_PROGRAMS = htadd$(EXEEXT) hthits$(EXEEXT) ex2ht$(EXEEXT) -ifeq ($(strip $(axiom_use_x)),yes) -bin_PROGRAMS += hypertex$(EXEEXT) spadbuf$(EXEEXT) -endif - -# this is where to put the various commands -OUTLIB= $(axiom_target_libdir) - -# this is where the include files live -INC= $(axiom_src_srcdir)/include - -# this is where the hypertex documentation files are -HYPER=$(axiom_target_datadir)/hypertex - -HTADD=$(OUTLIB)/htadd - -BITMAPS = mouse11.bitmap mouse11.mask sdown3d.bitmap sdown3dpr.bitmap \ - sdown.bitmap sup3d.bitmap sup3dpr.bitmap sup.bitmap ht_icon - -SCRIPTS=${OUTLIB}/htsearch ${OUTLIB}/presea - -BINFILES= $(addprefix $(OUTLIB)/,$(bin_PROGRAMS)) - -HEADERS = addfile.h cond.h dialog.h display.h event.h extent.h \ - group.h hterror.h hyper.h initx.h keyin.h lex.h mem.h \ - parse.h parse-aux.h parse-paste.h parse-types.h scrollbar.h \ - show-types.h titlebar.h token.h $(axiom_c_macros_h) - - -build_libdir = $(abs_top_builddir)/src/lib - -hypertex_sources = addfile.c cond.c dialog.c display.c event.c extent1.c \ - extent2.c form-ext.c group.c halloc.c hash.c hterror.c \ - htinp.c hyper.c initx.c input.c item.c keyin.c lex.c \ - macro.c mem.c parse.c parse-aux.c parse-input.c \ - parse-paste.c parse-types.c ReadBitmap.c scrollbar.c \ - show-types.c spadint.c titlebar.c - -libspad_la = $(axiom_target_libdir)/libspad.la - -hypertex_SOURCES = $(hypertex_sources:.c=.pamphlet) -hypertex_objects = $(hypertex_sources:.c=.lo) -hypertex_LDADD = $(libspad_la) -hypertex_DEPENDENCIES = - -htadd_sources = addfile.c halloc.c hash.c htadd.c hterror.c lex.c -htadd_SOURCES = $(htadd_sources:.c=.pamphlet) -htadd_objects = $(htadd_sources:.c=.lo) -htadd_LDADD = $(libspad_la) -htadd_DEPENDENCIES = - -htsearch_SOURCES = search.pamphlet - -spadbuf_sources = spadbuf.c -spadbuf_SOURCES = $(spadbuf_sources:.c=.pamphlet) -spadbuf_objects = $(spadbuf_sources:.c=.lo) -spadbuf_LDADD = $(libspad_la) -spadbuf_DEPENDENCIES = - -hthits_sources = hthits.c -hthits_SOURCES = $(hthits_sources:.c=.pamphlet) -hthits_objects = $(hthits_sources:.c=.lo) -hthits_LDADD = $(libspad_la) -hthits_DEPENDENCIES = - -ex2ht_sources = ex2ht.c -ex2ht_SOURCES = $(ex2ht_sources:.c=.pamphlet) -ex2ht_objects = $(ex2ht_sources:.c=.lo) -ex2ht_LDADD = $(libspad_la) -ex2ht_DEPENDENCIES = - -pamphlets = Makefile.pamphlet $(hypertex_SOURCES) $(htadd_SOURCES) \ - $(htsearch_SOURCES) $(spadbuf_SOURCES) $(hthits_SOURCES) \ - $(ex2ht_SOURCES) -@ - -\section{header files} - -We use a very simple and general rule to extract C source code and header -files. The names of the corresponding files are conveniently named after -the pamphlet files. -<<header files>>= -.PRECIOUS: %.h - -$(HEADERS): %.h: $(srcdir)/%.pamphlet - $(axiom_build_document) --tangle=$*.h --output=$@ $< -@ - -For that naming scheme to work correctly with noweb --- the tool -currently used by Axiom, to support its notion implementation of literate -programming --- it must be -ensured that the filenames contain only characters that can be rendered -properly by \LaTeX{} in non-math mode. There are various ways to -ensure that, ranging from restricted character set to escaping active -characters. We have retained the restricted character set solution. - -<<objects>>= -.PRECIOUS: %.lo %.$(OBJEXT) -.PRECIOUS: %.c - -%.lo: %.c $(HEADERS) - $(COMPILE) -o $@ $(CFLAGS) ${CCF} $(axiom_includes) $(AXIOM_X11_CFLAGS) -I. $< - -%.c: $(srcdir)/%.pamphlet - $(axiom_build_document) --tangle --output=$@ $< - -@ - - -\section{bitmaps} -There are two files for each (special) character glyph, one -for the upper case form, and one for the lower case form. -For more information about hese bitmaps see 'util.ht' in the -section 'pages', below. - -<<bitmaps>>= -mouse11.bitmap: $(srcdir)/bitmaps.pamphlet - $(axiom_build_document) --tangle=mouse11.bitmap --output=$@ $< - -mouse11.mask: $(srcdir)/bitmaps.pamphlet - $(axiom_build_document) --tangle=mouse11.mask --output=$@ $< - -sdown3d.bitmap: $(srcdir)/bitmaps.pamphlet - $(axiom_build_document) --tangle=sdown3d.bitmap --output=$@ $< - -sdown3dpr.bitmap: $(srcdir)/bitmaps.pamphlet - $(axiom_build_document) --tangle=sdown3dpr.bitmap --output=$@ $< - -sdown.bitmap: $(srcdir)/bitmaps.pamphlet - $(axiom_build_document) --tangle=sdown.bitmap --output=$@ $< - -sup3d.bitmap: $(srcdir)/bitmaps.pamphlet - $(axiom_build_document) --tangle=sup3d.bitmap --output=$@ $< - -sup3dpr.bitmap: $(srcdir)/bitmaps.pamphlet - $(axiom_build_document) --tangle=sup3dpr.bitmap --output=$@ $< - -sup.bitmap: $(srcdir)/bitmaps.pamphlet - $(axiom_build_document) --tangle=sup.bitmap --output=$@ $< - -ht_icon: $(srcdir)/bitmaps.pamphlet - $(axiom_build_document) --tangle=hticon --output=$@ $< -@ - -\section{search} -<<search>>= -${OUTLIB}/htsearch: $(srcdir)/search.pamphlet - $(axiom_build_document) --tangle=htsearch --output=$@ $< - chmod a+x ${OUTLIB}/htsearch - -${OUTLIB}/presea: $(srcdir)/search.pamphlet - $(axiom_build_document) --tangle=presea --output=$@ $< - chmod a+x ${OUTLIB}/presea -@ - -\section{ex2ht binary} -<<ex2ht (BIN)>>= -${OUTLIB}/ex2ht$(EXEEXT): $(ex2ht_objects) $(ex2ht_DEPENDENCIES) - ${LINK} -o $@ $(ex2ht_objects) $(ex2ht_LDADD) $(AXIOM_X11_LDFLAGS) -lm -@ - -\section{htadd binary} -<<htadd (BIN)>>= -$(OUTLIB)/htadd$(EXEEXT): $(htadd_objects) $(htadd_DEPENDENCIES) - ${LINK} -o $@ $(htadd_objects) $(htadd_LDADD) $(AXIOM_X11_LDFLAGS) -lm -@ - -\section{hthits binary} -<<hthits (BIN)>>= -${OUTLIB}/hthits$(EXEEXT): $(hthits_objects) $(hthits_DEPENDENCIES) - ${LINK} -o $@ $(hthits_objects) $(hthits_LDADD) $(AXIOM_X11_LDFLAGS) -lm - -@ - -\section{hypertex binary} -<<hypertex (BIN)>>= -$(OUTLIB)/hypertex$(EXEEXT): $(hypertex_objects) $(hypertex_DEPENDENCIES) - ${LINK} -o $@ $(hypertex_objects) $(hypertex_LDADD) \ - $(AXIOM_X11_LDFLAGS) -lm -@ - -\section{spadbuf binary} -<<spadbuf (BIN)>>= -${OUTLIB}/spadbuf$(EXEEXT): $(spadbuf_objects) $(spadbuf_DEPENDENCIES) - ${LINK} -o $@ $(spadbuf_objects) $(spadbuf_LDADD) \ - $(AXIOM_X11_LDFLAGS) -lm -@ - -\section{pages} -The 'ht.db' is built when pages from 'src/hyper/pages' such as 'util.ht' -and 'util.pht' are installed in the target directory. Because the .db -file must be kept in sync with the page filesof course care must be -taken not to overwrite these files at a later time without re-building -the database. - -The Axiom system from which this branch had been made appears -to contain a redundant copy of util.ht. Removing the version of -'util.ht' in 'src/share/doc/hypertex/pages/util.ht' would make -Makefile logic simpler so it has been removed to minimize problems -when this file is updated. - -The [[.pht]] files contain hardcoded pathnames to viewport directories -in the installed system. Of course, that is asking for trouble. During -installation, we must change those paths to reflect the correct -location of the viewports. That necessary step is implemented -as: -\begin{verbatim} - for A in `ls *.pht`; do \ - sed 's,/doc/viewports/,/share/viewports/,g' $$A \ - > ${HYPER}/pages/$$A; \ - done -\end{verbatim} - -In the long term, the [[.pht]] and viewports should be generated at either -build time or installation time using commands like: -\begin{verbatim} - rm -f ht.db - ${HTADD} *.ht - for A in `ls *.ht`; do ${SMAN} -paste $$a ; done - rm -f ht.db - ${HTADD} *.ht *.pht -\end{verbatim} - -On case-insensitive filesytems such as Windows and traditional Mac -checkout from the source archive can fail if files have names -differing only in case: poly.ht contra POLY.ht and -poly.pht contra POLY.pht. To avoid conflicts on case-insensitive -filesytems we renamed [[poly.ht]] to [[polys.ht]] and [[poly.pht]] -to [[polys.pht]]. - -The page [[util.ht]] refers to two files for each (special) character -glyph, one for the upper case form, and one for the lower case form. -The names for these files avoid the use of upper and lower letters -to distinguish these forms. Intstead we use 'xxx.bitmap' for lower case -and 'xxx-cap.bitmap' for upper case, where "xxx" is the common name for -the glyth. For example alpha.bitmap and alpha-cap.bitmape. - -We need to make sure that [[ht.db]], the hypertex database file -is up to date. The file contains absolute offsets into the various -[[ht]] and [[pht]] files so it must reflect the current pages. In -order to do this we run [[htadd]] in the [[${HYPER}/pages]] directory. -<<pages>>= -${HYPER}/pages/ht.db: $(HTADD) $(srcdir)/pages/*.ht $(srcdir)/pages/*.pht - @echo making ${HYPER}/pages from $(axiom_src_srcdir)/pages directory - @ mkdir -p ${HYPER}/pages - @ cp -pr $(srcdir)/pages/*.ht ${HYPER}/pages - @ for A in `ls $(srcdir)/pages/*.pht`; do \ - sed 's,/doc/viewports/,/share/viewports/,g' $$A \ - > ${HYPER}/pages/`basename $$A`; \ - done - @ rm -f ${HYPER}/pages/ht.db ; \ - rm -f ${HYPER}/pages/*~ ; AXIOM=$(AXIOM) \ - ${HTADD} -s ${HYPER}/pages/*.ht ${HYPER}/pages/*.pht - @ cp -pr $(srcdir)/bitmaps ${HYPER} - @ cp -pr $(srcdir)/viewports $(axiom_target_datadir) - -@ - -<<*>>= -<<environment>> - -subdir = src/hyper/ - -.PHONY: all all-hyper -.SUFFIXES: -.SUFFIXES: .c .o .h - -all: all-ax - -all-ax all-hyper: stamp - @ echo finished $(builddir) - -stamp: $(HEADERS) ${BITMAPS} ${SCRIPTS} ${BINFILES} ${HYPER}/pages/ht.db - -rm -f stamp - $(STAMP) stamp - -mostclean-local: - -clean-local: mostclean-local - -rm -f $(objects) - -rm -f $(hypertex_sources) - -rm -f $(htadd_sources) - -rm -f $(htsearch_sources) - -rm -f $(spadbuf_sources) - -rm -f $(hthits_sources) - -rm -f $(ex2ht_sources) - -rm -f $(BINFILES) - -distclean-local: clean-local - -<<header files>> - -<<objects>> - -<<bitmaps>> - -<<pages>> - -<<search>> - -<<ex2ht (BIN)>> - -<<htadd (BIN)>> - -<<hthits (BIN)>> - -<<hypertex (BIN)>> - -<<spadbuf (BIN)>> -@ -\eject -\begin{thebibliography}{99} -\bibitem{1} nothing -\end{thebibliography} -\end{document} diff --git a/src/sman/ChangeLog b/src/sman/ChangeLog index 98482cdd..34bb1e8f 100644 --- a/src/sman/ChangeLog +++ b/src/sman/ChangeLog @@ -1,3 +1,7 @@ +2007-12-27 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * Makefile.pamphlet: Remove. + 2007-12-05 Gabriel Dos Reis <gdr@cs.tamu.edu> * Makefile.pamphlet: Remove rules for extracting files from diff --git a/src/sman/Makefile.in b/src/sman/Makefile.in index e70b72de..23e8a9ea 100644 --- a/src/sman/Makefile.in +++ b/src/sman/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. + subdir = src/sman/ diff --git a/src/sman/Makefile.pamphlet b/src/sman/Makefile.pamphlet deleted file mode 100644 index d7a50858..00000000 --- a/src/sman/Makefile.pamphlet +++ /dev/null @@ -1,126 +0,0 @@ -%% Oh Emacs, this is a -*- Makefile -*-, so give me tabs. -\documentclass{article} -\usepackage{axiom} - -\title{\$SPAD/src/sman Makefile} -\author{Gabriel Dos~Reis \and Timothy Daly} - -\begin{document} -\maketitle - -\begin{abstract} -\end{abstract} -\eject - -\tableofcontents -\eject - - -\section{Environment variables} - -<<environment>>= -# this is where to put the various commands -OUT= $(axiom_target_bindir) -OUTLIB= $(axiom_target_libdir) - -# this is where the include files live -INC= $(axiom_src_srcdir)/include - -build_libdir = $(abs_top_builddir)/src/lib - -bin_PROGRAMS = session$(EXEEXT) \ - spadclient$(EXEEXT) \ - sman$(EXEEXT) - -libspad_la = $(axiom_target_libdir)/libspad.la - -session_SOURCES = session.c -session_objects = $(session_SOURCES:.c=.lo) -session_LDADD = $(libspad_la) @axiom_c_runtime_extra@ -session_DEPENDENCIES = - -spadclient_SOURCES = spadclient.c -spadclient_objects = $(spadclient_SOURCES:.c=.lo) -spadclient_LDADD = $(libspad_la) @axiom_c_runtime_extra@ -spadclient_DEPENDENCIES = - -sman_SOURCES = sman.c -sman_objects = $(sman_SOURCES:.c=.lo) -sman_LDADD = $(libspad_la) @axiom_c_runtime_extra@ -sman_DEPENDENCIES = - - -@ - -\section{session} -<<session>>= -${OUTLIB}/session$(EXEEXT): $(session_objects) $(session_DEPENDENCIES) - $(LINK) -o $@ $(session_objects) $(session_LDADD) ${LDF} -@ - -\section{spadclient} -<<spadclient>>= -${OUTLIB}/spadclient$(EXEEXT): $(spadclient_objects) $(spadclient_DEPENDENCIES) - $(LINK) -o $@ $(spadclient_objects) $(spadclient_LDADD) ${LDF} - -spadclient.$(OBJEXT): ${INC}/useproto.h ${INC}/spadclient.H1 \ - $(axiom_configdir)/axiom-c-macros.h -@ - -\section{sman} -<<sman>>= -${OUT}/sman$(EXEEXT): $(sman_objects) $(sman_DEPENDENCIES) - $(LINK) -o $@ $(sman_objects) $(sman_LDADD) ${LDF} - -$(sman_objects): sman.h $(axiom_c_macros_h) -@ - -<<*>>= - -subdir = src/sman/ - -<<environment>> - -.PHONY: all all-sman - -all: all-ax - -all-ax all-sman: stamp - -stamp: $(OUTLIB)/session$(EXEEXT) \ - $(OUTLIB)/spadclient$(EXEEXT) \ - $(OUT)/sman$(EXEEXT) - -rm -f stamp - $(STAMP) stamp - -.SUFFIXES: -.SUFFIXES: .c .h .lo .$(OBJEXT) -.PRECIOUS: %.lo %.obj - -%.lo: %.c - $(COMPILE) ${CCF} -o $@ $(axiom_includes) -I$(srcdir) $< - -<<session>> - -<<spadclient>> - -<<sman>> - -mostlyclean-local: - @rm -f $(session_objects) - @rm -f $(session_objects) - @rm -f $(sman_objects) - -clean-local: mostlyclean-local - @rm -f $(OUTLIB)/session$(EXEEXT) - @rm -f $(OUTLIB)/spadclient$(EXEEXT) - @rm -f $(OUT)/sman$(EXEEXT) - -distclean-local: clean-local - -@ -\eject -\begin{thebibliography}{99} -\bibitem{1} nothing -\end{thebibliography} -\end{document} |