Changeset 76 for trunk/src/Makefile


Ignore:
Timestamp:
Sep 29, 2005 11:45:32 AM (15 years ago)
Author:
dkearney
Message:
  1. cleaned up make files some more, deleted make.inc files
  2. updated RpUnits module and Cee and Fortran interfaces
  3. changed return values for some fortran interfaces,

error messages not working yet

  1. still need to add copy assignment code to RpUnits
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/Makefile

    r73 r76  
    2727#
    2828CC                              = gcc
    29 CPP                             = g++
     29CXX                             = g++
    3030DEBUG                   = -g -Wall
    3131DEBUG_PLUS              = -g -DDEBUG
     
    9393#### librappture shared object ###########################################
    9494
    95 librappture: rappture_fortran.o rappture_interface.o RpUnitsCInterface.o RpUnitsStd.o RpUnits.o
    96         $(CPP) $(DEGUG) -shared -Wl,-rpath,$(LIB_DIR)/ \
     95librappture: rappture_fortran.o rappture_interface.o RpUnitsCInterface.o RpUnitsFInterface.o RpFortranCommon.o RpUnitsStd.o RpUnits.o
     96        $(CXX) $(DEGUG) -shared -Wl,-rpath,$(LIB_DIR)/ \
    9797                -Wl,-soname,$@.so -o $(LIB_DIR)/$@.so.0.0 $^ $(EMB_PY_FLAGS)
    9898
     
    102102#### libRpObjects ########################################################
    103103libRpObjects: RpVariable.o RpAbout.o RpNumber.o RpString.o RpBoolean.o RpChoice.o RpOption.o RpUnitsStd.o RpUnits.o
    104         $(CPP) $(DEGUG) -shared -Wl,-rpath,$(LIB_DIR)/ \
     104        $(CXX) $(DEGUG) -shared -Wl,-rpath,$(LIB_DIR)/ \
    105105                -Wl,-soname,$@.so -o $(LIB_DIR)/$@.so.0.0 $^ -lc
    106106       
     
    110110# include core source files
    111111
    112 Rp%.o: $(CORE_SRC)/Rp%.cc
    113         $(CPP) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
     112RpVariable.o: $(CORE_SRC)/RpVariable.cc
     113        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
     114
     115RpAbout.o: $(CORE_SRC)/RpAbout.cc
     116        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
     117
     118RpNumber.o: $(CORE_SRC)/RpNumber.cc
     119        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
     120
     121RpString.o: $(CORE_SRC)/RpString.cc
     122        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
     123
     124RpBoolean.o: $(CORE_SRC)/RpBoolean.cc
     125        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
     126
     127RpChoice.o: $(CORE_SRC)/RpChoice.cc
     128        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
     129
     130RpOption.o: $(CORE_SRC)/RpOption.cc
     131        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
     132
     133RpUnitsStd.o: $(CORE_SRC)/RpUnitsStd.cc
     134        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
     135
     136RpUnits.o: $(CORE_SRC)/RpUnits.cc
     137        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
     138
     139
     140
    114141
    115142# include cee binding definitions
    116143
    117144rappture_interface.o: $(CEE_SRC)/rappture_interface.c
    118         $(CPP) -fPIC $(DEBUG) $(INCL_CEE) $(INCL_PY) -o $@ -c $<
     145        $(CXX) -fPIC $(DEBUG) $(INCL_CEE) $(INCL_PY) -o $@ -c $<
    119146
    120147RpUnitsCInterface.o: $(CEE_SRC)/RpUnitsCInterface.cc
    121         $(CPP) $(CFLAGS) -fPIC $(DEBUG) $(INCL_CORE) $(INCL_CEE) -o $@ -c $?
     148        $(CXX) $(CFLAGS) -fPIC $(DEBUG) $(INCL_CORE) $(INCL_CEE) -o $@ -c $?
     149
     150
     151
    122152
    123153# include fortran binding definitions
    124154
    125 RpUnits_fortran.o: $(FORT_SRC)/RpUnits_fortran.c
    126         $(CPP) $(CFLAGS) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
     155rappture_fortran.o: $(FORT_SRC)/rappture_fortran.c
     156        $(CXX) $(CFLAGS) -fPIC $(DEBUG) $(INCL_FORTRAN) $(INCL_CORE) $(INCL_CEE) $(INCL_PY) -o $@ -c $<
    127157
    128 rappture_fortran.o: $(FORT_SRC)/rappture_fortran.c
    129         $(CPP) $(CFLAGS) -fPIC $(DEBUG) $(INCL_CORE) $(INCL_CEE) $(INCL_PY) -o $@ -c $<
     158RpUnitsFInterface.o: $(FORT_SRC)/RpUnitsFInterface.cc
     159        $(CXX) $(CFLAGS) -fPIC $(DEBUG) $(INCL_CORE) $(INCL_FORTRAN) -o $@ -c $?
     160
     161RpFortranCommon.o: $(FORT_SRC)/RpFortranCommon.c
     162        $(CC) $(CFLAGS) -fPIC $(DEBUG) $(INCL_FORTRAN) -o $@ -c $<
     163
     164
     165
    130166
    131167#### CLEAN UP ############################################################
Note: See TracChangeset for help on using the changeset viewer.