[cig-commits] commit: Removing the final bits of VMake.... makefile and Makefile.def

Mercurial hg at geodynamics.org
Mon Nov 24 11:29:38 PST 2008


changeset:   81:c116bfc9b9db
tag:         v1.2.0
user:        Julian Giordani <julian.giordani at sci.monash.edu.au>
date:        Mon Oct 06 15:21:30 2008 +1100
files:       Base/makefile Base/src/makefile Base/tests/makefile Base/tests/plugins/makefile DrawingObjects/makefile DrawingObjects/src/makefile DrawingObjects/tests/DummyFieldVariable/makefile DrawingObjects/tests/DummySwarmVariable/makefile DrawingObjects/tests/makefile InputFormats/makefile InputFormats/src/makefile InputFormats/tests/makefile InputFormats/tests/plugins/makefile ModelComponents/makefile OutputFormats/makefile OutputFormats/src/makefile OutputFormats/tests/makefile RenderingEngines/makefile RenderingEngines/src/makefile RenderingEngines/tests/DummyOpenGL/makefile RenderingEngines/tests/makefile WindowInteractions/makefile WindowInteractions/src/makefile Windowing/makefile Windowing/src/makefile doc/Makefile.def doc/makefile libglucifer/makefile libglucifer/src/makefile makefile plugins/lucPlugin/makefile plugins/makefile src/makefile
description:
Removing the final bits of VMake.... makefile and Makefile.def


