Directory restructuring

52876108 · Edward Vigmond · d36d04b6 · 52876108 · 52876108 · d36d04b6
Commit 52876108 authored Jul 19, 2019 by Edward Vigmond
75 changed files
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -15,12 +15,14 @@ Except for fltk, using your package manager is recommended for installing these

 ## Compiling ##

-1. If VTK is installed, edit the **Makefile** to set the `VTK_INC` and `VTK_DIR` variables to point to the directories containing the VTK header files and libraries, respectively. Comment them out otherwise.
+1. If VTK is installed, edit the **make.conf** to set the `VTK_INC` and `VTK_DIR` variables to point to the directories containing the VTK header files and libraries, respectively. Comment them out otherwise.

 1. Type "make"

 2. For the windowless version, type "make mesalyzer"

+3. The compiled executables will be found in the **src/** directory.
+
 3. Copy the binaries to a suitable location

 ## Documentation ##

--- a/Makefile
+++ b/Makefile
-HOSTMACHINE := $(shell uname)
-include make.conf
+all:
+	cd src && $(MAKE)

-#VTK_LIBDIR     =/usr/lib64
-#VTK_INCDIR     =/usr/include/vtk-8.1
+mesalyzer:
+	cd src && $(MAKE) mesalyzer

-Cxx           :=$(shell fltk-config --cxx)
-FLTK_INC      := $(shell fltk-config --use-glut --use-gl --cxxflags)
-FLTK_LD_FLAGS := $(shell fltk-config --use-images --use-glut --use-gl --ldflags)
-COMMON_INC    := -I. -DOBJ_CLASS -D_REENTRANT
-
-FLTK_SOURCES  := $(wildcard *.fl)
-OBJS = $(FLTK_SOURCES:.fl=.o)\
-	$(patsubst %.cc,%.o,$(wildcard *.cc))\
-	$(patsubst %.c,%.o,$(wildcard *.c))\
-	$(patsubst %.C,%.o,$(wildcard *.C))
-
-HDF5API_ROOT  := ./hdf5api
-ifdef HDF5
-LIB_CH5       := $(HDF5API_ROOT)/lib/libch5.a
-LIB_HDF5      := -L$(HDF5API_ROOT)/lib -L$(HDF5_ROOT)/lib -lch5 -lhdf5_hl -lhdf5
-COMMON_INC    += -DUSE_HDF5 -I$(HDF5_ROOT)/include -I$(HDF5API_ROOT)/include 
-else
-LIB_CH5       := 
-LIB_HDF5      :=
-OBJS          := $(OBJS:HDF5DataBrowser.o=)
-endif
-
-# MAC vs Linux differences
-ifeq ($(HOSTMACHINE), Darwin)
-  GLUT_LIB  = -framework GLUT 
-  FLTK_INC += /usr/X11/include
-  LIB_EXT   = .dylib
-else
-  GLUT_LIB  = -lglut
-  OMP_FLAG := -fopenmp
-  LDFLAGS  += $(OMP_FLAG)
-ifeq (,$(findstring -lGL,$(FLTK_LD_FLAGS)))
-  FLTK_LD_FLAGS += -lGL -lGLU
-endif
-  LIB_EXT   = .so
-endif
-
-COMMON_LIBS  = -lGLEW -lpng -lpthread -lm -lz $(LIB_HDF5) 
-LIBS         =  $(FLTK_LD_FLAGS) $(COMMON_LIBS) 
-CPPFLAGS     =  $(FLTK_INC) $(COMMON_INC)
-CXXFLAGS     = -std=c++11 -g -O$(DEBUG_LEVEL) $(OMP_FLAG) -MMD -DNOMINMAX  
-
-# VTK
-ifdef VTK_LIBDIR
-COMMON_INC    += -DUSE_VTK -I$(VTK_INCDIR)
-VTK_LSLIBS     = $(shell ls $(VTK_LIBDIR)/libvtk*$(LIB_EXT) | grep -Ev '(Python)|(Java)|(TCL)|(Parallel)|(MPI)|(Filters)|(Imaging)|(Interaction)|(Rendering)' )
-a              = $(subst $(VTK_LIBDIR)/lib,-l,$(VTK_LSLIBS) )
-VTK_LIBS       = $(subst $(LIB_EXT),,$(a) )
-LIBS          += $(VTK_LIBS)
-endif
-
-ifdef ENABLE_LOGGING
-CPPFLAGS += -DLOGGING_ENABLED
-endif
-
-#the files in OS_files contain OSMESA dependent clauses
-OS_files:=$(patsubst %.cc,%.o,$(shell grep -l OSMESA *.cc))
-OS_OBJS=$(filter-out $(OS_files),$(OBJS)) $(OS_files:.o=_os.o)
-
-all: meshalyzer
-
-meshalyzer: $(LIB_CH5) $(FLTK_SOURCES:.fl=.cc) $(OBJS) 
-	$(CXX) $(LDFLAGS) -o meshalyzer $(sort $(OBJS)) $(GLUT_LIB) $(LIBS)
-	fltk-config --post meshalyzer
-
-mesalyzer: $(LIB_CH5) $(FLTK_SOURCES:.fl=.cc) $(OS_OBJS)
-	$(CXX) $(LDFLAGS) -o mesalyzer $(sort $(OS_OBJS)) -lOSMesa $(LIBS) -lrt
-	fltk-config --post mesalyzer
-
-ifdef HDF5
-$(LIB_CH5): 
-	cd hdf5api && make all 
-	cd hdf5api && make install PREFIX=. 
-endif
-
-$(OS_files:.o=_os.o): %_os.o: %.cc
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -D OSMESA -c -o $@  $<
-
-clean:
-	rm -rf $(FLTK_SOURCES:.fl=.h) $(FLTK_SOURCES:.fl=.cc) *.o *.d meshalyzer mesalyzer meshalyzer.app
-ifdef HDF5
-	cd hdf5api && make clean
-endif
-
-utils: 
-	cd utils && make all
-
-docs: 
-	doxygen Doxyfile
-ifdef HDF5
-	cd hdf5api && doxygen Doxyfile
-endif
-
-%.h %.cc: %.fl
-	fluid -c -o .cc $<
-
-include $(OBJS:.o=.d)
-
-.PHONY: utils
+clean :
+	cd src && $(MAKE) clean

--- a/gl2ps.c
+++ b/gl2ps.c
--- a/make.conf
+++ b/make.conf
 # common variables for meshalyzer and hdf5api

+
+#VTK_LIBDIR     =/usr/lib64
+#VTK_INCDIR     =/usr/include/vtk-8.1
+
+
 #HDF5=1        #still experimental

 HDF5_ROOT  :=  /usr

--- a/AuxGrid.cc
+++ b/AuxGrid.cc
--- a/AuxGrid.h
+++ b/AuxGrid.h
--- a/ClipPlane.fl
+++ b/ClipPlane.fl
--- a/ColourGroup.cc
+++ b/ColourGroup.cc
--- a/ColourGroup.h
+++ b/ColourGroup.h
--- a/Colourscale.cc
+++ b/Colourscale.cc
--- a/Colourscale.h
+++ b/Colourscale.h
--- a/Connection.cc
+++ b/Connection.cc
--- a/ContCable.cc
+++ b/ContCable.cc
--- a/CutSurfaces.cc
+++ b/CutSurfaces.cc
--- a/CutSurfaces.h
+++ b/CutSurfaces.h
--- a/DataAllInMem.h
+++ b/DataAllInMem.h
--- a/DataClass.h
+++ b/DataClass.h
--- a/DataOpacity.fl
+++ b/DataOpacity.fl
--- a/DataReader.h
+++ b/DataReader.h
--- a/DeadDataGUI.fl
+++ b/DeadDataGUI.fl
--- a/DrawingObjects.cc
+++ b/DrawingObjects.cc
--- a/DrawingObjects.h
+++ b/DrawingObjects.h
--- a/FileSeqCGreader.h
+++ b/FileSeqCGreader.h
--- a/FileType.cc
+++ b/FileType.cc
--- a/Fl_Gl_Tb_Window.C
+++ b/Fl_Gl_Tb_Window.C
--- a/Fl_Gl_Tb_Window.h
+++ b/Fl_Gl_Tb_Window.h
--- a/FlyBy.fl
+++ b/FlyBy.fl
--- a/Frame.cc
+++ b/Frame.cc
--- a/Frame.h
+++ b/Frame.h
--- a/Global.h
+++ b/Global.h
--- a/Graph.cc
+++ b/Graph.cc
--- a/Graph.h
+++ b/Graph.h
--- a/HDF5DataBrowser.fl
+++ b/HDF5DataBrowser.fl
--- a/HDF5reader.h
+++ b/HDF5reader.h
--- a/Hexahedron.cc
+++ b/Hexahedron.cc
--- a/HiLiteWinInfo.fl
+++ b/HiLiteWinInfo.fl
--- a/IGBheader.cc
+++ b/IGBheader.cc
--- a/IGBheader.h
+++ b/IGBheader.h
--- a/IGBreader.h
+++ b/IGBreader.h
--- a/Interpolator.h
+++ b/Interpolator.h
--- a/IsoLines.cc
+++ b/IsoLines.cc
--- a/IsoLines.h
+++ b/IsoLines.h
--- a/IsoSurface.cc
+++ b/IsoSurface.cc
--- a/IsoSurface.h
+++ b/IsoSurface.h
--- a/LinkMessages.h
+++ b/LinkMessages.h
 #ifndef LINKMESSAGES_H
 #define LINKMESSAGES_H

-#include <Quaternion.h>
-#include <Vector3D.h>
+#include "Quaternion.h"
+#include "Vector3D.h"
 #include "Colourscale.h"

 namespace LinkMessage {

--- a/src/Makefile
+++ b/src/Makefile
+HOSTMACHINE := $(shell uname)
+include ../make.conf
+
+Cxx           := $(shell fltk-config --cxx)
+FLTK_INC      := $(shell fltk-config --use-glut --use-gl --cxxflags)
+FLTK_LD_FLAGS := $(shell fltk-config --use-images --use-glut --use-gl --ldflags)
+COMMON_INC    := -I. -DOBJ_CLASS -D_REENTRANT
+
+BUILD_DIR     := ../obj
+FLTK_SOURCES  := $(wildcard *.fl)
+OBJS          := $(sort $(addprefix $(BUILD_DIR)/, $(FLTK_SOURCES:.fl=.o) \
+	             $(patsubst %.cc,%.o,$(wildcard *.cc)) $(patsubst %.C,%.o,$(wildcard *.C)) ))
+DEP           := $(OBJS:%.o=%.d)
+
+HDF5API_ROOT  := ../hdf5api
+ifdef HDF5
+LIB_CH5       := $(HDF5API_ROOT)/lib/libch5.a
+LIB_HDF5      := -L$(HDF5API_ROOT)/lib -L$(HDF5_ROOT)/lib -lch5 -lhdf5_hl -lhdf5
+COMMON_INC    += -DUSE_HDF5 -I$(HDF5_ROOT)/include -I$(HDF5API_ROOT)/include 
+else
+LIB_CH5       := 
+LIB_HDF5      :=
+OBJS          := $(filter-out $(BUILD_DIR)/HDF5DataBrowser.o, $(OBJS))
+endif
+
+# MAC vs Linux differences
+ifeq ($(HOSTMACHINE), Darwin)
+  GLUT_LIB  = -framework GLUT 
+  FLTK_INC += /usr/X11/include
+  LIB_EXT   = .dylib
+else
+  GLUT_LIB  = -lglut
+  OMP_FLAG := -fopenmp
+  LDFLAGS  += $(OMP_FLAG)
+ifeq (,$(findstring -lGL,$(FLTK_LD_FLAGS)))
+  FLTK_LD_FLAGS += -lGL -lGLU
+endif
+  LIB_EXT   = .so
+endif
+
+COMMON_LIBS  = -lGLEW -lpng -lpthread -lm -lz $(LIB_HDF5) 
+LIBS         =  $(FLTK_LD_FLAGS) $(COMMON_LIBS) 
+CPPFLAGS     =  $(FLTK_INC) $(COMMON_INC)
+CXXFLAGS     = -std=c++11 -g -O$(DEBUG_LEVEL) $(OMP_FLAG) -MMD -DNOMINMAX  
+
+# VTK
+ifdef VTK_LIBDIR
+COMMON_INC    += -DUSE_VTK -I$(VTK_INCDIR)
+VTK_LSLIBS     = $(shell ls $(VTK_LIBDIR)/libvtk*$(LIB_EXT) | grep -Ev '(Python)|(Java)|(TCL)|(Parallel)|(MPI)|(Filters)|(Imaging)|(Interaction)|(Rendering)' )
+a              = $(subst $(VTK_LIBDIR)/lib,-l,$(VTK_LSLIBS) )
+VTK_LIBS       = $(subst $(LIB_EXT),,$(a) )
+LIBS          += $(VTK_LIBS)
+endif
+
+ifdef ENABLE_LOGGING
+CPPFLAGS += -DLOGGING_ENABLED
+endif
+
+#the files in OS_files contain OSMESA dependent clauses
+OS_files:=$(addprefix $(BUILD_DIR)/,$(patsubst %.cc,%.o,$(shell grep -l OSMESA *.cc)))
+OS_OBJS:=$(filter-out $(OS_files),$(OBJS)) $(OS_files:.o=_os.o)
+
+all: meshalyzer
+
+meshalyzer: $(LIB_CH5) $(FLTK_SOURCES:.fl=.cc) $(OBJS) 
+	$(CXX) $(LDFLAGS) -o meshalyzer $(OBJS) $(GLUT_LIB) $(LIBS)
+	fltk-config --post meshalyzer
+
+mesalyzer: $(LIB_CH5) $(FLTK_SOURCES:.fl=.cc) $(OS_OBJS)
+	$(CXX) $(LDFLAGS) -o mesalyzer $(OS_OBJS) -lOSMesa $(LIBS) -lrt
+	fltk-config --post mesalyzer
+
+ifdef HDF5
+$(LIB_CH5): 
+	cd hdf5api && make all 
+	cd hdf5api && make install PREFIX=. 
+endif
+
+$(BUILD_DIR)/%.o: %.cc 
+	$(CXX) -c $(CXXFLAGS) $< -o $@
+
+$(BUILD_DIR)/%.o: %.C
+	$(CXX) -c $(CXXFLAGS) $< -o $@
+
+$(OS_files:.o=_os.o): $(BUILD_DIR)/%_os.o: %.cc
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -D OSMESA -c -o $@  $<
+
+clean:
+	rm -rf $(FLTK_SOURCES:.fl=.h) $(FLTK_SOURCES:.fl=.cc) meshalyzer mesalyzer meshalyzer.app
+	rm -f $(BUILD_DIR)/*
+ifdef HDF5
+	cd hdf5api && make clean
+endif
+
+utils: 
+	cd utils && make all
+
+docs: 
+	doxygen Doxyfile
+ifdef HDF5
+	cd hdf5api && doxygen Doxyfile
+endif
+
+%.h %.cc: %.fl
+	fluid -c -o .cc $<
+
+-include $(DEP)
+
+.PHONY: utils
+
--- a/Matrix4x4.C
+++ b/Matrix4x4.C
--- a/Matrix4x4.h
+++ b/Matrix4x4.h
--- a/ModInt.C
+++ b/ModInt.C
--- a/ModInt.h
+++ b/ModInt.h
--- a/Model.cc
+++ b/Model.cc
--- a/Model.h
+++ b/Model.h
--- a/Mouse.C
+++ b/Mouse.C
--- a/Mouse.h
+++ b/Mouse.h
--- a/MyValueInput.cc
+++ b/MyValueInput.cc
--- a/MyValueInput.h
+++ b/MyValueInput.h
--- a/Myslider.cc
+++ b/Myslider.cc
--- a/Myslider.h
+++ b/Myslider.h
--- a/Orienter.cc
+++ b/Orienter.cc
--- a/Orienter.h
+++ b/Orienter.h
--- a/PNGwrite.cc
+++ b/PNGwrite.cc
--- a/PNGwrite.h
+++ b/PNGwrite.h
--- a/Pink2Green.xpm
+++ b/Pink2Green.xpm
--- a/PlotWin.cc
+++ b/PlotWin.cc
--- a/Point.cc
+++ b/Point.cc
--- a/PolyGon.cc
+++ b/PolyGon.cc
--- a/Prism.cc
+++ b/Prism.cc
--- a/Pyramid.cc
+++ b/Pyramid.cc
--- a/Quadrilateral.cc
+++ b/Quadrilateral.cc
--- a/Quaternion.h
+++ b/Quaternion.h
--- a/Region.cc
+++ b/Region.cc
--- a/Region.h
+++ b/Region.h
--- a/Sequence.fl
+++ b/Sequence.fl
--- a/Surfaces.cc
+++ b/Surfaces.cc
--- a/Surfaces.h
+++ b/Surfaces.h