Changeset 73 for trunk/src/Makefile

Timestamp:

Sep 28, 2005, 12:09:43 AM (19 years ago)

Author:

dkearney

Message:

1. changes to RpUnits, modified RpUnits::define() function not to look for base units.
2. changed python RpUnits to return string when units!="off" and a number when units=="off"
3. modified make files, hopefully making them easier to read, removing vpaths,

cleaning up the make process, combining smaller libraries into one library,
librappture, and putting the core objects into one library - libRpObjects,
for testing.

4. copied rpResult function into rappture_interface.c to stop compiler from

complaining about undefined references ot the function. trying to use the
function probably won't work. but that can be fixed after the repository is
reorganized.

5. in example/app-fermi/python/fermi.py, changed exit() to sys.exit() to

stop python from complaining about no function called exit().

6. examples/app-fermi/fortran still does not run, but new rappture parser

should take care of these problems. (same with examples/fermi_fortran)

File:

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

trunk/src/Makefile

@@ +1 @@
+# you need to change this to where your version of python is installed.
+# tell make where to find python header files
+PY_SRC_HEADERS  = /opt/rappture/include/python2.4
+
+# tell make where to find the python shared library
+EMB_PY_LIB_FLAG = -lpython2.4
+EMB_PY_LIB_DIR  = /opt/rappture/lib
+
+EMB_PY_FLAGS    = -Wl,-rpath,$(EMB_PY_LIB_DIR) -L$(EMB_PY_LIB_DIR) $(EMB_PY_LIB_FLAG)
+
+# everything below should be ok, but check to make sure
+# especially check the fortran flags, if youre using fortran
+#
 # define the top of our directory structure
 # replace this with the full path of the directory
@@ -8 +21 @@
 
 # define which programs can be made
-PROGS                   =       libRpUnits_CInterface   \
-                                        libRpUnits_FInterface   \
-                                        librappture                             \
-                                        libRapptureIO                   \
-                                        libRpUnits                              \
-                                        libRpVariable                   \
-                                        libRpNumber                             \
-                                        libRpString                             \
-                                        libRpBoolean                    \
-                                        libRpChoice                             \
-                                        libRpOption                             
-                                        
+PROGS                   =       librappture                             \
+                                        libRpObjects                    \
 
 # define our compiling environment
 # 
-AR                              = ar
 CC                              = gcc
 CPP                             = g++
@@ -62 +64 @@
 # define our directories
 #
-WORK_DIR                = $(RP_BASE)/work
 INCLUDES_DIR    = $(RP_BASE)/include
 BIN_DIR                 = $(RP_BASE)/bin
-LIB_DIR                 = $(RP_BASE)/lib
+LIB_DIR                 = $(RP_BASE)/src
 SRC_DIR                 = $(RP_BASE)/src
 TEST_DIR                = $(RP_BASE)/test
@@ -74 +75 @@
 PY_SRC                  = $(SRC_DIR)/python
 
-#LIB_RPUNITS    = -Wl,-rpath,$(LIB_DIR) -L$(LIB_DIR) -lRpUnits
-#LIB_RPDICT             = -Wl,-rpath,$(LIB_DIR) -L$(LIB_DIR) -lRpDict
-
 LIB_INC_PREFIX  = -Wl,-rpath,$(LIB_DIR) -L$(LIB_DIR)
-
-#LIB_RPUNITS_C   = $(LIB_INC_PREFIX) -lRpUnits_CInterface
-#LIB_RAPPTUREIO  = $(LIB_INC_PREFIX) -lrappture
-
-LIB_RP_UNITS    = $(LIB_INC_PREFIX) -lRpUnits
-LIB_RP_VARIABLE = $(LIB_INC_PREFIX) -lRpVariable
-LIB_RP_NUMBER   = $(LIB_INC_PREFIX) -lRpNumber
-LIB_RP_STRING   = $(LIB_INC_PREFIX) -lRpString
-LIB_RP_BOOLEAN  = $(LIB_INC_PREFIX) -lRpBoolean
-LIB_RP_OPTION   = $(LIB_INC_PREFIX) -lRpOption
-LIB_RP_CHOICE   = $(LIB_INC_PREFIX) -lRpChoice
-LIB_RP_PRESET   = $(LIB_INC_PREFIX) -lRpPreset
-
-
-LIB_RPUNITS_C   = -Wl,-rpath,$(LIB_DIR) -L$(LIB_DIR) -lRpUnits_CInterface
-LIB_RPUNITS_F   = -Wl,-rpath,$(LIB_DIR) -L$(LIB_DIR) -lRpUnits_FInterface
+LIB_RP_OBJECTS  = $(LIB_INC_PREFIX) -lRpObjects
 LIB_RAPPTURE    = -Wl,-rpath,$(LIB_DIR) -L$(LIB_DIR) -lrappture