diff -r 823068e489f5 -r c116bfc9b9db Base/makefile
--- a/Base/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Subdirectories
-subdirs := src tests
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db Base/src/makefile
--- a/Base/src/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Source Code and Header files
-SRCS := $(wildcard *.c)
-HDRS := $(wildcard *.h)
-
-packages = STGDOMAIN STGERMAIN
-
-ifdef HAVE_OSMESA
-	packages += OSMESA
-endif
-
-ifdef HAVE_GL
-	packages += GL
-endif
-
-packages += MPI XML 
-
-# Work out name to call library
-lib = luc$(shell basename `pwd | sed s/src//g`)
-libdynamic = yes
-libstatic = yes
-
-# Name of directory to place header files
-includes := ${PROJECT}/$(shell basename `pwd | sed s/src//g`)
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db Base/tests/makefile
--- a/Base/tests/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-##
-## Copyright (C), 2003, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street, Melbourne, 3053, Australia.
-##
-## Authors:
-##	Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
-##	Patrick D. Sunter, Software Engineer, VPAC. (pds at vpac.org)
-##	Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
-##	Siew-Ching Tan, Software Engineer, VPAC. (siew at vpac.org)
-##	Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
-##	Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
-##
-## This file may be distributed under the terms of the VPAC Public License
-## as defined by VPAC of Australia and appearing in the file
-## LICENSE.VPL included in the packaging of this file.
-##
-## This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-## WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-##
-## $Id: Makefile.rules 2752 2005-03-07 06:45:55Z AlanLo $
-##
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-NAME = $(shell basename `pwd | sed s/tests//g`)
-
-tests = lib${PROJECT}_${NAME}
-CHECKS = $(wildcard *.sh)
-SRCS = $(wildcard *.c)
-
-subdirs = plugins
-
-EXTERNAL_INCLUDES = -I${INC_DIR}/${PROJECT} 
-EXTERNAL_LIBS= -L${LIB_DIR} -llucBase
-
-ifdef HAVE_OSMESA
-	packages += OSMESA
-endif
-
-ifdef HAVE_GL
-	packages += GL
-endif
-
-packages += STGDOMAIN STGERMAIN DL HYPRE PETSC MPI MATH XML 
-
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db Base/tests/plugins/makefile
--- a/Base/tests/plugins/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# External Libraries and Headers
-#EXTERNAL_INCLUDES = ${STGERMAIN_INCLUDES} ${MPI_INCLUDES} ${XML_CFLAGS} 
-#EXTERNAL_LIBS = ${STGERMAIN_LIBS} ${MPI_LIBS} ${XML_LIBS} 
-
-packages = STGDOMAIN STGERMAIN MPI XML GL
-
-# Note don't put the .c extension. just the base name of the plugin
-plugins := $(wildcard *.c)
-
-include ${PROJ_ROOT}/Makefile.vmake
-
diff -r 823068e489f5 -r c116bfc9b9db DrawingObjects/makefile
--- a/DrawingObjects/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Subdirectories
-subdirs := src tests
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db DrawingObjects/src/makefile
--- a/DrawingObjects/src/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Source Code and Header files
-SRCS := $(wildcard *.c)
-HDRS := $(wildcard *.h)
-
-packages = PICELLERATOR STGFEM STGDOMAIN STGERMAIN PETSC MPI XML GL
-
-ifdef HAVE_GL2PS
-	packages += GL2PS
-endif
-
-# Work out name to call library
-lib = luc$(shell basename `pwd | sed s/src//g`)
-libdynamic = yes
-libstatic = yes
-
-# Name of directory to place header files
-includes := ${PROJECT}/$(shell basename `pwd | sed s/src//g`)
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db DrawingObjects/tests/DummyFieldVariable/makefile
--- a/DrawingObjects/tests/DummyFieldVariable/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Subdirectories
-subdirs := $(shell find * -type d -prune ! -name .svn ) 
-
-# Source Code and Header files
-SRCS := $(wildcard *.c)
-HDRS := $(wildcard *.h)
-
-# What to call the plugin
-modName := $(shell basename `pwd`)
-mod = ${modName}
-
-# Where to put header files
-includes = ${PROJECT}/${modName}
-
-# External Libraries and Headers
-packages = STGDOMAIN STGERMAIN MPI XML PYTHON
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db DrawingObjects/tests/DummySwarmVariable/makefile
--- a/DrawingObjects/tests/DummySwarmVariable/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Subdirectories
-subdirs := $(shell find * -type d -prune ! -name .svn ) 
-
-# Source Code and Header files
-SRCS := $(wildcard *.c)
-HDRS := $(wildcard *.h)
-
-# What to call the plugin
-modName := $(shell basename `pwd`)
-mod = ${modName}
-
-# Where to put header files
-includes = ${PROJECT}/${modName}
-
-# External Libraries and Headers
-packages = STGDOMAIN STGERMAIN MPI XML PYTHON
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db DrawingObjects/tests/makefile
--- a/DrawingObjects/tests/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# External Libraries and Headers
-EXTERNAL_INCLUDES = -I${INC_DIR}/${PROJECT} ${GL_INCLUDES}
-EXTERNAL_LIBS = ${RPATH_LFLAGS} -L${LIB_DIR} -llucBase -llucWindowing -llucRenderingEngines  -llucOutputFormats -llucInputFormats -llucDrawingObjects -lDummyOpenGL
-
-subdirs = DummyFieldVariable DummySwarmVariable 
-
-packages = PICELLERATOR STGFEM STGDOMAIN STGERMAIN 
-
-ifdef HAVE_OSMESA
-	packages += OSMESA
-endif
-ifdef HAVE_GL
-	packages += GL
-endif
-
-ifdef HAVE_GL2PS
-	packages += GL2PS
-endif
-
-packages += PETSC MPI XML 
-
-tests = lib${PROJECT}_DrawingObjects
-SRCS = $(wildcard *.c)
-checks = $(wildcard test*.sh)
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db InputFormats/makefile
--- a/InputFormats/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Subdirectories
-subdirs := src tests
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db InputFormats/src/makefile
--- a/InputFormats/src/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Source Code and Header files
-SRCS := $(wildcard *.c)
-HDRS := $(wildcard *.h)
-
-packages = STGDOMAIN STGERMAIN MPI XML TIFF JPEG PNG LIBFAME
-
-# Work out name to call library
-lib = luc$(shell basename `pwd | sed s/src//g`)
-libdynamic = yes
-libstatic = yes
-
-# Name of directory to place header files
-includes := ${PROJECT}/$(shell basename `pwd | sed s/src//g`)
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db InputFormats/tests/makefile
--- a/InputFormats/tests/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-##
-## Copyright (C), 2003, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street, Melbourne, 3053, Australia.
-##
-## Authors:
-##	Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
-##	Patrick D. Sunter, Software Engineer, VPAC. (pds at vpac.org)
-##	Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
-##	Siew-Ching Tan, Software Engineer, VPAC. (siew at vpac.org)
-##	Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
-##	Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
-##
-## This file may be distributed under the terms of the VPAC Public License
-## as defined by VPAC of Australia and appearing in the file
-## LICENSE.VPL included in the packaging of this file.
-##
-## This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-## WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-##
-## $Id: Makefile.rules 2752 2005-03-07 06:45:55Z AlanLo $
-##
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-NAME = $(shell basename `pwd | sed s/tests//g`)
-
-tests = lib${PROJECT}_${NAME}
-checks = testInputPPM.0of1.sh
-ifdef HAVE_TIFF
-	checks += testInputTIFF.0of1.sh
-endif
-
-subdirs = plugins
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db InputFormats/tests/plugins/makefile
--- a/InputFormats/tests/plugins/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# External Libraries and Headers
-EXTERNAL_INCLUDES = ${STGERMAIN_INCLUDES} ${MPI_INCLUDES} ${XML_CFLAGS} 
-EXTERNAL_LIBS = ${STGERMAIN_LIBS} ${MPI_LIBS} ${XML_LIBS} 
-
-# Note don't put the .c extension. just the base name of the plugin
-plugins := $(wildcard *.c)
-
-include ${PROJ_ROOT}/Makefile.vmake
-
diff -r 823068e489f5 -r c116bfc9b9db ModelComponents/makefile
--- a/ModelComponents/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-
-SHELL := $(shell which bash)
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-
-include ${PROJ_ROOT}/Makefile.system
-
-XMLS_TARGET_DIR = ${EXPORT_INCLUDE_DIR}
-XMLS = $(wildcard *.xml)
-
-# obtain defaults for required variables according to system and project location, and then run the build.
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db OutputFormats/makefile
--- a/OutputFormats/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Subdirectories
-subdirs := src tests
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db OutputFormats/src/makefile
--- a/OutputFormats/src/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Source Code and Header files
-SRCS := $(wildcard *.c)
-HDRS := $(wildcard *.h)
-
-packages = STGDOMAIN STGERMAIN MPI XML TIFF JPEG PNG LIBFAME LIBAVCODEC
-
-ifdef HAVE_GL2PS
-	packages += GL2PS
-endif
-
-# Work out name to call library
-lib = luc$(shell basename `pwd | sed s/src//g`)
-libdynamic = yes
-libstatic = yes
-
-# Name of directory to place header files
-includes := ${PROJECT}/$(shell basename `pwd | sed s/src//g`)
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db OutputFormats/tests/makefile
--- a/OutputFormats/tests/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-##
-## Copyright (C), 2003, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street, Melbourne, 3053, Australia.
-##
-## Authors:
-##	Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
-##	Patrick D. Sunter, Software Engineer, VPAC. (pds at vpac.org)
-##	Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
-##	Siew-Ching Tan, Software Engineer, VPAC. (siew at vpac.org)
-##	Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
-##	Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
-##
-## This file may be distributed under the terms of the VPAC Public License
-## as defined by VPAC of Australia and appearing in the file
-## LICENSE.VPL included in the packaging of this file.
-##
-## This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-## WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-##
-## $Id: Makefile.rules 2752 2005-03-07 06:45:55Z AlanLo $
-##
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-NAME = $(shell basename `pwd | sed s/tests//g`)
-
-tests = lib${PROJECT}_${NAME}
-SRCS = $(wildcard *.c)
-
-checks = testOutputPPM.0of1.sh
-ifdef HAVE_PNG
-	checks += testOutputPNG.0of1.sh
-endif
-ifdef HAVE_JPEG
-	checks += testOutputJPEG.0of1.sh
-endif
-ifdef HAVE_TIFF
-
-ifeq (${SYSTEM_BIG_ENDIAN},0)
-	checks += testOutputTIFF-littleendian.0of1.sh
-else
-	checks += testOutputTIFF-bigendian.0of1.sh
-endif
-
-endif
-ifdef HAVE_LIBFAME
-
-# The encoded results differ slightly depending on platform
-ifneq (${SYSTEM_64},0)
-	checks += testEncoderLibfame-64bit.0of1.sh
-else
-ifeq (${SYSTEM},Darwin)
-	checks += testEncoderLibfame-darwin.0of1.sh
-else
-	checks += testEncoderLibfame.0of1.sh
-endif
-endif
-
-endif
-
-packages = STGDOMAIN STGERMAIN MPI XML MATH DL HYPRE
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db RenderingEngines/makefile
--- a/RenderingEngines/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Subdirectories
-subdirs := src tests
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db RenderingEngines/src/makefile
--- a/RenderingEngines/src/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Source Code and Header files
-SRCS := $(wildcard *.c) $(wildcard *.cxx)
-HDRS := $(wildcard *.h)
-
-packages = STGDOMAIN STGERMAIN MPI XML GL
-
-ifdef HAVE_VTK
-	packages += VTK
-endif
-
-ifdef HAVE_GL2PS
-	packages += GL2PS
-endif
-
-# Work out name to call library
-lib = luc$(shell basename `pwd | sed s/src//g`)
-libdynamic = yes
-libstatic = yes
-
-# Name of directory to place header files
-includes := ${PROJECT}/$(shell basename `pwd | sed s/src//g`)
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db RenderingEngines/tests/DummyOpenGL/makefile
--- a/RenderingEngines/tests/DummyOpenGL/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Source Code and Header files
-SRCS := $(wildcard *.c)
-HDRS := $(wildcard *.h)
-
-EXTERNAL_INCLUDES = ${GL_INCLUDES}
-
-# External Libraries and Headers
-packages = STGDOMAIN STGERMAIN MPI XML
-
-# Work out name to call library
-lib = $(shell basename `pwd | sed s/src//g`)
-libdynamic = yes
-
-# Name of directory to place header files
-includes := ${PROJECT}/$(shell basename `pwd | sed s/src//g`)
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db RenderingEngines/tests/makefile
--- a/RenderingEngines/tests/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# External Libraries and Headers
-EXTERNAL_INCLUDES = -I${INC_DIR}/${PROJECT} ${GL_INCLUDES}
-EXTERNAL_LIBS = ${RPATH_LFLAGS} -L${LIB_DIR} -llucBase -llucRenderingEngines -lDummyOpenGL
-
-subdirs = DummyOpenGL
-
-packages = STGDOMAIN STGERMAIN GL PETSC MPI XML 
-
-ifdef HAVE_GL2PS
-	packages += GL2PS
-endif
-
-tests = lib${PROJECT}_RenderingEngines
-SRCS = $(wildcard *.c)
-checks = $(wildcard *.sh)
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db WindowInteractions/makefile
--- a/WindowInteractions/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Subdirectories
-subdirs := src #tests
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db WindowInteractions/src/makefile
--- a/WindowInteractions/src/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Source Code and Header files
-SRCS := $(wildcard *.c) $(wildcard *.cxx)
-HDRS := $(wildcard *.h)
-
-packages = PICELLERATOR STGFEM STGDOMAIN STGERMAIN PETSC MPI XML GL
-
-ifdef HAVE_VTK
-	packages += VTK
-endif
-
-# Work out name to call library
-lib = luc$(shell basename `pwd | sed s/src//g`)
-libdynamic = yes
-libstatic = yes
-
-# Name of directory to place header files
-includes := ${PROJECT}/$(shell basename `pwd | sed s/src//g`)
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db Windowing/makefile
--- a/Windowing/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Subdirectories
-subdirs := src #tests
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db Windowing/src/makefile
--- a/Windowing/src/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Source Code and Header files
-SRCS := $(wildcard *.c) $(wildcard *.cxx)
-HDRS := $(wildcard *.h)
-
-packages = STGDOMAIN STGERMAIN
-
-ifdef HAVE_OSMESA
-	packages += OSMESA
-endif
-
-ifdef HAVE_GL
-	packages += GL
-endif
-
-ifdef HAVE_SDL
-	packages += SDL
-endif
-ifdef HAVE_VTK
-	packages += VTK
-endif
-
-ifdef HAVE_X11
-	packages += X11
-endif
-
-ifdef HAVE_CARBON
-	packages += CARBON
-endif
-
-packages += MPI XML
-
-# Work out name to call library
-lib = luc$(shell basename `pwd | sed s/src//g`)
-libdynamic = yes
-libstatic = yes
-
-# Name of directory to place header files
-includes := ${PROJECT}/$(shell basename `pwd | sed s/src//g`)
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db doc/Makefile.def
--- a/doc/Makefile.def	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-##
-## Copyright (C), 2003, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street, Melbourne, 3053, Australia.
-##
-## Authors:
-##	Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
-##	Patrick D. Sunter, Software Engineer, VPAC. (pds at vpac.org)
-##	Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
-##	Siew-Ching Tan, Software Engineer, VPAC. (siew at vpac.org)
-##	Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
-##	Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
-##
-## This file may be distributed under the terms of the VPAC Public License
-## as defined by VPAC of Australia and appearing in the file
-## LICENSE.VPL included in the packaging of this file.
-##
-## This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-## WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-##
-## $Id: Makefile.def 2338 2004-11-19 04:51:11Z SteveQuenette $
-##
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-def_doxinputs = C_full.doxyconf.in
diff -r 823068e489f5 -r c116bfc9b9db doc/makefile
--- a/doc/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-##
-## Copyright (C), 2003, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street, Melbourne, 3053, Australia.
-##
-## Authors:
-##	Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
-##	Patrick D. Sunter, Software Engineer, VPAC. (pds at vpac.org)
-##	Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
-##	Siew-Ching Tan, Software Engineer, VPAC. (siew at vpac.org)
-##	Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
-##	Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
-##
-## This file may be distributed under the terms of the VPAC Public License
-## as defined by VPAC of Australia and appearing in the file
-## LICENSE.VPL included in the packaging of this file.
-##
-## This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-## WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-##
-## $Id: Makefile.def 2338 2004-11-19 04:51:11Z SteveQuenette $
-##
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# obtain defaults for required variables according to system and project location, and then run the build.
-ifndef PROJ_ROOT
-	PROJ_ROOT=..
-endif
-include ${PROJ_ROOT}/Makefile.system
-
-# test that Doxygen is installed and working 
-
-
-include Makefile.def
-DOXINPUTS = ${def_doxinputs}
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db libglucifer/makefile
--- a/libglucifer/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Subdirectories
-subdirs := src 
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db libglucifer/src/makefile
--- a/libglucifer/src/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-##
-## Copyright (C), 2003, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street, Melbourne, 3053, Australia.
-##
-## Authors:
-##	Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
-##	Patrick D. Sunter, Software Engineer, VPAC. (pds at vpac.org)
-##	Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
-##	Siew-Ching Tan, Software Engineer, VPAC. (siew at vpac.org)
-##	Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
-##	Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
-##
-## This file may be distributed under the terms of the VPAC Public License
-## as defined by VPAC of Australia and appearing in the file
-## LICENSE.VPL included in the packaging of this file.
-##
-## This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-## WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-##
-## $Id: Makefile.rules 2746 2005-03-06 00:29:00Z SteveQuenette $
-##
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-lib = ${PROJECT}
-libstatic = yes
-libdynamic = yes
-includes = ${PROJECT}
-
-SRCS = $(wildcard *.c)
-
-HDRS = $(wildcard *.h)
-
-PROJ_OBJLISTS = lucWindowInteractions lucInputFormats lucOutputFormats lucDrawingObjects lucRenderingEngines lucWindowing lucBase
-EXTERNAL_LIBS = -L${LIB_DIR} 
-
-EXTERNAL_INCLUDES = -I${INC_DIR}/${PROJECT}  -DLIB_DIR=\"${LIB_DIR}\"
-
-packages = PICELLERATOR STGFEM STGDOMAIN STGERMAIN
-
-ifdef HAVE_OSMESA
-	packages += OSMESA
-endif
-ifdef HAVE_GL
-	packages += GL
-endif
-ifdef HAVE_X11
-	packages += X11
-endif
-ifdef HAVE_TIFF
-	packages += TIFF
-endif
-ifdef HAVE_JPEG
-	packages += JPEG
-endif
-ifdef HAVE_PNG
-	packages += PNG
-endif
-ifdef HAVE_LIBFAME
-	packages += LIBFAME
-endif
-ifdef HAVE_SDL
-	packages += SDL
-endif
-ifdef HAVE_CARBON
-	packages += CARBON
-endif
-ifdef HAVE_LIBAVCODEC
-	packages += LIBAVCODEC
-endif
-
-ifdef HAVE_GL2PS
-	packages += GL2PS
-endif
-
-ifdef HAVE_VTK
-	packages += VTK
-endif
-
-packages += PETSC MPI XML MATH 
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db makefile
--- a/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Subdirectories
-subdirs := Base Windowing RenderingEngines OutputFormats InputFormats DrawingObjects WindowInteractions libglucifer src plugins ModelComponents
-
-
-ifeq (true,$(shell if test -x $(DOXYGEN); then echo true; fi ))
-	def_sub += doc
-else
-	warn := $(shell echo Not entering doc directory as doxygen not found. 1>&2 )
-	warn := $(shell echo To generate doxgen docs, please set the DOXYGEN environment variable then re-run configure.sh. 1>&2 )
-endif
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db plugins/lucPlugin/makefile
--- a/plugins/lucPlugin/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Source Code and Header files
-SRCS := $(wildcard *.c) $(wildcard *.cpp)
-HDRS := $(wildcard *.h)
-
-# External Libraries and Headers
-EXTERNAL_INCLUDES = -I${INC_DIR}
-EXTERNAL_LIBS = -L${LIB_DIR} -lglucifer ${GLUCIFER_RPATH} 
-packages = PICELLERATOR STGFEM STGDOMAIN STGERMAIN
-
-ifdef HAVE_OSMESA
-	packages += OSMESA
-endif
-ifdef HAVE_GL
-	packages += GL
-endif
-ifdef HAVE_X11
-	packages += X11
-endif
-ifdef HAVE_VTK
-	packages += VTK
-endif
-
-packages += PETSC MPI XML
-
-# Work out name to call library
-mod = $(shell basename `pwd | sed s/src//g`)
-
-# Name of directory to place header files
-includes := ${PROJECT}/${mod}
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db plugins/makefile
--- a/plugins/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-#Finds the Absolute path to the Project Root directory
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-# Subdirectories
-subdirs := $(shell find * -type d -follow -prune ! -name .svn )
-
-include ${PROJ_ROOT}/Makefile.vmake
diff -r 823068e489f5 -r c116bfc9b9db src/makefile
--- a/src/makefile	Fri Oct 03 08:05:30 2008 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-##
-## Victorian Partnership for Advanced Computing (VPAC) Ltd, Australia
-## (C) 2003 All Rights Reserved
-##
-## <copyright-release-tag>
-##
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-SHELL := /bin/bash
-PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
-include ${PROJ_ROOT}/Makefile.system
-
-bin = ${PROJECT}
-SRCS = main.c
-
-EXTERNAL_LIBS =  -lglucifer ${EXPORT_DYNAMIC_LFLAGS}
-EXTERNAL_INCLUDES = -DMODULE_EXT=\"${MODULE_EXT}\" -I${GLUCIFER_INCDIR}
-
-packages = PICELLERATOR STGFEM STGDOMAIN STGERMAIN
-
-ifdef HAVE_OSMESA
-	packages += OSMESA
-endif
-
-ifdef HAVE_GL
-	packages += GL
-endif
-
-ifdef HAVE_X11
-	packages += X11
-endif
-
-ifdef HAVE_VTK
-	packages += VTK
-endif
-
-ifdef HAVE_LIBAVCODEC
-	packages += LIBAVCODEC
-endif
-
-ifdef HAVE_GL2PS
-	packages += GL2PS
-endif
-
-packages += PETSC MPI XML
-
-include ${PROJ_ROOT}/Makefile.vmake



More information about the CIG-COMMITS mailing list