Changeset 4872 for branches


Ignore:
Timestamp:
Dec 15, 2014 9:06:59 AM (6 years ago)
Author:
gah
Message:
 
Location:
branches/r9
Files:
10 added
6 edited

Legend:

Unmodified
Added
Removed
  • branches/r9/Makefile.in

    r4870 r4872  
    6868
    6969targets = \
    70         blt cmake examples expat expect gui htmlwidget itcl \
     70        apps blt cmake examples expat expect gui htmlwidget itcl \
    7171        itk lang lib optimizer shape sqlitetcl tcl tcllib \
    72         tdom tester tk tkimg tls video vtk zlib  packages \
    73         apps p2p
     72        tdom tk tkimg tls video vtk zlib  packages \
    7473
    7574.PHONY: $(targets)
     
    127126        $(tls) $(vtk) $(zlib) $(apps)
    128127
    129 ifeq ("$(HAVE_VTK)", 1)
     128ifneq ("$(HAVE_VTK)", )
    130129  vtk_timestamp   = $(vtk)/timestamp
    131130  cmake_timestamp = $(cmake)/timestamp
  • branches/r9/configure

    r4870 r4872  
    624624ac_subst_vars='LTLIBOBJS
    625625LIBOBJS
     626HAVE_VTK
    626627RAPPTURE_RELEASE_SERIAL
    627628RAPPTURE_MINOR_VERSION
     
    13831384  --with-install=DIR      location of installation [default=yes]
    13841385  --with-statsdir=DIR     Write statistics in DIR
     1386  --with-vtk              Build VTK for rappture
    13851387  --with-ffmpeg=DIR       location of ffmpeg [default=yes]
    13861388  --with-vtk=version      VTK library version [default=6.1]
     
    49734975
    49744976
     4977HAVE_VTK=""
     4978
     4979# Check whether --with-statsdir was given.
     4980if test "${with_statsdir+set}" = set; then :
     4981  withval=$with_statsdir; HAVE_VTK=$withval
     4982else
     4983  HAVE_VTK=""
     4984fi
     4985
    49754986
    49764987for ac_func in sysinfo
     
    55735584fi
    55745585
    5575 
    5576 SC_CONFIG_CFLAGS
    55775586
    55785587SVN_VERSION=`svnversion $srcdir`
     
    57065715RP_BASE=`pwd`
    57075716
    5708 SC_ENABLE_SHARED
    5709 
    57105717#--------------------------------------------------------------------
    57115718# This macro figures out what flags to use with the compiler/linker
     
    61086115
    61096116MAKE=${make_command}
     6117
    61106118
    61116119
  • branches/r9/configure.in

    r4870 r4872  
    5757fi
    5858
     59HAVE_VTK=""
    5960AC_ARG_WITH(
    60     [statsdir],
    61     [AS_HELP_STRING([--with-statsdir=DIR],
    62         [Write statistics in DIR])],
    63     [STATSDIR=$withval],
    64     [STATSDIR="/var/tmp/visservers"])
    65 
     61    [vtk],
     62    [AS_HELP_STRING([--with-vtk],
     63        [Build VTK for rappture])],
     64    [HAVE_VTK=$withval],
     65    [HAVE_VTK=""])
    6666
    6767AC_CHECK_FUNCS(sysinfo)
     
    113113fi
    114114
    115 
    116 SC_CONFIG_CFLAGS
    117115
    118116SVN_VERSION=`svnversion $srcdir`
     
    231229
    232230RP_BASE=`pwd`
    233 
    234 SC_ENABLE_SHARED
    235231
    236232#--------------------------------------------------------------------
     
    323319AC_SUBST(RAPPTURE_MINOR_VERSION)
    324320AC_SUBST(RAPPTURE_RELEASE_SERIAL)
     321AC_SUBST(HAVE_VTK)
    325322
    326323dnl read Makefile.in and write Makefile
     
    339336    apps/simsim
    340337    apps/xmldiff
    341     pkgs/DicomToVtk/Makefile
    342     pkgs/DicomToVtk/pkgIndex.tcl
    343     pkgs/DxToVtk/Makefile
    344     pkgs/DxToVtk/pkgIndex.tcl
    345     pkgs/Makefile
    346     pkgs/PdbToVtk/Makefile
    347     pkgs/PdbToVtk/pkgIndex.tcl
    348     pkgs/builder/Makefile
    349     pkgs/builder/pkgIndex.tcl
    350     pkgs/builder/scripts/Makefile
    351     pkgs/diffview/Makefile
    352     pkgs/diffview/pkgIndex.tcl
    353     pkgs/hotspot/Makefile
    354     pkgs/hotspot/pkgIndex.tcl
    355     pkgs/listbox/Makefile
    356     pkgs/listbox/pkgIndex.tcl
    357     pkgs/objects/Makefile
    358     pkgs/p2p/Makefile
    359     pkgs/placard/Makefile
    360     pkgs/placard/pkgIndex.tcl
    361     pkgs/readpoints/Makefile
    362     pkgs/readpoints/pkgIndex.tcl
    363     pkgs/runner/Makefile
    364     pkgs/runner/pkgIndex.tcl
    365     pkgs/runner/scripts/Makefile
    366     pkgs/squeezer/Makefile
    367     pkgs/squeezer/pkgIndex.tcl
    368     pkgs/system/Makefile
    369     pkgs/system/pkgIndex.tcl
    370     pkgs/tester/Makefile
    371     pkgs/tester/pkgIndex.tcl
    372     pkgs/tester/scripts/Makefile
    373338])
    374339AC_OUTPUT
  • branches/r9/lib/Makefile.in

    r4860 r4872  
    4545          $(MAKE) -C $$i install || exit 1 ;\
    4646        done
     47        $(INSTALL) -m 0444 rapptureConfig.sh $(libdir)
    4748
    4849docs:
  • branches/r9/lib/configure.in

    r4866 r4872  
    33AC_CONFIG_AUX_DIR(../cf)
    44AC_CONFIG_HEADER(rappture/config.h)
     5
     6RAPPTURE_MAJOR_VERSION=1
     7RAPPTURE_MINOR_VERSION=4
     8RAPPTURE_RELEASE_SERIAL=0
    59
    610#------------------------------------------------------------------------
     
    159163AC_SUBST(SIZEOF_VOID_P)
    160164AC_SUBST(STLIB_LD)
     165AC_SUBST(RAPPTURE_MAJOR_VERSION)
     166AC_SUBST(RAPPTURE_MINOR_VERSION)
     167AC_SUBST(RAPPTURE_RELEASE_SERIAL)
    161168
    162169dnl read Makefile.in and write Makefile
    163170AC_CONFIG_FILES([
    164171    Makefile
     172    rapptureConfig.sh
    165173    rappture/Makefile
    166174    rappture2/Makefile
  • branches/r9/pkgs/system/Makefile.in

    r4852 r4872  
    6262                signal.o \
    6363                slice.o \
    64                 switch.o \
    6564                sysinfo.o
    6665
Note: See TracChangeset for help on using the changeset viewer.