Changeset 508 for trunk

Timestamp:

Aug 15, 2006, 1:31:45 PM (18 years ago)

Author:

dkearney

Message:

updates to Makefile.in's, this should not change the current build process as these files are not in use yet. also added python's units stuff the the top level python package.

Location:

trunk

Files:

• Makefile.in (modified) (2 diffs)
• configure.in (modified) (8 diffs)
• python/Rappture/PyRpUnits.cc (copied) (copied from trunk/src/python/PyRpUnits.cc)
• src/Makefile.in (modified) (6 diffs)
• src/matlab/Makefile.in (modified) (1 diff)
• src/octave/Makefile.in (modified) (1 diff)

trunk/Makefile.in

@@ -71 +71 @@
         cd examples/c-example; make clean; cd -;
         cd perl; make clean; cd -;
-        cd python; rm -rf build; cd -;
+        cd python; rm -rf build; rm setup.py; cd -;
         cd src; make clean; cd -;
         cd src/matlab; make clean; cd -;
@@ -81 +81 @@
         cd examples/c-example; make distclean; cd -;
         cd perl; make clean; cd -;
-        cd python; rm -rf build; cd -;
+        cd python; rm -rf build; rm setup.py; cd -;
         cd src; make distclean; cd -;
         cd src/matlab; make distclean; cd -;

trunk/configure.in

@@ -1 +1 @@
 AC_INIT(src/core/RpLibrary.cc)
+AM_INIT_AUTOMAKE(rappture, 1.1)
 
 VERSION=0.0.1
@@ -37 +38 @@
 AC_ARG_WITH(matlab, [  --with-matlab[=DIR]         Build Matlab bindings if MEX compiler is found])
 dnl AC_CHECK_PROG(MEX, mex, mex, false)
+MEX=
 if test "$with_matlab" != "no" ; then
+    WITH_MATLAB = "yes"
     if test -x "$with_matlab/bin/mex"
     then
@@ -52 +55 @@
     fi
 fi
-
+AM_CONDITIONAL(WITH_MATLAB, test x$MEX != x)
 
 AC_ARG_WITH(octave, [  --with-octave[=DIR]         Build Octave bindings if MKOCTFILE compiler is found])
 dnl AC_CHECK_PROG(MKOCTFILE, mkoctfile, mkoctfile, false)
+MKOCTFILE=
 if test "$with_octave" != "no" ; then
     if test -x "$with_octave/bin/mkoctfile"
@@ -71 +75 @@
     fi
 fi
+AM_CONDITIONAL(WITH_OCTAVE, test x$MKOCTFILE != x)
 
 
@@ -82 +87 @@
 dnl AC_CHECK_PROG(PERL, perl, perl, false)
 dnl AM_CONDITIONAL(WITH_PERL, test "$PERL" != "false")
+PERL=
+PERL_INCLUDES=
 if test "$with_perl" != "no" ; then
     if test -x "$with_perl/bin/perl"
@@ -97 +104 @@
     fi
 fi
+AM_CONDITIONAL(WITH_PERL, test x$PERL != x)
 
 dnl
@@ -161 +169 @@
     fi
 fi
+AM_CONDITIONAL(WITH_PYTHON, test x$PYTHON != x)
 dnl AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
 dnl if test "$PYTHON_INCLUDES" != ""
@@ -174 +183 @@
 AC_SUBST(MKOCTFILE)
 AC_SUBST(PERL)
+AC_SUBST(PERL_INCLUDES)
 AC_SUBST(PYTHON)
 AC_SUBST(PYTHON_VERSION)

trunk/src/Makefile.in

@@ -23 +23 @@
 DEBUG           = -g -Wall
 DEBUG_PLUS      = -g -DDEBUG
-# PY              = $(RP_INSTALL_BASE)/bin/python
-PY              = @PYTHON@
 MEX             = @MEX@
 OCT             = @MKOCTFILE@
@@ -31 +29 @@
 # define our directories
 #
-INCLUDES_DIR    = $(RP_BASE)/include
+INCLUDES_DIR    = $(RP_BASE)/src
 BIN_DIR         = $(RP_BASE)/bin
 LIB_DIR         = $(RP_BASE)/src
@@ -40 +38 @@
 FORT_SRC        = $(SRC_DIR)/fortran
 CEE_SRC         = $(SRC_DIR)/cee
-PY_SRC          = $(SRC_DIR)/python
 MATLAB_SRC      = $(SRC_DIR)/matlab
 OCTAVE_SRC      = $(SRC_DIR)/octave
@@ -52 +49 @@
 INCL_CEE        = -I$(INCLUDES_DIR)/cee
 INCL_FORTRAN    = -I$(INCLUDES_DIR)/fortran
-INCL_PY         = -I$(INCLUDES_DIR)/python
 INCL_MATLAB     = -I$(INCLUDES_DIR)/matlab
 INCL_OCTAVE     = -I$(INCLUDES_DIR)/octave
@@ -61 +57 @@
 
 all: ${PROGS}
-install:        install_py                      \
-                        install_rappture        \
+install:        install_rappture        \
                         install_rpobjs          \
                         install_matlab          \
@@ -120 +115 @@
         fi
 
-#### Python ########################################################
-Rappture.Units: RpUnits.o RpUnitsStd.o
-        $(PY) $(PY_SRC)/setup.py build
-
-install_py: RpUnits.o RpUnitsStd.o
-        $(PY) $(PY_SRC)/setup.py install --prefix=$(RP_INSTALL_BASE)
-
-
 #### Matlab ########################################################
 install_matlab: librappture
         cd $(MATLAB_SRC); make install; cd -
 
-#       if test ! -d $(RP_INSTALL_BASE)/lib/matlab; then \
-#               mkdir $(RP_INSTALL_BASE)/lib/matlab; \
-#       fi
-#       cp $(MATLAB_SRC)/*.mex* $(RP_INSTALL_BASE)/lib/matlab
-
 #### Octave ########################################################
 install_octave: librappture
         cd $(OCTAVE_SRC); make install; cd -
-
-#       if test ! -d $(RP_INSTALL_BASE)/lib/octave; then \
-#               mkdir $(RP_INSTALL_BASE)/lib/octave; \
-#       fi
-#       cp $(OCTAVE_SRC)/*.oct* $(RP_INSTALL_BASE)/lib/octave
 
 #### Tcl ###########################################################

trunk/src/matlab/Makefile.in

@@ -18 +18 @@
 # define our directories
 #
-INCLUDES_DIR    = $(RP_BASE)/include
+INCLUDES_DIR    = $(RP_BASE)/src
 LIB_DIR         = $(RP_BASE)/src
 MATLAB_SRC      = $(RP_BASE)/matlab

trunk/src/octave/Makefile.in

@@ -18 +18 @@
 # define our directories
 #
-INCLUDES_DIR    = $(RP_BASE)/include
+INCLUDES_DIR    = $(RP_BASE)/src
 LIB_DIR         = $(RP_BASE)/src
 OCTAVE_SRC      = $(SRC_DIR)/octave
 LIB_RAPPTURE    = -L$(LIB_DIR) -lrappture
 INCL_CORE       = -I$(INCLUDES_DIR)/core
-INCL_CEE        = -I$(INCLUDES_DIR)/cee
 INCL_OCTAVE     = -I$(INCLUDES_DIR)/octave