Update of /cvsroot/pure-data/externals/grill/vasp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18640
Modified Files:
config-pd-darwin.txt make-files.txt makefile.pd-darwin
vasp.doxy
Log Message:
""
Index: makefile.pd-darwin
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/vasp/makefile.pd-darwin,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** makefile.pd-darwin 3 Sep 2003 02:37:03 -0000 1.9
--- makefile.pd-darwin 23 Sep 2004 04:04:49 -0000 1.10
***************
*** 1,4 ****
# VASP - vector assembling vector processor
! # Copyright (c)2002-2003 Thomas Grill (xovo(a)gmx.net)
#
# Makefile for gcc @ OSX (darwin)
--- 1,4 ----
# VASP - vector assembling vector processor
! # Copyright (c)2002-2004 Thomas Grill (xovo(a)gmx.net)
#
# Makefile for gcc @ OSX (darwin)
***************
*** 14,23 ****
include ${CONFIG}
- FLEXTLIB=$(FLEXTPATH)/flext_t.a
-
# compiler stuff
INCLUDES=$(PDINC)
! FLAGS=-DFLEXT_SYS=2 -DFLEXT_THREADS -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes -fno-exceptions
! CFLAGS=-O6 ${UFLAGS} -fmove-all-movables -frerun-loop-opt -fprefetch-loop-arrays
#CFLAGS+=-funroll-loops -freduce-all-givs -fschedule-insns2 -foptimize-register-move
LIBS=m
--- 14,21 ----
include ${CONFIG}
# compiler stuff
INCLUDES=$(PDINC)
! FLAGS=-DFLEXT_SYS=2 -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes -fno-exceptions
! CFLAGS=-O2 ${UFLAGS} -fmove-all-movables -frerun-loop-opt -fprefetch-loop-arrays
#CFLAGS+=-funroll-loops -freduce-all-givs -fschedule-insns2 -foptimize-register-move
LIBS=m
***************
*** 25,34 ****
FRAMEWORKS=Carbon veclib
# ----------------------------------------------
# the rest can stay untouched
# ----------------------------------------------
- NAME=vasp
-
include make-files.txt
--- 23,43 ----
FRAMEWORKS=Carbon veclib
+ ifdef FLEXT_SHARED
+ CFLAGS+=-DFLEXT_SHARED
+ LDFLAGS+=-L$(FLEXTPATH)
+ FLEXTLIB=-lflext
+
+ else
+
+ CFLAGS+=-DFLEXT_THREADS
+ FLEXTLIB=$(FLEXTPATH)/libflext_t.a
+
+ endif
+
+
# ----------------------------------------------
# the rest can stay untouched
# ----------------------------------------------
include make-files.txt
***************
*** 49,54 ****
$(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@
! $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(FLEXTLIB)
! $(CXX) $(LDFLAGS) $^ $(patsubst %,-framework %,$(FRAMEWORKS)) $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS)) -o $@
chmod 755 $@
--- 58,63 ----
$(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@
! $(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS))
! $(CXX) $(LDFLAGS) $^ $(patsubst %,-framework %,$(FRAMEWORKS)) $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS)) $(FLEXTLIB) -o $@
chmod 755 $@
Index: make-files.txt
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/vasp/make-files.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** make-files.txt 15 Apr 2003 02:36:42 -0000 1.3
--- make-files.txt 23 Sep 2004 04:04:49 -0000 1.4
***************
*** 1,2 ****
--- 1,4 ----
+ NAME=vasp
+
# all the source files from the package
SRCDIR=source
Index: config-pd-darwin.txt
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/vasp/config-pd-darwin.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** config-pd-darwin.txt 28 Dec 2003 03:48:23 -0000 1.6
--- config-pd-darwin.txt 23 Sep 2004 04:04:49 -0000 1.7
***************
*** 12,16 ****
# leave it blank if it is a system directory (like /usr/local/include),
# since gcc 3.2 complains about it
! PDINC=${PD}/src
# where is the PD executable?
--- 12,16 ----
# leave it blank if it is a system directory (like /usr/local/include),
# since gcc 3.2 complains about it
! #PDINC=${PD}/src
# where is the PD executable?
***************
*** 35,37 ****
# additional compiler flags
# (check if they fit to your system!)
! UFLAGS=-malign-power -faltivec -maltivec
--- 35,41 ----
# additional compiler flags
# (check if they fit to your system!)
! UFLAGS=-malign-power -faltivec -maltivec
!
! # build with flext shared library
! FLEXT_SHARED=1
!
Index: vasp.doxy
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/vasp/vasp.doxy,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** vasp.doxy 28 Dec 2003 03:48:23 -0000 1.2
--- vasp.doxy 23 Sep 2004 04:04:49 -0000 1.3
***************
*** 1 ****
! # Doxyfile 1.2.13-20020210
#---------------------------------------------------------------------------
# General configuration options
#---------------------------------------------------------------------------
PROJECT_NAME = "vasp modular"
PROJECT_NUMBER = 0.0.8pre8
OUTPUT_DIRECTORY = f:/prog/max/vasp/doc/
OUTPUT_LANGUAGE = English
EXTRACT_ALL = YES
EXTRACT_PRIVATE = NO
EXTRACT_STATIC = YES
EXTRACT_LOCAL_CLASSES = YES
HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
BRIEF_MEMBER_DESC = YES
REPEAT_BRIEF = YES
ALWAYS_DETAILED_SEC = NO
INLINE_INHERITED_MEMB = NO
FULL_PATH_NAMES = NO
STRIP_FROM_PATH =
INTERNAL_DOCS = YES
STRIP_CODE_COMMENTS = YES
CASE_SENSE_NAMES = YES
SHORT_NAMES = NO
HIDE_SCOPE_NAMES = NO
VERBATIM_HEADERS = YES
SHOW_INCLUDE_FILES = YES
JAVADOC_AUTOBRIEF = NO
MULTILINE_CPP_IS_BRIEF = NO
DETAILS_AT_TOP = NO
INHERIT_DOCS = YES
INLINE_INFO = YES
SORT_MEMBER_DOCS = YES
DISTRIBUTE_GROUP_DOC = NO
TAB_SIZE = 8
GENERATE_TODOLIST = YES
GENERATE_TESTLIST = YES
GENERATE_BUGLIST = YES
ALIASES =
ENABLED_SECTIONS =
MAX_INITIALIZER_LINES = 30
OPTIMIZE_OUTPUT_FOR_C = NO
OPTIMIZE_OUTPUT_JAVA = NO
SHOW_USED_FILES = YES
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
QUIET = NO
WARNINGS = YES
WARN_IF_UNDOCUMENTED = YES
WARN_FORMAT = "$file:$line: $text"
WARN_LOGFILE =
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
INPUT = f:/prog/max/vasp/source/
FILE_PATTERNS =
RECURSIVE = NO
EXCLUDE =
EXCLUDE_SYMLINKS = NO
EXCLUDE_PATTERNS =
EXAMPLE_PATH =
EXAMPLE_PATTERNS =
EXAMPLE_RECURSIVE = NO
IMAGE_PATH =
INPUT_FILTER =
FILTER_SOURCE_FILES = NO
#---------------------------------------------------------------------------
# configuration options related to source browsing
#---------------------------------------------------------------------------
SOURCE_BROWSER = YES
INLINE_SOURCES = NO
REFERENCED_BY_RELATION = YES
REFERENCES_RELATION = YES
#---------------------------------------------------------------------------
# configuration options related to the alphabetical class index
#---------------------------------------------------------------------------
ALPHABETICAL_INDEX = YES
COLS_IN_ALPHA_INDEX = 5
IGNORE_PREFIX =
#---------------------------------------------------------------------------
# configuration options related to the HTML output
#---------------------------------------------------------------------------
GENERATE_HTML = YES
HTML_OUTPUT = html
HTML_FILE_EXTENSION = .html
HTML_HEADER =
HTML_FOOTER =
HTML_STYLESHEET =
HTML_ALIGN_MEMBERS = YES
GENERATE_HTMLHELP = NO
CHM_FILE =
HHC_LOCATION =
GENERATE_CHI = NO
BINARY_TOC = NO
TOC_EXPAND = NO
DISABLE_INDEX = NO
ENUM_VALUES_PER_LINE = 4
GENERATE_TREEVIEW = NO
TREEVIEW_WIDTH = 250
#---------------------------------------------------------------------------
# configuration options related to the LaTeX output
#---------------------------------------------------------------------------
GENERATE_LATEX = NO
LATEX_OUTPUT = latex
LATEX_CMD_NAME = latex
MAKEINDEX_CMD_NAME = makeindex
COMPACT_LATEX = NO
PAPER_TYPE = a4wide
EXTRA_PACKAGES =
LATEX_HEADER =
PDF_HYPERLINKS = NO
USE_PDFLATEX = NO
LATEX_BATCHMODE = NO
#---------------------------------------------------------------------------
# configuration options related to the RTF output
#---------------------------------------------------------------------------
GENERATE_RTF = NO
RTF_OUTPUT = rtf
COMPACT_RTF = NO
RTF_HYPERLINKS = NO
RTF_STYLESHEET_FILE =
RTF_EXTENSIONS_FILE =
#---------------------------------------------------------------------------
# configuration options related to the man page output
#---------------------------------------------------------------------------
GENERATE_MAN = NO
MAN_OUTPUT = man
MAN_EXTENSION = .3
MAN_LINKS = NO
#---------------------------------------------------------------------------
# configuration options related to the XML output
#---------------------------------------------------------------------------
GENERATE_XML = NO
#---------------------------------------------------------------------------
# configuration options for the AutoGen Definitions output
#---------------------------------------------------------------------------
GENERATE_AUTOGEN_DEF = NO
#---------------------------------------------------------------------------
# Configuration options related to the preprocessor
#---------------------------------------------------------------------------
ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
SEARCH_INCLUDES = YES
INCLUDE_PATH =
INCLUDE_FILE_PATTERNS =
PREDEFINED =
EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = YES
#---------------------------------------------------------------------------
# Configuration::addtions related to external references
#---------------------------------------------------------------------------
TAGFILES =
GENERATE_TAGFILE =
ALLEXTERNALS = NO
EXTERNAL_GROUPS = YES
PERL_PATH = /usr/bin/perl
#---------------------------------------------------------------------------
# Configuration options related to the dot tool
#---------------------------------------------------------------------------
CLASS_DIAGRAMS = YES
HIDE_UNDOC_RELATIONS = YES
HAVE_DOT = NO
CLASS_GRAPH = YES
COLLABORATION_GRAPH = YES
TEMPLATE_RELATIONS = YES
INCLUDE_GRAPH = YES
INCLUDED_BY_GRAPH = YES
GRAPHICAL_HIERARCHY = YES
DOT_IMAGE_FORMAT = png
DOT_PATH =
DOTFILE_DIRS =
MAX_DOT_GRAPH_WIDTH = 1024
MAX_DOT_GRAPH_HEIGHT = 1024
GENERATE_LEGEND = YES
DOT_CLEANUP = YES
#---------------------------------------------------------------------------
# Configuration::addtions related to the search engine
#---------------------------------------------------------------------------
SEARCHENGINE = NO
CGI_NAME = search.cgi
CGI_URL =
DOC_URL =
DOC_ABSPATH =
BIN_ABSPATH = /usr/local/bin/
EXT_DOC_PATHS =
\ No newline at end of file
--- 1,188 ----
! # Doxyfile 1.2.13-20020210
!
! #---------------------------------------------------------------------------
! # General configuration options
! #---------------------------------------------------------------------------
! PROJECT_NAME = "vasp modular"
! PROJECT_NUMBER = 0.0.8pre8
! OUTPUT_DIRECTORY = f:/prog/max/vasp/doc/
! OUTPUT_LANGUAGE = English
! EXTRACT_ALL = YES
! EXTRACT_PRIVATE = NO
! EXTRACT_STATIC = YES
! EXTRACT_LOCAL_CLASSES = YES
! HIDE_UNDOC_MEMBERS = NO
! HIDE_UNDOC_CLASSES = NO
! BRIEF_MEMBER_DESC = YES
! REPEAT_BRIEF = YES
! ALWAYS_DETAILED_SEC = NO
! INLINE_INHERITED_MEMB = NO
! FULL_PATH_NAMES = NO
! STRIP_FROM_PATH =
! INTERNAL_DOCS = YES
! STRIP_CODE_COMMENTS = YES
! CASE_SENSE_NAMES = YES
! SHORT_NAMES = NO
! HIDE_SCOPE_NAMES = NO
! VERBATIM_HEADERS = YES
! SHOW_INCLUDE_FILES = YES
! JAVADOC_AUTOBRIEF = NO
! MULTILINE_CPP_IS_BRIEF = NO
! DETAILS_AT_TOP = NO
! INHERIT_DOCS = YES
! INLINE_INFO = YES
! SORT_MEMBER_DOCS = YES
! DISTRIBUTE_GROUP_DOC = NO
! TAB_SIZE = 8
! GENERATE_TODOLIST = YES
! GENERATE_TESTLIST = YES
! GENERATE_BUGLIST = YES
! ALIASES =
! ENABLED_SECTIONS =
! MAX_INITIALIZER_LINES = 30
! OPTIMIZE_OUTPUT_FOR_C = NO
! OPTIMIZE_OUTPUT_JAVA = NO
! SHOW_USED_FILES = YES
! #---------------------------------------------------------------------------
! # configuration options related to warning and progress messages
! #---------------------------------------------------------------------------
! QUIET = NO
! WARNINGS = YES
! WARN_IF_UNDOCUMENTED = YES
! WARN_FORMAT = "$file:$line: $text"
! WARN_LOGFILE =
! #---------------------------------------------------------------------------
! # configuration options related to the input files
! #---------------------------------------------------------------------------
! INPUT = f:/prog/max/vasp/source/
! FILE_PATTERNS =
! RECURSIVE = NO
! EXCLUDE =
! EXCLUDE_SYMLINKS = NO
! EXCLUDE_PATTERNS =
! EXAMPLE_PATH =
! EXAMPLE_PATTERNS =
! EXAMPLE_RECURSIVE = NO
! IMAGE_PATH =
! INPUT_FILTER =
! FILTER_SOURCE_FILES = NO
! #---------------------------------------------------------------------------
! # configuration options related to source browsing
! #---------------------------------------------------------------------------
! SOURCE_BROWSER = YES
! INLINE_SOURCES = NO
! REFERENCED_BY_RELATION = YES
! REFERENCES_RELATION = YES
! #---------------------------------------------------------------------------
! # configuration options related to the alphabetical class index
! #---------------------------------------------------------------------------
! ALPHABETICAL_INDEX = YES
! COLS_IN_ALPHA_INDEX = 5
! IGNORE_PREFIX =
! #---------------------------------------------------------------------------
! # configuration options related to the HTML output
! #---------------------------------------------------------------------------
! GENERATE_HTML = YES
! HTML_OUTPUT = html
! HTML_FILE_EXTENSION = .html
! HTML_HEADER =
! HTML_FOOTER =
! HTML_STYLESHEET =
! HTML_ALIGN_MEMBERS = YES
! GENERATE_HTMLHELP = NO
! CHM_FILE =
! HHC_LOCATION =
! GENERATE_CHI = NO
! BINARY_TOC = NO
! TOC_EXPAND = NO
! DISABLE_INDEX = NO
! ENUM_VALUES_PER_LINE = 4
! GENERATE_TREEVIEW = NO
! TREEVIEW_WIDTH = 250
! #---------------------------------------------------------------------------
! # configuration options related to the LaTeX output
! #---------------------------------------------------------------------------
! GENERATE_LATEX = NO
! LATEX_OUTPUT = latex
! LATEX_CMD_NAME = latex
! MAKEINDEX_CMD_NAME = makeindex
! COMPACT_LATEX = NO
! PAPER_TYPE = a4wide
! EXTRA_PACKAGES =
! LATEX_HEADER =
! PDF_HYPERLINKS = NO
! USE_PDFLATEX = NO
! LATEX_BATCHMODE = NO
! #---------------------------------------------------------------------------
! # configuration options related to the RTF output
! #---------------------------------------------------------------------------
! GENERATE_RTF = NO
! RTF_OUTPUT = rtf
! COMPACT_RTF = NO
! RTF_HYPERLINKS = NO
! RTF_STYLESHEET_FILE =
! RTF_EXTENSIONS_FILE =
! #---------------------------------------------------------------------------
! # configuration options related to the man page output
! #---------------------------------------------------------------------------
! GENERATE_MAN = NO
! MAN_OUTPUT = man
! MAN_EXTENSION = .3
! MAN_LINKS = NO
! #---------------------------------------------------------------------------
! # configuration options related to the XML output
! #---------------------------------------------------------------------------
! GENERATE_XML = NO
! #---------------------------------------------------------------------------
! # configuration options for the AutoGen Definitions output
! #---------------------------------------------------------------------------
! GENERATE_AUTOGEN_DEF = NO
! #---------------------------------------------------------------------------
! # Configuration options related to the preprocessor
! #---------------------------------------------------------------------------
! ENABLE_PREPROCESSING = YES
! MACRO_EXPANSION = YES
! EXPAND_ONLY_PREDEF = YES
! SEARCH_INCLUDES = YES
! INCLUDE_PATH =
! INCLUDE_FILE_PATTERNS =
! PREDEFINED =
! EXPAND_AS_DEFINED =
! SKIP_FUNCTION_MACROS = YES
! #---------------------------------------------------------------------------
! # Configuration::addtions related to external references
! #---------------------------------------------------------------------------
! TAGFILES =
! GENERATE_TAGFILE =
! ALLEXTERNALS = NO
! EXTERNAL_GROUPS = YES
! PERL_PATH = /usr/bin/perl
! #---------------------------------------------------------------------------
! # Configuration options related to the dot tool
! #---------------------------------------------------------------------------
! CLASS_DIAGRAMS = YES
! HIDE_UNDOC_RELATIONS = YES
! HAVE_DOT = NO
! CLASS_GRAPH = YES
! COLLABORATION_GRAPH = YES
! TEMPLATE_RELATIONS = YES
! INCLUDE_GRAPH = YES
! INCLUDED_BY_GRAPH = YES
! GRAPHICAL_HIERARCHY = YES
! DOT_IMAGE_FORMAT = png
! DOT_PATH =
! DOTFILE_DIRS =
! MAX_DOT_GRAPH_WIDTH = 1024
! MAX_DOT_GRAPH_HEIGHT = 1024
! GENERATE_LEGEND = YES
! DOT_CLEANUP = YES
! #---------------------------------------------------------------------------
! # Configuration::addtions related to the search engine
! #---------------------------------------------------------------------------
! SEARCHENGINE = NO
! CGI_NAME = search.cgi
! CGI_URL =
! DOC_URL =
! DOC_ABSPATH =
! BIN_ABSPATH = /usr/local/bin/
! EXT_DOC_PATHS =