Commit 7a5c5bff authored by Ken Martin's avatar Ken Martin
Browse files

new vtk arch

parent 9250d4fc
......@@ -11,8 +11,8 @@ SHELL = /bin/sh
CXX_FLAGS = ${CPPFLAGS} ${VTK_SHLIB_CFLAGS} ${XCFLAGS} ${CXXFLAGS} \
${VTK_INLINE_FLAGS} ${VTK_TEMPLATE_FLAGS} -I${srcdir} \
${XGLR_FLAGS} ${OGLR_FLAGS} ${SBR_FLAGS} ${GLR_FLAGS} \
-I${srcdir}/../core -I${TK_INCLUDE} -I${TCL_INCLUDE} \
${KIT_FLAGS} \
-I${srcdir}/../common -I${TK_INCLUDE} -I${TCL_INCLUDE} \
-D_HP_NO_FAST_MACROS ${HAVE_SETMON} ${WORDS_BIGENDIAN}
all: ${VTK_LIB_FILE} ${BUILD_TCL}
......@@ -24,32 +24,32 @@ all: ${VTK_LIB_FILE} ${BUILD_TCL}
#------------------------------------------------------------------------------
# rules for the normal library
#
libVTK${ME}.a: ${SRC_OBJ} ${SBR_OBJ} ${XGLR_OBJ} ${OGLR_OBJ} ${GLR_OBJ}
${AR} cr libVTK${ME}.a ${SRC_OBJ} ${SBR_OBJ} ${XGLR_OBJ} ${OGLR_OBJ} ${GLR_OBJ}
libVTK${ME}.a: ${SRC_OBJ} ${KIT_OBJ}
${AR} cr libVTK${ME}.a ${KIT_OBJ}
${RANLIB} libVTK$(ME).a
libVTK$(ME)$(SHLIB_SUFFIX)$(SHLIB_VERSION): ${SRC_OBJ} ${SBR_OBJ} ${XGLR_OBJ} ${OGLR_OBJ} ${GLR_OBJ}
libVTK$(ME)$(SHLIB_SUFFIX)$(SHLIB_VERSION): ${KIT_OBJ}
rm -f libVTK$(ME)$(SHLIB_SUFFIX)$(SHLIB_VERSION)
$(SHLIB_LD) -o libVTK$(ME)$(SHLIB_SUFFIX)$(SHLIB_VERSION) \
${SRC_OBJ} ${SBR_OBJ} ${XGLR_OBJ} ${OGLR_OBJ} ${GLR_OBJ} ${SHLIB_LD_LIBS}
${KIT_OBJ} ${SHLIB_LD_LIBS}
#------------------------------------------------------------------------------
# rules for the tcl library
#
build_tcl: ${TCL_LIB_FILE}
tcl/${ME}Init.cxx: ../tcl/kit_init ${TCL_NEWS}
../tcl/kit_init VTK${ME}Tcl ${TCL_NEWS} > tcl/${ME}Init.cxx
tcl/${ME}Init.cxx: ../tcl/kit_init ${KIT_NEWS}
../tcl/kit_init VTK${ME}Tcl ${KIT_NEWS} > tcl/${ME}Init.cxx
libVTK${ME}Tcl.a: tcl/${ME}Init.o ${KIT_LIBS} ${SRC_OBJ} ${TCL_OBJ} ${SBR_OBJ} ${XGLR_OBJ} ${OGLR_OBJ} ${GLR_OBJ}
${AR} cr libVTK${ME}Tcl.a tcl/${ME}Init.o ${KIT_LIBS} ${TCL_OBJ} ${SRC_OBJ} ${SBR_OBJ} ${XGLR_OBJ} ${OGLR_OBJ} ${GLR_OBJ}
libVTK${ME}Tcl.a: tcl/${ME}Init.o ${KIT_LIBS} ${KIT_OBJ} ${KIT_TCL_OBJ}
${AR} cr libVTK${ME}Tcl.a tcl/${ME}Init.o ${KIT_LIBS} ${KIT_TCL_OBJ} ${KIT_OBJ}
${RANLIB} libVTK$(ME)Tcl.a
libVTK$(ME)Tcl$(SHLIB_SUFFIX)$(SHLIB_VERSION): tcl/${ME}Init.o ${KIT_LIBS} ${TCL_OBJ} $(SRC_OBJ) ${SBR_OBJ} ${XGLR_OBJ} ${OGLR_OBJ} ${GLR_OBJ}
libVTK$(ME)Tcl$(SHLIB_SUFFIX)$(SHLIB_VERSION): tcl/${ME}Init.o ${KIT_LIBS} ${KIT_TCL_OBJ} $(KIT_OBJ)
rm -f libVTK$(ME)Tcl$(SHLIB_SUFFIX)$(SHLIB_VERSION)
$(SHLIB_LD) -o libVTK$(ME)Tcl$(SHLIB_SUFFIX)$(SHLIB_VERSION) \
tcl/${ME}Init.o ${KIT_LIBS} ${TCL_OBJ} ${SRC_OBJ} ${SBR_OBJ} ${XGLR_OBJ} ${OGLR_OBJ} ${GLR_OBJ} ${SHLIB_LD_LIBS}
tcl/${ME}Init.o ${KIT_LIBS} ${KIT_TCL_OBJ} ${KIT_OBJ}
#------------------------------------------------------------------------------
......
......@@ -16,8 +16,8 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
BUILD_TCL = @BUILD_TCL@
CLEAN_TCL = @CLEAN_TCL@
BUILD_VIS = @BUILD_VIS@
CLEAN_VIS = @CLEAN_VIS@
BUILD_GRAPHICS = @BUILD_GRAPHICS@
CLEAN_GRAPHICS = @CLEAN_GRAPHICS@
#------------------------------------------------------------------------------
# Include user-editable defines.
......@@ -26,13 +26,13 @@ CLEAN_VIS = @CLEAN_VIS@
#------------------------------------------------------------------------------
all: ${BUILD_TCL} build_core ${BUILD_VIS} ${BUILD_TCL}${BUILD_TCL}
all: ${BUILD_TCL} build_common ${BUILD_GRAPHICS} ${BUILD_TCL}${BUILD_TCL}
build_core:
cd core; ${MAKE} -${MAKEFLAGS} all
build_common:
cd common; ${MAKE} -${MAKEFLAGS} all
build_vis:
cd vis; ${MAKE} -${MAKEFLAGS} all
build_graphics:
cd graphics; ${MAKE} -${MAKEFLAGS} all
build_tcl:
cd tcl; ${MAKE} -${MAKEFLAGS} all
......@@ -44,14 +44,14 @@ build_tclbuild_tcl:
#------------------------------------------------------------------------------
# Clean up all files that were built by make.
clean: ${CLEAN_TCL} ${CLEAN_VIS}
cd core; ${MAKE} -${MAKEFLAGS} clean
clean: ${CLEAN_TCL} ${CLEAN_GRAPHICS}
cd common; ${MAKE} -${MAKEFLAGS} clean
rm -f config.cache
clean_tcl:
cd tcl; ${MAKE} -${MAKEFLAGS} clean
cd tcl; ${MAKE} -${MAKEFLAGS} clean
clean_vis:
cd vis; ${MAKE} -${MAKEFLAGS} clean
clean_graphics:
cd graphics; ${MAKE} -${MAKEFLAGS} clean
......@@ -11,12 +11,22 @@ vtkGlrRenderer.o \
vtkGlrTexture.o
TCL_GLR_OBJ = \
tclvtkGlrActor.hh.o \
tclvtkGlrCamera.hh.o \
tclvtkGlrLight.hh.o \
tclvtkGlrPolyMapper.hh.o \
tclvtkGlrProperty.hh.o \
tclvtkGlrRenderWindow.hh.o \
tclvtkGlrRenderer.hh.o \
tclvtkGlrTexture.hh.o \
tclGNewGlr.o
tcl/vtkGlrActorTcl.o \
tcl/vtkGlrCameraTcl.o \
tcl/vtkGlrLightTcl.o \
tcl/vtkGlrPolyMapperTcl.o \
tcl/vtkGlrPropertyTcl.o \
tcl/vtkGlrRenderWindowTcl.o \
tcl/vtkGlrRendererTcl.o \
tcl/vtkGlrTextureTcl.o
TCL_GLR_NEWS = \
vtkGlrActor.h \
vtkGlrCamera.h \
vtkGlrLight.h \
vtkGlrPolyMapper.h \
vtkGlrProperty.h \
vtkGlrRenderWindow.h \
vtkGlrRenderer.h \
vtkGlrTexture.h
......@@ -11,12 +11,23 @@ vtkOglrRenderer.o \
vtkOglrTexture.o
TCL_OGLR_OBJ = \
tclvtkOglrActor.hh.o \
tclvtkOglrCamera.hh.o \
tclvtkOglrLight.hh.o \
tclvtkOglrPolyMapper.hh.o \
tclvtkOglrProperty.hh.o \
tclvtkOglrRenderWindow.hh.o \
tclvtkOglrRenderer.hh.o \
tclvtkOglrTexture.hh.o \
tclGNewOglr.o
tcl/vtkOglrActorTcl.o \
tcl/vtkOglrCameraTcl.o \
tcl/vtkOglrLightTcl.o \
tcl/vtkOglrPolyMapperTcl.o \
tcl/vtkOglrPropertyTcl.o \
tcl/vtkOglrRenderWindowTcl.o \
tcl/vtkOglrRendererTcl.o \
tcl/vtkOglrTextureTcl.o
TCL_OGLR_NEWS = \
vtkOglrActor.h \
vtkOglrCamera.h \
vtkOglrLight.h \
vtkOglrPolyMapper.h \
vtkOglrProperty.h \
vtkOglrRenderWindow.h \
vtkOglrRenderer.h \
vtkOglrTexture.h
......@@ -11,13 +11,23 @@ vtkSbrRenderer.o \
vtkSbrTexture.o
TCL_SBR_OBJ = \
tclvtkSbrActor.hh.o \
tclvtkSbrCamera.hh.o \
tclvtkSbrLight.hh.o \
tclvtkSbrPolyMapper.hh.o \
tclvtkSbrProperty.hh.o \
tclvtkSbrRenderWindow.hh.o \
tclvtkSbrRenderer.hh.o \
tclvtkSbrTexture.hh.o \
tclGNewSbr.o
tcl/vtkSbrActorTcl.o \
tcl/vtkSbrCameraTcl.o \
tcl/vtkSbrLightTcl.o \
tcl/vtkSbrPolyMapperTcl.o \
tcl/vtkSbrPropertyTcl.o \
tcl/vtkSbrRenderWindowTcl.o \
tcl/vtkSbrRendererTcl.o \
tcl/vtkSbrTextureTcl.o
TCL_SBR_NEWS = \
vtkSbrActor.h \
vtkSbrCamera.h \
vtkSbrLight.h \
vtkSbrPolyMapper.h \
vtkSbrProperty.h \
vtkSbrRenderWindow.h \
vtkSbrRenderer.h \
vtkSbrTexture.h
......@@ -11,13 +11,22 @@ vtkXglrRenderer.o \
vtkXglrTexture.o
TCL_XGLR_OBJ = \
tclvtkXglrActor.hh.o \
tclvtkXglrCamera.hh.o \
tclvtkXglrLight.hh.o \
tclvtkXglrPolyMapper.hh.o \
tclvtkXglrProperty.hh.o \
tclvtkXglrRenderWindow.hh.o \
tclvtkXglrRenderer.hh.o \
tclvtkXglrTexture.hh.o \
tclGNewXglr.o
tcl/vtkXglrActorTcl.o \
tcl/vtkXglrCameraTcl.o \
tcl/vtkXglrLightTcl.o \
tcl/vtkXglrPolyMapperTcl.o \
tcl/vtkXglrPropertyTcl.o \
tcl/vtkXglrRenderWindowTcl.o \
tcl/vtkXglrRendererTcl.o \
tcl/vtkXglrTextureTcl.o
TCL_XGLR_NEWS = \
vtkXglrActor.h \
vtkXglrCamera.h \
vtkXglrLight.h \
vtkXglrPolyMapper.h \
vtkXglrProperty.h \
vtkXglrRenderWindow.h \
vtkXglrRenderer.h \
vtkXglrTexture.h
This diff is collapsed.
This diff is collapsed.
......@@ -38,7 +38,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
#include "vtkAGraymap.hh"
#include "vtkAGraymap.h"
vtkScalars *vtkAGraymap::MakeObject(int sze, int ext)
{
......
......@@ -54,8 +54,8 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#ifndef __vtkAGraymap_h
#define __vtkAGraymap_h
#include "vtkColorScalars.hh"
#include "vtkUnsignedCharArray.hh"
#include "vtkColorScalars.h"
#include "vtkUnsignedCharArray.h"
class vtkAGraymap : public vtkColorScalars
{
......
......@@ -38,7 +38,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
#include "vtkAPixmap.hh"
#include "vtkAPixmap.h"
vtkScalars *vtkAPixmap::MakeObject(int sze, int ext)
{
......
......@@ -50,8 +50,8 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#ifndef __vtkAPixmap_h
#define __vtkAPixmap_h
#include "vtkColorScalars.hh"
#include "vtkUnsignedCharArray.hh"
#include "vtkColorScalars.h"
#include "vtkUnsignedCharArray.h"
class vtkAPixmap : public vtkColorScalars
{
......
......@@ -38,7 +38,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
#include "vtkBitArray.hh"
#include "vtkBitArray.h"
// Description:
......
......@@ -48,7 +48,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#ifndef __vtkBitArray_h
#define __vtkBitArray_h
#include "vtkObject.hh"
#include "vtkObject.h"
class vtkBitArray : public vtkObject
{
......
......@@ -38,7 +38,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
#include "vtkBitScalars.hh"
#include "vtkBitScalars.h"
vtkScalars *vtkBitScalars::MakeObject(int sze, int ext)
{
......
......@@ -47,8 +47,8 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#ifndef __vtkBitScalars_h
#define __vtkBitScalars_h
#include "vtkScalars.hh"
#include "vtkBitArray.hh"
#include "vtkScalars.h"
#include "vtkBitArray.h"
class vtkBitScalars : public vtkScalars
{
......
......@@ -38,7 +38,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
#include "vtkBitmap.hh"
#include "vtkBitmap.h"
vtkScalars *vtkBitmap::MakeObject(int sze, int ext)
{
......
......@@ -51,8 +51,8 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#ifndef __vtkBitmap_h
#define __vtkBitmap_h
#include "vtkColorScalars.hh"
#include "vtkBitArray.hh"
#include "vtkColorScalars.h"
#include "vtkBitArray.h"
class vtkBitmap : public vtkColorScalars
{
......
......@@ -38,7 +38,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
#include "vtkByteSwap.hh"
#include "vtkByteSwap.h"
// Description:
// Swap four byte word.
......
......@@ -45,8 +45,8 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
// files.
// .EXAMPLE STLRead.cc
#ifndef __vtkByteSwap_hh
#define __vtkByteSwap_hh
#ifndef __vtkByteSwap_h
#define __vtkByteSwap_h
#include <stdio.h>
class vtkByteSwap
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment