[cig-commits] r9225 - cs/benchmark/cigma/trunk/src

luis at geodynamics.org luis at geodynamics.org
Mon Feb 4 15:24:56 PST 2008


Author: luis
Date: 2008-02-04 15:24:56 -0800 (Mon, 04 Feb 2008)
New Revision: 9225

Added:
   cs/benchmark/cigma/trunk/src/Makefile.old
Removed:
   cs/benchmark/cigma/trunk/src/Makefile.am
Log:
Create backup of old makefile


Deleted: cs/benchmark/cigma/trunk/src/Makefile.am
===================================================================
--- cs/benchmark/cigma/trunk/src/Makefile.am	2008-02-04 23:23:21 UTC (rev 9224)
+++ cs/benchmark/cigma/trunk/src/Makefile.am	2008-02-04 23:24:56 UTC (rev 9225)
@@ -1,101 +0,0 @@
-include ../variables
-
-#FLAGS = -Wall -Wno-deprecated
-FLAGS += -Wno-deprecated
-FLAGS += -g
-
-INCLUDES  =
-INCLUDES += $(PYTHON_INCLUDES)
-INCLUDES += $(VTK_INCLUDES)
-INCLUDES += $(HDF5_INCLUDES)
-INCLUDES += -I./h5io
-INCLUDES += -I./ann/include
-
-FLAGS += $(INCLUDES)
-
-LDFLAGS += $(VTK_LDFLAGS) $(VTK_LIBS)
-LDFLAGS += $(PYTHON_LDFLAGS) $(PYTHON_LIBS)
-LDFLAGS += $(HDF5_LDFLAGS) $(HDF5_LIBS)
-
-ANNLIB = ../lib/libann.a
-H5IOLIB = ../lib/libh5io.a
-TARGETLIB = ../lib/libcigma.a
-TESTLIB = ../lib/libcigma_d.a
-
-OBJS = \
-	Numeric.o \
-	Cell.o \
-	Tri.o \
-	Quad.o \
-	Tet.o \
-	Hex.o \
-	Points.o \
-	Quadrature.o \
-	FiatProxy.o \
-	MeshPart.o \
-	CubeMeshPart.o \
-	DofHandler.o \
-	FE.o \
-	Field.o \
-	FE_Field.o \
-	ExternalField.o \
-	Reader.o \
-	HdfReader.o \
-	TextReader.o \
-	VtkReader.o \
-	Writer.o \
-	HdfWriter.o \
-	TextWriter.o \
-	VtkWriter.o \
-	AnyOption.o \
-	StringUtils.o \
-	Command.o \
-	CommandSet.o \
-	SkelCmd.o \
-	HelpCmd.o \
-	ExtractCmd.o \
-	EvalCmd.o \
-	CompareCmd.o \
-	CubeCmd.o \
-	Misc.o \
-	Locator.o \
-	AnnLocator.o
-
-
-default: libann libh5io testlib cigma vtkls tests
-
-%.o: %.cpp
-	$(CXX) $(FLAGS) -c $^
-
-testlib: $(TESTLIB)
-
-libh5io:
-	cd h5io && make
-
-libann:
-	cd ann && make
-
-$(TESTLIB): $(OBJS)
-	rm -f $@
-	$(AR) $@ $(OBJS)
-	$(RANLIB) $@
-
-cigma: cigma.o $(TESTLIB) $(H5IOLIB) $(ANNLIB)
-	$(CXX) $(LDFLAGS) $^ -o $@
-
-vtkls: vtkls.o $(TESTLIB)
-	$(CXX) $(LDFLAGS) $^ -o $@
-
-tests: $(TESTLIB)
-	cd tests/ && make
-
-clean:
-	rm -f $(OBJS) cigma.o vtkls.o
-	cd tests && make clean
-
-purge: clean
-	cd ../lib && make clean
-	cd h5io && make clean
-	cd ann && make clean
-
-.PHONY: clean purge tests libann libh5io

Copied: cs/benchmark/cigma/trunk/src/Makefile.old (from rev 9220, cs/benchmark/cigma/trunk/src/Makefile.am)
===================================================================
--- cs/benchmark/cigma/trunk/src/Makefile.old	                        (rev 0)
+++ cs/benchmark/cigma/trunk/src/Makefile.old	2008-02-04 23:24:56 UTC (rev 9225)
@@ -0,0 +1,101 @@
+include ../variables
+
+#FLAGS = -Wall -Wno-deprecated
+FLAGS += -Wno-deprecated
+FLAGS += -g
+
+INCLUDES  =
+INCLUDES += $(PYTHON_INCLUDES)
+INCLUDES += $(VTK_INCLUDES)
+INCLUDES += $(HDF5_INCLUDES)
+INCLUDES += -I./h5io
+INCLUDES += -I./ann/include
+
+FLAGS += $(INCLUDES)
+
+LDFLAGS += $(VTK_LDFLAGS) $(VTK_LIBS)
+LDFLAGS += $(PYTHON_LDFLAGS) $(PYTHON_LIBS)
+LDFLAGS += $(HDF5_LDFLAGS) $(HDF5_LIBS)
+
+ANNLIB = ../lib/libann.a
+H5IOLIB = ../lib/libh5io.a
+TARGETLIB = ../lib/libcigma.a
+TESTLIB = ../lib/libcigma_d.a
+
+OBJS = \
+	Numeric.o \
+	Cell.o \
+	Tri.o \
+	Quad.o \
+	Tet.o \
+	Hex.o \
+	Points.o \
+	Quadrature.o \
+	FiatProxy.o \
+	MeshPart.o \
+	CubeMeshPart.o \
+	DofHandler.o \
+	FE.o \
+	Field.o \
+	FE_Field.o \
+	ExternalField.o \
+	Reader.o \
+	HdfReader.o \
+	TextReader.o \
+	VtkReader.o \
+	Writer.o \
+	HdfWriter.o \
+	TextWriter.o \
+	VtkWriter.o \
+	AnyOption.o \
+	StringUtils.o \
+	Command.o \
+	CommandSet.o \
+	SkelCmd.o \
+	HelpCmd.o \
+	ExtractCmd.o \
+	EvalCmd.o \
+	CompareCmd.o \
+	CubeCmd.o \
+	Misc.o \
+	Locator.o \
+	AnnLocator.o
+
+
+default: libann libh5io testlib cigma vtkls tests
+
+%.o: %.cpp
+	$(CXX) $(FLAGS) -c $^
+
+testlib: $(TESTLIB)
+
+libh5io:
+	cd h5io && make
+
+libann:
+	cd ann && make
+
+$(TESTLIB): $(OBJS)
+	rm -f $@
+	$(AR) $@ $(OBJS)
+	$(RANLIB) $@
+
+cigma: cigma.o $(TESTLIB) $(H5IOLIB) $(ANNLIB)
+	$(CXX) $(LDFLAGS) $^ -o $@
+
+vtkls: vtkls.o $(TESTLIB)
+	$(CXX) $(LDFLAGS) $^ -o $@
+
+tests: $(TESTLIB)
+	cd tests/ && make
+
+clean:
+	rm -f $(OBJS) cigma.o vtkls.o
+	cd tests && make clean
+
+purge: clean
+	cd ../lib && make clean
+	cd h5io && make clean
+	cd ann && make clean
+
+.PHONY: clean purge tests libann libh5io



More information about the cig-commits mailing list