Changeset 83 for trunk/src/Makefile

Timestamp:

Oct 5, 2005 8:17:26 AM (19 years ago)

Author:

dkearney

Message:

1. More cleaning of RpUnits and RpLibrary? code
2. added rp_result code to c++/fortran/c code
3. added rp_children, rp_lib_node[comp,type,id] for fortran code (need to test)
4. adjusted convert function to recognize statements as follows:

convert("5J","neV")
convert("3.12075e+28neV","J")

5. made joules a metric unit in RpUnits.cc
6. tested examples/app-fermi/fortran/fermi.f with new rappture library.

added units conversion.

File:

• trunk/src/Makefile (modified) (3 diffs)

trunk/src/Makefile

@@ -14 +14 @@
 LIB_SCEW_INCL   = -I $(SCEW_HEADERS)
 LIB_SCEW_FLAG   = -L/opt/rappture/lib -lscew
+#LIB_SCEW_FLAG  = /opt/rappture/lib/libscew.a
 #LIB_SCEW_FLAG  = -static -L/opt/rappture/lib -lscew
 
@@ -100 +101 @@
 
 RP_IO_DEPS              = RpLibrary.o RpLibraryCInterface.o RpLibraryFInterface.o scew_extras.o 
-RP_UNITS_DEPS   =  RpUnitsStd.o RpUnits.o RpUnitsCInterface.o RpUnitsFInterface.o
+RP_UNITS_DEPS   = RpUnitsStd.o RpUnits.o RpUnitsCInterface.o RpUnitsFInterface.o
 RP_OTHER_DEPS   = RpFortranCommon.o
 
@@ -121 +122 @@
 #### libRpObjects ########################################################
 libRpObjects: RpVariable.o RpAbout.o RpNumber.o RpString.o RpBoolean.o RpChoice.o RpOption.o RpUnitsStd.o RpUnits.o
-        $(CXX) $(DEGUG) -shared -Wl,-rpath,$(LIB_DIR)/ \
-                -Wl,-soname,$@.so -o $(LIB_DIR)/$@.so.0.0 $^
+        $(CC) $(DEGUG) -shared -Wl,-rpath,$(LIB_DIR)/ \
+                -Wl,-soname,$@.so -o $(LIB_DIR)/$@.so.0.0 $^ -lstdc++
+#       $(CXX) $(DEGUG) -shared -Wl,-rpath,$(LIB_DIR)/ \
+#               -Wl,-soname,$@.so -o $(LIB_DIR)/$@.so.0.0 $^
         
         /sbin/ldconfig -n $(LIB_DIR)