Changeset 332 for trunk

Timestamp:

Mar 12, 2006, 8:28:15 PM (19 years ago)

Author:

cxsong

Message:

updatd with new files

File:

• trunk/src/mesh/Makefile (modified) (8 diffs)

trunk/src/mesh/Makefile

@@ -30 +30 @@
 PROGS           =   librpmesh
 TEST_PROGS =    test_node2d \
-                test_node3d \
+                #test_node3d \
                 test_element \
                 test_elem2 \
-                test_mesh \
+                #test_mesh \
                 test_grid1d \
-                test_grid
+                test_grid \
+                test_field \
+                test_serializer
 
 # define our compiling environment
@@ -41 +43 @@
 CC              = gcc
 CXX             = g++
-DEBUG           = -g -Wall
-DEBUG_PLUS      = -DDEBUG
+DEBUG           = -g -Wall $(DEBUG_PLUS)
+#DEBUG_PLUS      = -DDEBUG
 PY              = $(RP_INSTALL_BASE)/bin/python
 MEX             = mex
@@ -94 +96 @@
                   RpChoice.o RpOption.o RpUnitsStd.o RpUnits.o #RpValue.o\
                   # RpValueDouble.o RpValueString.o
-RP_MESH_DEPS =  const.o grid1d_reg.o grid2d.o node3d.o node2d.o \
-                element.o mesh.o serializer.o util.o \
-                grid1d.o reader.o #field.o 
+RP_MESH_DEPS =  const.o grid1d.o grid2d.o node2d.o \
+                element.o serializer.o util.o reader.o \
+                field.o #node3d.o mesh.o
 
 LDLIB_MACOSX = -dynamiclib -o $(LIB_DIR)/$@.dylib
@@ -117 +119 @@
                 ranlib $@.a; \
         fi
-librappture: $(RP_IO_DEPS) $(RP_UNITS_DEPS) $(RP_OTHER_DEPS)
-        if test "`uname`" == "Darwin"; then \
-                $(CXX) $(DEGUG) $(LDLIB_MACOSX) $^ $(LIB_SCEW_FLAG) -lm; \
-                ar -r $@.a $^; \
-                ranlib -s $@.a; \
-        else \
-                $(CXX) $(DEGUG) $(LDLIB_LINUX) $^ $(LIB_SCEW_FLAG) -lm; \
-                /sbin/ldconfig -n $(LIB_DIR); \
-                ar -r $@.a $^; \
-                ranlib $@.a; \
-        fi
-
-install_rappture: librappture
-        if test "`uname`" == "Darwin"; then \
-                cp $<.dylib $(RP_INSTALL_BASE)/lib; \
-                cp $<.a $(RP_INSTALL_BASE)/lib; \
-        else \
-                cp -d $<.so* $(RP_INSTALL_BASE)/lib; \
-                cp -d $<.a $(RP_INSTALL_BASE)/lib; \
-        fi
-
 
 ###############################################
@@ -151 +132 @@
 serializer.cc: serializer.h serializable.h
 reader.cc: byte_order.h
+field.cc: grid1d.h
 
 grid2d.o: grid2d.cc
         $(CXX) $(CFLAGS) $(DEBUG) -c $?
 grid1d.o: grid1d.cc 
-        $(CXX) $(CFLAGS) $(DEBUG) -c $?
-grid1d_reg.o: grid1d_reg.cc
         $(CXX) $(CFLAGS) $(DEBUG) -c $?
 util.o: util.cc
@@ -173 +153 @@
         $(CXX) $(CFLAGS) $(DEBUG) -c $?
 reader.o: reader.cc
+        $(CXX) $(CFLAGS) $(DEBUG) -c $?
+field.o: field.cc
         $(CXX) $(CFLAGS) $(DEBUG) -c $?
 
@@ -195 +177 @@
 test_grid: test_grid.o ../librpmesh.so 
         $(CXX) $(DEBUG) -o $@ $< $(LIB_RPMESH)
+test_field: test_field.o ../librpmesh.so 
+        $(CXX) $(DEBUG) -o $@ $< $(LIB_RPMESH)
+test_serializer: test_serializer.o ../librpmesh.so 
+        $(CXX) $(DEBUG) -o $@ $< $(LIB_RPMESH)
 testg: testg.o ../librpmesh.so
         $(CXX) $(DEBUG) -o $@ $< $(LIB_RPMESH)
@@ -201 +187 @@
 #### CLEAN UP ############################################################
 clean: 
-        - rm -f *.o librpmesh.a ../librpmesh.so* $(TEST_PROGS)
+        - rm -f *.o *.gch librpmesh.a ../librpmesh.so* $(TEST_PROGS)