Changeset 751 for trunk/src

Timestamp:

May 28, 2007 9:10:04 PM (17 years ago)

Author:

dkearney

Message:

moved encode code to src2/core so it can be used in librappture2 for nanovis
updated nanovis configure script
updated src and src2/core makefiles with encode code move

File:

• trunk/src/Makefile.in (modified) (10 diffs)

trunk/src/Makefile.in

@@ -24 +24 @@
 # define which programs can be made
 PROGS           =   librappture    \
-                    libRpObjects   \
-                    Rappture.Units
+                    libRpObjects
 
 # define our compiling environment
@@ -33 +32 @@
 DEBUG           = -g -Wall
 DEBUG_PLUS      = -g -DDEBUG
-MEX             = @MEX@
-OCT             = @MKOCTFILE@
 LN              = ln
+CFLAGS = -fPIC
 
 # define our directories
@@ -50 +48 @@
 FORT_SRC        = $(SRC_DIR)/fortran
 CEE_SRC         = $(SRC_DIR)/cee
-MATLAB_SRC      = $(SRC_DIR)/matlab
-OCTAVE_SRC      = $(SRC_DIR)/octave
-TCL_SRC         = $(SRC_DIR)/tcl
-
-LIB_INC_PREFIX  = -Wl,-rpath,$(LIB_DIR) -L$(LIB_DIR)
-LIB_RP_OBJECTS  = $(LIB_INC_PREFIX) -lRpObjects
+
+LIB_RP_OBJECTS  = -Wl,-rpath,$(LIB_DIR) -L$(LIB_DIR) -lRpObjects
 LIB_RAPPTURE    = -Wl,-rpath,$(LIB_DIR) -L$(LIB_DIR) -lrappture
 
@@ -65 +59 @@
 INCL_OCTAVE     = -I$(OCTAVE_SRC)
 
-CFLAGS = -fPIC
-
 # default:
 
 all: ${PROGS}
 install:        install_rappture \
-                        install_rpobjs \
-                        install_matlab \
-                        install_octave
-#                       install_tcl
+                        install_rpobjs
 
 RP_IO_DEPS      = RpLibrary.o RpLibraryCInterface.o RpLibraryFInterface.o \
-                  scew_extras.o RpEntityRef.o RpEncode.o RpUtils.o
+                  scew_extras.o RpEntityRef.o RpUtils.o
 RP_UNITS_DEPS   = RpUnitsStd.o RpUnits.o RpUnitsCInterface.o RpUnitsFInterface.o
 RP_UTILS_DEPS   = RpUtils.o RpUtilsCInterface.o RpUtilsFInterface.o
@@ -83 +72 @@
                   RpBufferCInterface.o RpOutcomeCInterface.o
 RP_OBJS_DEP     = RpVariable.o RpAbout.o RpNumber.o RpString.o RpBoolean.o \
-                  RpChoice.o RpOption.o RpUnitsStd.o RpUnits.o #RpValue.o\
-                  # RpValueDouble.o RpValueString.o
-RP2_OBJ_DEP     = $(CORE2_SRC)/Outcome.o $(CORE2_SRC)/Ptr.o $(CORE2_SRC)/RpBuffer.o
+                  RpChoice.o RpOption.o RpUnitsStd.o RpUnits.o
+                  #RpValue.o RpValueDouble.o RpValueString.o
+RP2_OBJ_DEP     = $(CORE2_SRC)/Outcome.o $(CORE2_SRC)/Ptr.o $(CORE2_SRC)/RpBuffer.o $(CORE2_SRC)/RpEncode.o
 
 
@@ -96 +85 @@
 
 librappture: $(RP_IO_DEPS) $(RP_UTILS_DEPS) $(RP_UNITS_DEPS) $(RP_OTHER_DEPS)
-        (cd ../src2/core/; make Outcome.o Ptr.o RpBuffer.o)
+        (cd ../src2/core/; make Outcome.o Ptr.o RpBuffer.o RpEncode.o)
         $(INSTALL_DATA) $(CORE_SRC)/*.h $(INCLUDES_DIR)
         $(INSTALL_DATA) $(CEE_SRC)/*.h $(INCLUDES_DIR)
@@ -103 +92 @@
         $(INSTALL_DATA) $(CORE2_SRC)/Ptr.h $(INCLUDES_DIR)
         $(INSTALL_DATA) $(CORE2_SRC)/RpBuffer.h $(INCLUDES_DIR)
+        $(INSTALL_DATA) $(CORE2_SRC)/RpEncode.h $(INCLUDES_DIR)
         $(INSTALL_DATA) $(CORE2_SRC)/rappture2.h $(INCLUDES_DIR)
         @if test "`uname`" == "Darwin"; then \
@@ -154 +144 @@
         $(CXX) $(CFLAGS) $(DEBUG) -o $@ -c $? $(INCL_CORE) $(INCL_CORE2)
 
-RpEncode.o: $(CORE_SRC)/RpEncode.cc
-        $(CXX) $(CFLAGS) $(DEBUG) -o $@ -c $? $(INCL_CORE) $(INCL_CORE2)
-
 RpUtils.o: $(CORE_SRC)/RpUtils.cc
         $(CXX) $(CFLAGS) $(DEBUG) -o $@ -c $? $(INCL_CORE)
@@ -169 +156 @@
         $(CXX) $(CFLAGS) $(DEBUG) -o $@ -c $? $(INCL_CORE)
 
+
+# objects for rappture 2 developement
 
 RpVariable.o: $(CORE_SRC)/RpVariable.cc
@@ -246 +235 @@
 #### CLEAN UP ############################################################
 clean: 
-        - rm -f *.o librappture.so* librappture.a libRp*.so*
+        - rm -f *.o librappture.* libRp*.so*
         - rm -rf build