Changeset 573

Timestamp:

Feb 12, 2007 9:04:40 AM (17 years ago)

Author:

kennell

Message:

Rearranged Makefile to build libviz.a instead of just a bunch of objects.

File:

• trunk/src2/core/Makefile (modified) (2 diffs)

trunk/src2/core/Makefile

@@ -1 +1 @@
 CFLAGS = -g
-all: test
+all: viz
 
-viz: viz.o RpOutcome.o RpMesh1D.o RpField1D.o RpMeshTri2D.o RpMeshRect3D.o RpFieldRect3D.o RpMeshPrism3D.o RpFieldPrism3D.o RpSerialBuffer.o RpSerializer.o RpSerializable.o
-        g++ $(CFLAGS) -o viz viz.o RpOutcome.o RpMesh1D.o RpField1D.o RpMeshTri2D.o RpMeshRect3D.o RpFieldRect3D.o RpMeshPrism3D.o RpFieldPrism3D.o RpSerialBuffer.o RpSerializer.o RpSerializable.o
+viz: viz.o libviz.a
+        g++ $(CFLAGS) -o viz viz.o libviz.a
+
+libviz.a: RpOutcome.o RpMesh1D.o RpField1D.o RpMeshTri2D.o RpMeshRect3D.o RpFieldRect3D.o RpMeshPrism3D.o RpFieldPrism3D.o RpSerialBuffer.o RpSerializer.o RpSerializable.o
+        ar crv $@ $^
 
 viz.o: viz.cc
@@ -24 +27 @@
         g++ $(CFLAGS) -c -o Ptr.o Ptr.cpp
 
-Outcome.o: Outcome.cpp Ptr.h
-        g++ $(CFLAGS) -c -o Outcome.o Outcome.cpp
+RpOutcome.o: RpOutcome.cc RpPtr.h
+        g++ $(CFLAGS) -c -o RpOutcome.o RpOutcome.cc
 
 Lookup.o: Lookup.cpp Ptr.h