-LIB_RAPPTUREIO  = -Wl,-rpath,$(LIB_DIR) -L$(LIB_DIR) -lRapptureIO
 
 INCL_CORE               = -I $(INCLUDES_DIR)/core
-INCL_CEE                = -I $(INCLUDES_DIR)/cee
+INCL_CEE                = -I $(INCLUDES_DIR)/cee -I $(PY_SRC_HEADERS)
 INCL_FORTRAN    = -I $(INCLUDES_DIR)/fortran
 INCL_PY                 = -I $(INCLUDES_DIR)/python
-
-# you need to change this to where your version of python is installed.
-EMB_PY_FLAGS    = -L$(LIB_DIR) -lpython2.4
-
-# tell make where to find files of each specific type
-#
-vpath %.o $(WORK_DIR)
-vpath %.so $(LIB_DIR)
-vpath %.h $(INCLUDES_DIR)
-#vpath %.c $(CORE_SRC)
-#vpath %.cc $(CORE_SRC)
-#vpath %.tcc $(CORE_SRC)
-#vpath %.cpp $(CORE_SRC)
 
 
@@ -121 +90 @@
 
 # include rappture library definitions
-include $(SRC_DIR)/make.inc
+
+#### librappture shared object ###########################################
+
+librappture: rappture_fortran.o rappture_interface.o RpUnitsCInterface.o RpUnitsStd.o RpUnits.o
+        $(CPP) $(DEGUG) -shared -Wl,-rpath,$(LIB_DIR)/ \
+                -Wl,-soname,$@.so -o $(LIB_DIR)/$@.so.0.0 $^ $(EMB_PY_FLAGS)
+
+        /sbin/ldconfig -n $(LIB_DIR)
+
+
+#### libRpObjects ########################################################
+libRpObjects: RpVariable.o RpAbout.o RpNumber.o RpString.o RpBoolean.o RpChoice.o RpOption.o RpUnitsStd.o RpUnits.o
+        $(CPP) $(DEGUG) -shared -Wl,-rpath,$(LIB_DIR)/ \
+                -Wl,-soname,$@.so -o $(LIB_DIR)/$@.so.0.0 $^ -lc
+        
+        /sbin/ldconfig -n $(LIB_DIR)
+
 
 # include core source files
-include $(CORE_SRC)/make.inc
+
+Rp%.o: $(CORE_SRC)/Rp%.cc 
+        $(CPP) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
 
 # include cee binding definitions
-include $(CEE_SRC)/make.inc
+
+rappture_interface.o: $(CEE_SRC)/rappture_interface.c
+        $(CPP) -fPIC $(DEBUG) $(INCL_CEE) $(INCL_PY) -o $@ -c $<
+
+RpUnitsCInterface.o: $(CEE_SRC)/RpUnitsCInterface.cc
+        $(CPP) $(CFLAGS) -fPIC $(DEBUG) $(INCL_CORE) $(INCL_CEE) -o $@ -c $?
 
 # include fortran binding definitions
-include $(FORT_SRC)/make.inc
 
-# include test programs
-include $(TEST_DIR)/make.inc
+RpUnits_fortran.o: $(FORT_SRC)/RpUnits_fortran.c
+        $(CPP) $(CFLAGS) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
+
+rappture_fortran.o: $(FORT_SRC)/rappture_fortran.c
+        $(CPP) $(CFLAGS) -fPIC $(DEBUG) $(INCL_CORE) $(INCL_CEE) $(INCL_PY) -o $@ -c $<
 
 #### CLEAN UP ############################################################
 clean: 
-        - rm -f $(BIN_DIR)/* $(WORK_DIR)/*.o $(LIB_DIR)/librappture.* $(LIB_DIR)/libR*.so* 
+        - rm -f $(BIN_DIR)/* *.o librappture.* libR*.so*