Changeset 83 for trunk/src/Makefile


Ignore:
Timestamp:
Oct 5, 2005 8:17:26 AM (15 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")

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

added units conversion.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/Makefile

    r77 r83  
    1414LIB_SCEW_INCL   = -I $(SCEW_HEADERS)
    1515LIB_SCEW_FLAG   = -L/opt/rappture/lib -lscew
     16#LIB_SCEW_FLAG  = /opt/rappture/lib/libscew.a
    1617#LIB_SCEW_FLAG  = -static -L/opt/rappture/lib -lscew
    1718
     
    100101
    101102RP_IO_DEPS              = RpLibrary.o RpLibraryCInterface.o RpLibraryFInterface.o scew_extras.o
    102 RP_UNITS_DEPS   =  RpUnitsStd.o RpUnits.o RpUnitsCInterface.o RpUnitsFInterface.o
     103RP_UNITS_DEPS   = RpUnitsStd.o RpUnits.o RpUnitsCInterface.o RpUnitsFInterface.o
    103104RP_OTHER_DEPS   = RpFortranCommon.o
    104105
     
    121122#### libRpObjects ########################################################
    122123libRpObjects: RpVariable.o RpAbout.o RpNumber.o RpString.o RpBoolean.o RpChoice.o RpOption.o RpUnitsStd.o RpUnits.o
    123         $(CXX) $(DEGUG) -shared -Wl,-rpath,$(LIB_DIR)/ \
    124                 -Wl,-soname,$@.so -o $(LIB_DIR)/$@.so.0.0 $^
     124        $(CC) $(DEGUG) -shared -Wl,-rpath,$(LIB_DIR)/ \
     125                -Wl,-soname,$@.so -o $(LIB_DIR)/$@.so.0.0 $^ -lstdc++
     126#       $(CXX) $(DEGUG) -shared -Wl,-rpath,$(LIB_DIR)/ \
     127#               -Wl,-soname,$@.so -o $(LIB_DIR)/$@.so.0.0 $^
    125128       
    126129        /sbin/ldconfig -n $(LIB_DIR)
Note: See TracChangeset for help on using the changeset viewer.