Ignore:
Timestamp:
Dec 31, 2014 10:05:58 AM (7 years ago)
Author:
gah
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/r9/Makefile.in

    r4872 r4909  
    1717runtime =               $(shell cd ../rappture/runtime; pwd)
    1818TAG =                   branches/blt4
    19 VTK_VERSION =           6.0
    20 TCL_VERSION =           @TCL_VERSION@
    21 TK_VERSION =            @TK_VERSION@
    2219
    2320# ------------------------------------------------------------------------
     
    5451MKDIR_P =               @MKDIR_P@
    5552CP =                    /bin/cp
    56 HAVE_VTK =              @HAVE_VTK@
     53
     54WITH_R =                @WITH_R@
     55WITH_JAVA =             @WITH_JAVA@
     56WITH_MATLAB =           @WITH_MATLAB@
     57WITH_MKOCTFILE2 =       @WITH_MKOCTFILE2@
     58WITH_MKOCTFILE3 =       @WITH_MKOCTFILE3@
     59WITH_OCTAVE =           @WITH_OCTAVE@
     60WITH_PERL =             @WITH_PERL@
     61WITH_PYTHON =           @WITH_PYTHON@
     62WITH_RUBY =             @WITH_RUBY@
     63WITH_RUBY_SITELIBDIR =  @WITH_RUBY_SITELIBDIR@
     64WITH_TCL =              @WITH_TCL@
     65WITH_VTK =              @WITH_VTK@
    5766
    5867common_flags =          --prefix=$(prefix) --exec_prefix=$(exec_prefix)
     
    112121tkimg = tkimg1.4
    113122tls = tls1.6
     123VTK_VERSION =           6.0
    114124vtk = vtk-6.0.0
    115125zlib = zlib
     
    126136        $(tls) $(vtk) $(zlib) $(apps)
    127137
    128 ifneq ("$(HAVE_VTK)", )
     138ifneq ($(WITH_VTK), "no")
    129139  vtk_timestamp   = $(vtk)/timestamp
    130140  cmake_timestamp = $(cmake)/timestamp
     
    331341
    332342examples_flags =        \
    333         --with-tclsh="$(bindir)/tclsh8.4" \
     343        --with-tclsh="$(bindir)/tclsh" \
    334344        --enable-shared \
    335345        $(common_flags)
     
    754764lang_flags =    \
    755765        --enable-shared \
    756         $(common_flags)
     766        $(common_flags) \
     767        --with-R=${WITH_R} \
     768        --with-java=${WITH_JAVA} \
     769        --with-matlab=${WITH_MATLAB} \
     770        --with-mkoctfile2=${WITH_MKOCTFILE2} \
     771        --with-mkoctfile3=${WITH_MKOCTFILE3} \
     772        --with-octave=${WITH_OCTAVE} \
     773        --with-perl=${WITH_PERL} \
     774        --with-python=${WITH_PYTHON} \
     775        --with-ruby=${WITH_RUBY} \
     776        --with-ruby_sitelibdir=${WITH_RUBY_SITELIBDIR}
    757777
    758778lang: $(lang)/timestamp
     
    837857
    838858define clean_lib
    839         $(RM) -r $(lib)
     859        $(MAKE) -C $(lib) clean
     860        $(RM) $(lib)/timestamp
    840861endef
    841862define fetch_lib
    842863endef
    843864define configure_lib
    844         $(MKDIR_P) $(lib)
    845         cd $(lib); $(srcdir)/lib/configure $(lib_flags)
    846865endef
    847866define build_lib
    848         $(MAKE)  -C $(lib) all
     867        $(MAKE) -C $(lib) all
    849868endef
    850869define install_lib
     
    978997        + $(touch_packages)
    979998
    980 
    981999# -------------------------------------------------------------------------
    9821000#  SHAPE
     
    11471165        $(MAKE) -C $(tcl) install
    11481166        $(RM) $(bindir)/tclsh
    1149         (cd $(bindir); $(LN_S) tclsh$(TCL_VERSION) tclsh)
     1167        (. ${libdir}/tclConfig.sh ; cd $(bindir); $(LN_S) tclsh$${TCL_VERSION} tclsh)
    11501168endef
    11511169define touch_tcl
     
    13241342        $(MAKE) -C $(tk) install
    13251343        $(RM) $(bindir)/wish
    1326         (cd $(bindir); $(LN_S) wish$(TK_VERSION) wish)
     1344        (. $(libdir)/tkConfig.sh ; cd $(bindir); $(LN_S) wish$${TK_VERSION} wish)
    13271345endef
    13281346define touch_tk
     
    14591477
    14601478video_flags =   \
    1461         --with-tclsh="$(bindir)/tclsh8.4" \
     1479        --with-tclsh="$(bindir)/tclsh" \
    14621480        --enable-shared \
    14631481        $(common_flags)
     
    16331651
    16341652TRASH = \
     1653        ./bin/bltsh30 \
     1654        ./bin/bltwish30 \
    16351655        ./bin/dtplite \
    16361656        ./bin/flowvis-test \
     
    16481668        ./bin/vtkviewer-test \
    16491669        ./bin/vtkvolume-test \
    1650         ./bin/bltsh30 \
    1651         ./bin/bltwish30 \
    16521670        ./lib/bltConfig.sh \
    16531671        ./lib/itclConfig.sh \
Note: See TracChangeset for help on using the changeset viewer.