- Timestamp:
- Aug 15, 2006, 1:31:45 PM (18 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile.in
r504 r508 71 71 cd examples/c-example; make clean; cd -; 72 72 cd perl; make clean; cd -; 73 cd python; rm -rf build; cd -;73 cd python; rm -rf build; rm setup.py; cd -; 74 74 cd src; make clean; cd -; 75 75 cd src/matlab; make clean; cd -; … … 81 81 cd examples/c-example; make distclean; cd -; 82 82 cd perl; make clean; cd -; 83 cd python; rm -rf build; cd -;83 cd python; rm -rf build; rm setup.py; cd -; 84 84 cd src; make distclean; cd -; 85 85 cd src/matlab; make distclean; cd -; -
trunk/configure.in
r498 r508 1 1 AC_INIT(src/core/RpLibrary.cc) 2 AM_INIT_AUTOMAKE(rappture, 1.1) 2 3 3 4 VERSION=0.0.1 … … 37 38 AC_ARG_WITH(matlab, [ --with-matlab[=DIR] Build Matlab bindings if MEX compiler is found]) 38 39 dnl AC_CHECK_PROG(MEX, mex, mex, false) 40 MEX= 39 41 if test "$with_matlab" != "no" ; then 42 WITH_MATLAB = "yes" 40 43 if test -x "$with_matlab/bin/mex" 41 44 then … … 52 55 fi 53 56 fi 54 57 AM_CONDITIONAL(WITH_MATLAB, test x$MEX != x) 55 58 56 59 AC_ARG_WITH(octave, [ --with-octave[=DIR] Build Octave bindings if MKOCTFILE compiler is found]) 57 60 dnl AC_CHECK_PROG(MKOCTFILE, mkoctfile, mkoctfile, false) 61 MKOCTFILE= 58 62 if test "$with_octave" != "no" ; then 59 63 if test -x "$with_octave/bin/mkoctfile" … … 71 75 fi 72 76 fi 77 AM_CONDITIONAL(WITH_OCTAVE, test x$MKOCTFILE != x) 73 78 74 79 … … 82 87 dnl AC_CHECK_PROG(PERL, perl, perl, false) 83 88 dnl AM_CONDITIONAL(WITH_PERL, test "$PERL" != "false") 89 PERL= 90 PERL_INCLUDES= 84 91 if test "$with_perl" != "no" ; then 85 92 if test -x "$with_perl/bin/perl" … … 97 104 fi 98 105 fi 106 AM_CONDITIONAL(WITH_PERL, test x$PERL != x) 99 107 100 108 dnl … … 161 169 fi 162 170 fi 171 AM_CONDITIONAL(WITH_PYTHON, test x$PYTHON != x) 163 172 dnl AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "") 164 173 dnl if test "$PYTHON_INCLUDES" != "" … … 174 183 AC_SUBST(MKOCTFILE) 175 184 AC_SUBST(PERL) 185 AC_SUBST(PERL_INCLUDES) 176 186 AC_SUBST(PYTHON) 177 187 AC_SUBST(PYTHON_VERSION) -
trunk/src/Makefile.in
r498 r508 23 23 DEBUG = -g -Wall 24 24 DEBUG_PLUS = -g -DDEBUG 25 # PY = $(RP_INSTALL_BASE)/bin/python26 PY = @PYTHON@27 25 MEX = @MEX@ 28 26 OCT = @MKOCTFILE@ … … 31 29 # define our directories 32 30 # 33 INCLUDES_DIR = $(RP_BASE)/ include31 INCLUDES_DIR = $(RP_BASE)/src 34 32 BIN_DIR = $(RP_BASE)/bin 35 33 LIB_DIR = $(RP_BASE)/src … … 40 38 FORT_SRC = $(SRC_DIR)/fortran 41 39 CEE_SRC = $(SRC_DIR)/cee 42 PY_SRC = $(SRC_DIR)/python43 40 MATLAB_SRC = $(SRC_DIR)/matlab 44 41 OCTAVE_SRC = $(SRC_DIR)/octave … … 52 49 INCL_CEE = -I$(INCLUDES_DIR)/cee 53 50 INCL_FORTRAN = -I$(INCLUDES_DIR)/fortran 54 INCL_PY = -I$(INCLUDES_DIR)/python55 51 INCL_MATLAB = -I$(INCLUDES_DIR)/matlab 56 52 INCL_OCTAVE = -I$(INCLUDES_DIR)/octave … … 61 57 62 58 all: ${PROGS} 63 install: install_py \ 64 install_rappture \ 59 install: install_rappture \ 65 60 install_rpobjs \ 66 61 install_matlab \ … … 120 115 fi 121 116 122 #### Python ########################################################123 Rappture.Units: RpUnits.o RpUnitsStd.o124 $(PY) $(PY_SRC)/setup.py build125 126 install_py: RpUnits.o RpUnitsStd.o127 $(PY) $(PY_SRC)/setup.py install --prefix=$(RP_INSTALL_BASE)128 129 130 117 #### Matlab ######################################################## 131 118 install_matlab: librappture 132 119 cd $(MATLAB_SRC); make install; cd - 133 120 134 # if test ! -d $(RP_INSTALL_BASE)/lib/matlab; then \135 # mkdir $(RP_INSTALL_BASE)/lib/matlab; \136 # fi137 # cp $(MATLAB_SRC)/*.mex* $(RP_INSTALL_BASE)/lib/matlab138 139 121 #### Octave ######################################################## 140 122 install_octave: librappture 141 123 cd $(OCTAVE_SRC); make install; cd - 142 143 # if test ! -d $(RP_INSTALL_BASE)/lib/octave; then \144 # mkdir $(RP_INSTALL_BASE)/lib/octave; \145 # fi146 # cp $(OCTAVE_SRC)/*.oct* $(RP_INSTALL_BASE)/lib/octave147 124 148 125 #### Tcl ########################################################### -
trunk/src/matlab/Makefile.in
r498 r508 18 18 # define our directories 19 19 # 20 INCLUDES_DIR = $(RP_BASE)/ include20 INCLUDES_DIR = $(RP_BASE)/src 21 21 LIB_DIR = $(RP_BASE)/src 22 22 MATLAB_SRC = $(RP_BASE)/matlab -
trunk/src/octave/Makefile.in
r498 r508 18 18 # define our directories 19 19 # 20 INCLUDES_DIR = $(RP_BASE)/ include20 INCLUDES_DIR = $(RP_BASE)/src 21 21 LIB_DIR = $(RP_BASE)/src 22 22 OCTAVE_SRC = $(SRC_DIR)/octave 23 23 LIB_RAPPTURE = -L$(LIB_DIR) -lrappture 24 24 INCL_CORE = -I$(INCLUDES_DIR)/core 25 INCL_CEE = -I$(INCLUDES_DIR)/cee26 25 INCL_OCTAVE = -I$(INCLUDES_DIR)/octave 27 26
Note: See TracChangeset
for help on using the changeset viewer.