Changeset 4866
- Timestamp:
- Dec 13, 2014 8:04:54 AM (9 years ago)
- Location:
- branches/r9
- Files:
-
- 9 edited
- 2 moved
-
Makefile.in (modified) (17 diffs)
-
configure (modified) (7 diffs)
-
configure.in (modified) (6 diffs)
-
lib/configure (modified) (3 diffs)
-
lib/configure.in (modified) (2 diffs)
-
lib/objects/Makefile.in (modified) (1 diff)
-
lib/objects/RpHash.c (modified) (1 diff)
-
lib/rappture2/Makefile.in (modified) (2 diffs)
-
packages/optimizer (moved) (moved from branches/r9/optimizer)
-
packages/optimizer/src/pgapack/pgapack/configure.in (modified) (2 diffs)
-
packages/video (moved) (moved from branches/r9/video)
Legend:
- Unmodified
- Added
- Removed
-
branches/r9/Makefile.in
r4852 r4866 17 17 runtime = $(shell cd ../rappture/runtime; pwd) 18 18 TAG = branches/blt4 19 19 VTK_VERSION = 6.0 20 20 # ------------------------------------------------------------------------ 21 21 # Source and targer installation directories … … 51 51 MKDIR_P = @MKDIR_P@ 52 52 CP = /bin/cp 53 HAVE_VTK = @HAVE_VTK@ 53 54 54 55 common_flags = --prefix=$(prefix) --exec_prefix=$(exec_prefix) 55 56 x_flags = 56 57 ifneq ("$(X_INCLUDES)", ) 57 x_flags += --x-includes=$(X_INCLUDES)58 x_flags += --x-includes=$(X_INCLUDES) 58 59 endif 59 60 ifneq ("$(X_LIBRARIES)", ) 60 x_flags += --x-includes=$(X_LIBRARIES)61 x_flags += --x-includes=$(X_LIBRARIES) 61 62 endif 62 63 … … 75 76 76 77 fullpkg: tester builder packages 77 78 libshell: $(tcllib)/timestamp $(tls)/timestamp $(itcl)/timestamp79 78 80 79 # Aliases for package directory names. … … 118 117 $(tls) $(vtk) $(zlib) 119 118 119 ifneq ("$(HAVE_VTK)", ) 120 vtk_timestamp = $(vtk)/timestamp 121 cmake_timestamp = $(cmake)/timestamp 122 endif 120 123 121 124 clean: … … 127 130 128 131 blt_flags = \ 129 --enable-shared \130 $(common_flags)132 --enable-shared \ 133 $(common_flags) 131 134 132 135 blt: $(blt)/timestamp … … 495 498 $(shape)/timestamp \ 496 499 $(sqlitetcl)/timestamp \ 497 $(vtk )/timestamp500 $(vtk_timestamp) 498 501 + $(clean_gui) 499 502 + $(fetch_gui) … … 527 530 $(htmlwidget)/timestamp \ 528 531 $(shape)/timestamp \ 532 $(tdom)/timestamp \ 533 $(tcllib)/timestamp \ 534 $(tls)/timestamp \ 535 $(tkimg)/timestamp \ 529 536 $(sqlitetcl)/timestamp \ 530 $(vtk )/timestamp537 $(vtk_timestamp) 531 538 + $(clean_gui) 532 539 + $(fetch_gui) … … 805 812 define configure_librappture 806 813 $(MKDIR_P) $(librappture) 807 cd $(librappture); $(srcdir)/ src/configure $(librappture_flags)814 cd $(librappture); $(srcdir)/lib/configure $(librappture_flags) 808 815 endef 809 816 define build_librappture … … 830 837 831 838 optimizer_flags = \ 832 --with-tclsh="$(bindir)/tclsh8.4" \ 833 --enable-shared \ 839 --with-tclsh="$(bindir)/tclsh8.5" \ 840 --enable-shared \ 841 --disable-threads \ 834 842 $(common_flags) 835 843 … … 863 871 define configure_optimizer 864 872 $(MKDIR_P) $(optimizer) 865 cd $(optimizer); $(srcdir)/ $(optimizer)/configure $(optimizer_flags)873 cd $(optimizer); $(srcdir)/packages/$(optimizer)/src/configure $(optimizer_flags) 866 874 endef 867 875 define build_optimizer … … 875 883 endef 876 884 877 $(optimizer)/timestamp: $(gui)/timestamp885 $(optimizer)/timestamp: #$(gui)/timestamp 878 886 + $(clean_optimizer) 879 887 + $(fetch_optimizer) … … 967 975 force-sqlitetcl: $(tcl)/timestamp 968 976 + $(clean_sqlitetcl) 969 + $(fetch_sqlite lcl)977 + $(fetch_sqlitetcl) 970 978 + $(configure_sqlitetcl) 971 979 + $(build_sqlitetcl) … … 981 989 define configure_sqlitetcl 982 990 $(MKDIR_P) $(sqlitetcl) 983 cd $(sqlitetcl); $(runtime)/$(sqlitetcl)/ autoconf/tea/configure $(sqlitetcl_flags)991 cd $(sqlitetcl); $(runtime)/$(sqlitetcl)/tea/configure $(sqlitetcl_flags) 984 992 endef 985 993 define build_sqlitetcl … … 995 1003 $(sqlitetcl)/timestamp: $(tcl)/timestamp 996 1004 + $(clean_sqlitetcl) 997 + $(fetch_sqlite lcl)1005 + $(fetch_sqlitetcl) 998 1006 + $(configure_sqlitetcl) 999 1007 + $(build_sqlitetcl) … … 1386 1394 endef 1387 1395 define fetch_tls 1388 sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(t kimg)1396 sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(tls) 1389 1397 endef 1390 1398 define configure_tls … … 1409 1417 + $(install_tls) 1410 1418 + $(touch_tls) 1419 1420 # ------------------------------------------------------------------------- 1421 # VIDEO 1422 # ------------------------------------------------------------------------- 1423 1424 video_flags = \ 1425 --with-tclsh="$(bindir)/tclsh8.4" \ 1426 --enable-shared \ 1427 $(common_flags) 1428 1429 video: $(video)/timestamp 1430 1431 clean-video: 1432 $(clean_video) 1433 fetch-video: 1434 $(fetch_video) 1435 configure-video: 1436 $(configure_video) 1437 build-video: 1438 $(build_video) 1439 install-video: 1440 $(install_video) 1441 touch-video: 1442 $(touch_video) 1443 force-video: $(gui)/timestamp 1444 + $(clean_video) 1445 + $(fetch_video) 1446 + $(configure_video) 1447 + $(build_video) 1448 + $(install_video) 1449 + $(touch_video) 1450 1451 define clean_video 1452 $(RM) -r $(video) 1453 endef 1454 define fetch_video 1455 endef 1456 define configure_video 1457 $(MKDIR_P) $(video) 1458 cd $(video); $(srcdir)/packages/$(video)/configure $(video_flags) 1459 endef 1460 define build_video 1461 $(MAKE) -C $(video) all 1462 endef 1463 define install_video 1464 $(MAKE) -C $(video) install 1465 endef 1466 define touch_video 1467 touch $(video)/timestamp 1468 endef 1469 1470 $(video)/timestamp: $(gui)/timestamp 1471 + $(clean_video) 1472 + $(fetch_video) 1473 + $(configure_video) 1474 + $(build_video) 1475 + $(install_video) 1476 + $(touch_video) 1411 1477 1412 1478 # ------------------------------------------------------------------------- … … 1454 1520 define install_vtk 1455 1521 $(MAKE) -C $(vtk) install 1522 $(RM) $(includedir)/vtk 1523 (cd $(includedir); $(LN_S) vtk-$(VTK_VERSION) vtk) 1524 $(RM) $(libdir)/tcltk/vtk 1525 (cd $(libdir)/tcltk; $(LN_S) vtk-$(VTK_VERSION) vtk) 1456 1526 endef 1457 1527 define touch_vtk -
branches/r9/configure
r4852 r4866 2786 2786 2787 2787 2788 ac_config_headers="$ac_config_headers src/core/config.h"2788 ac_config_headers="$ac_config_headers lib/rappture/config.h" 2789 2789 2790 2790 … … 10318 10318 10319 10319 10320 ac_config_files="$ac_config_files Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/copy_rappture_examples gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/R/Makefile lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/scripts/Makefile lang/tcl/src/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/octave2/Makefile examples/app-fermi/octave/octave3/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/app-fermi/R/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/curve/Makefile examples/zoo/drawing/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/histogram/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/log/Makefile examples/zoo/mesh/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/parallelepiped/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile packages/Makefile packages/DicomToVtk/Makefile packages/DicomToVtk/pkgIndex.tcl packages/DxToVtk/Makefile packages/DxToVtk/pkgIndex.tcl packages/PdbToVtk/Makefile packages/PdbToVtk/pkgIndex.tcl packages/diffview/Makefile packages/diffview/pkgIndex.tcl packages/hotspot/Makefile packages/hotspot/pkgIndex.tcl packages/listbox/Makefile packages/listbox/pkgIndex.tcl packages/placard/Makefile packages/placard/pkgIndex.tcl packages/readpoints/Makefile packages/readpoints/pkgIndex.tcl packages/squeezer/Makefile packages/squeezer/pkgIndex.tcl packages/system/Makefile packages/system/pkgIndex.tcl oldtest/Makefile oldtest/src/Makefile"10320 ac_config_files="$ac_config_files Makefile apps/Makefile apps/about apps/copy_rappture_examples apps/encodedata apps/rappture apps/rappture-csh.env apps/rappture.env apps/rappture.use apps/rerun apps/simsim apps/xmldiff builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/R/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/octave/octave2/Makefile examples/app-fermi/octave/octave3/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/curve/Makefile examples/zoo/drawing/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/histogram/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/log/Makefile examples/zoo/mesh/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/parallelepiped/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile gui/Makefile gui/pkgIndex.tcl gui/scripts/Makefile lang/Makefile lang/R/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/scripts/Makefile lang/tcl/src/Makefile lang/tcl/tests/Makefile lib/Makefile lib/objects/Makefile lib/objects/RpHash.h lib/rappture/Makefile lib/rappture2/Makefile packages/DicomToVtk/Makefile packages/DicomToVtk/pkgIndex.tcl packages/DxToVtk/Makefile packages/DxToVtk/pkgIndex.tcl packages/Makefile packages/PdbToVtk/Makefile packages/PdbToVtk/pkgIndex.tcl packages/diffview/Makefile packages/diffview/pkgIndex.tcl packages/hotspot/Makefile packages/hotspot/pkgIndex.tcl packages/listbox/Makefile packages/listbox/pkgIndex.tcl packages/placard/Makefile packages/placard/pkgIndex.tcl packages/readpoints/Makefile packages/readpoints/pkgIndex.tcl packages/squeezer/Makefile packages/squeezer/pkgIndex.tcl packages/system/Makefile packages/system/pkgIndex.tcl runner/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile" 10321 10321 10322 10322 cat >confcache <<\_ACEOF … … 11012 11012 do 11013 11013 case $ac_config_target in 11014 " src/core/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/core/config.h" ;;11014 "lib/rappture/config.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/rappture/config.h" ;; 11015 11015 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; 11016 "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; 11017 "src/core/Makefile") CONFIG_FILES="$CONFIG_FILES src/core/Makefile" ;; 11018 "src/core2/Makefile") CONFIG_FILES="$CONFIG_FILES src/core2/Makefile" ;; 11019 "src/objects/Makefile") CONFIG_FILES="$CONFIG_FILES src/objects/Makefile" ;; 11020 "src/objects/RpHash.h") CONFIG_FILES="$CONFIG_FILES src/objects/RpHash.h" ;; 11021 "gui/Makefile") CONFIG_FILES="$CONFIG_FILES gui/Makefile" ;; 11022 "gui/apps/Makefile") CONFIG_FILES="$CONFIG_FILES gui/apps/Makefile" ;; 11023 "gui/apps/about") CONFIG_FILES="$CONFIG_FILES gui/apps/about" ;; 11024 "gui/apps/copy_rappture_examples") CONFIG_FILES="$CONFIG_FILES gui/apps/copy_rappture_examples" ;; 11025 "gui/apps/encodedata") CONFIG_FILES="$CONFIG_FILES gui/apps/encodedata" ;; 11026 "gui/apps/rappture") CONFIG_FILES="$CONFIG_FILES gui/apps/rappture" ;; 11027 "gui/apps/rappture-csh.env") CONFIG_FILES="$CONFIG_FILES gui/apps/rappture-csh.env" ;; 11028 "gui/apps/rappture.env") CONFIG_FILES="$CONFIG_FILES gui/apps/rappture.env" ;; 11029 "gui/apps/rappture.use") CONFIG_FILES="$CONFIG_FILES gui/apps/rappture.use" ;; 11030 "gui/apps/rerun") CONFIG_FILES="$CONFIG_FILES gui/apps/rerun" ;; 11031 "gui/apps/simsim") CONFIG_FILES="$CONFIG_FILES gui/apps/simsim" ;; 11032 "gui/apps/xmldiff") CONFIG_FILES="$CONFIG_FILES gui/apps/xmldiff" ;; 11033 "gui/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES gui/pkgIndex.tcl" ;; 11034 "gui/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES gui/scripts/Makefile" ;; 11016 "apps/Makefile") CONFIG_FILES="$CONFIG_FILES apps/Makefile" ;; 11017 "apps/about") CONFIG_FILES="$CONFIG_FILES apps/about" ;; 11018 "apps/copy_rappture_examples") CONFIG_FILES="$CONFIG_FILES apps/copy_rappture_examples" ;; 11019 "apps/encodedata") CONFIG_FILES="$CONFIG_FILES apps/encodedata" ;; 11020 "apps/rappture") CONFIG_FILES="$CONFIG_FILES apps/rappture" ;; 11021 "apps/rappture-csh.env") CONFIG_FILES="$CONFIG_FILES apps/rappture-csh.env" ;; 11022 "apps/rappture.env") CONFIG_FILES="$CONFIG_FILES apps/rappture.env" ;; 11023 "apps/rappture.use") CONFIG_FILES="$CONFIG_FILES apps/rappture.use" ;; 11024 "apps/rerun") CONFIG_FILES="$CONFIG_FILES apps/rerun" ;; 11025 "apps/simsim") CONFIG_FILES="$CONFIG_FILES apps/simsim" ;; 11026 "apps/xmldiff") CONFIG_FILES="$CONFIG_FILES apps/xmldiff" ;; 11035 11027 "builder/Makefile") CONFIG_FILES="$CONFIG_FILES builder/Makefile" ;; 11036 11028 "builder/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES builder/pkgIndex.tcl" ;; 11037 11029 "builder/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES builder/scripts/Makefile" ;; 11038 "tester/Makefile") CONFIG_FILES="$CONFIG_FILES tester/Makefile" ;;11039 "tester/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES tester/pkgIndex.tcl" ;;11040 "tester/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES tester/scripts/Makefile" ;;11041 "lang/Makefile") CONFIG_FILES="$CONFIG_FILES lang/Makefile" ;;11042 "lang/java/Makefile") CONFIG_FILES="$CONFIG_FILES lang/java/Makefile" ;;11043 "lang/java/rappture/Makefile") CONFIG_FILES="$CONFIG_FILES lang/java/rappture/Makefile" ;;11044 "lang/perl/Makefile") CONFIG_FILES="$CONFIG_FILES lang/perl/Makefile" ;;11045 "lang/perl/Makefile.PL") CONFIG_FILES="$CONFIG_FILES lang/perl/Makefile.PL" ;;11046 "lang/python/Makefile") CONFIG_FILES="$CONFIG_FILES lang/python/Makefile" ;;11047 "lang/python/setup.py") CONFIG_FILES="$CONFIG_FILES lang/python/setup.py" ;;11048 "lang/matlab/Makefile") CONFIG_FILES="$CONFIG_FILES lang/matlab/Makefile" ;;11049 "lang/octave/Makefile") CONFIG_FILES="$CONFIG_FILES lang/octave/Makefile" ;;11050 "lang/octave/octave2/Makefile") CONFIG_FILES="$CONFIG_FILES lang/octave/octave2/Makefile" ;;11051 "lang/octave/octave3/Makefile") CONFIG_FILES="$CONFIG_FILES lang/octave/octave3/Makefile" ;;11052 "lang/R/Makefile") CONFIG_FILES="$CONFIG_FILES lang/R/Makefile" ;;11053 "lang/ruby/Makefile") CONFIG_FILES="$CONFIG_FILES lang/ruby/Makefile" ;;11054 "lang/ruby/build.rb") CONFIG_FILES="$CONFIG_FILES lang/ruby/build.rb" ;;11055 "lang/tcl/Makefile") CONFIG_FILES="$CONFIG_FILES lang/tcl/Makefile" ;;11056 "lang/tcl/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES lang/tcl/pkgIndex.tcl" ;;11057 "lang/tcl/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES lang/tcl/scripts/Makefile" ;;11058 "lang/tcl/src/Makefile") CONFIG_FILES="$CONFIG_FILES lang/tcl/src/Makefile" ;;11059 "lang/tcl/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lang/tcl/tests/Makefile" ;;11060 "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;11061 11030 "examples/3D/Makefile") CONFIG_FILES="$CONFIG_FILES examples/3D/Makefile" ;; 11062 11031 "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; 11063 11032 "examples/app-fermi/2.0/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/2.0/Makefile" ;; 11064 11033 "examples/app-fermi/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/Makefile" ;; 11034 "examples/app-fermi/R/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/R/Makefile" ;; 11065 11035 "examples/app-fermi/cee/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/cee/Makefile" ;; 11066 11036 "examples/app-fermi/fortran/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/fortran/Makefile" ;; … … 11069 11039 "examples/app-fermi/matlab/compiled/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/matlab/compiled/Makefile" ;; 11070 11040 "examples/app-fermi/matlab/uncompiled/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/matlab/uncompiled/Makefile" ;; 11041 "examples/app-fermi/octave/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/Makefile" ;; 11071 11042 "examples/app-fermi/octave/octave2/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/octave2/Makefile" ;; 11072 11043 "examples/app-fermi/octave/octave3/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/octave3/Makefile" ;; 11073 "examples/app-fermi/octave/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/Makefile" ;;11074 11044 "examples/app-fermi/perl/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/perl/Makefile" ;; 11075 11045 "examples/app-fermi/python/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/python/Makefile" ;; … … 11081 11051 "examples/app-fermi/wrapper/python/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/wrapper/python/Makefile" ;; 11082 11052 "examples/app-fermi/wrapper/tcl/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/wrapper/tcl/Makefile" ;; 11083 "examples/app-fermi/R/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/R/Makefile" ;;11084 11053 "examples/c-example/Makefile") CONFIG_FILES="$CONFIG_FILES examples/c-example/Makefile" ;; 11085 11054 "examples/canvas/Makefile") CONFIG_FILES="$CONFIG_FILES examples/canvas/Makefile" ;; … … 11136 11105 "examples/zoo/structure/examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/structure/examples/Makefile" ;; 11137 11106 "examples/zoo/table/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/table/Makefile" ;; 11138 "packages/Makefile") CONFIG_FILES="$CONFIG_FILES packages/Makefile" ;; 11107 "gui/Makefile") CONFIG_FILES="$CONFIG_FILES gui/Makefile" ;; 11108 "gui/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES gui/pkgIndex.tcl" ;; 11109 "gui/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES gui/scripts/Makefile" ;; 11110 "lang/Makefile") CONFIG_FILES="$CONFIG_FILES lang/Makefile" ;; 11111 "lang/R/Makefile") CONFIG_FILES="$CONFIG_FILES lang/R/Makefile" ;; 11112 "lang/java/Makefile") CONFIG_FILES="$CONFIG_FILES lang/java/Makefile" ;; 11113 "lang/java/rappture/Makefile") CONFIG_FILES="$CONFIG_FILES lang/java/rappture/Makefile" ;; 11114 "lang/matlab/Makefile") CONFIG_FILES="$CONFIG_FILES lang/matlab/Makefile" ;; 11115 "lang/octave/Makefile") CONFIG_FILES="$CONFIG_FILES lang/octave/Makefile" ;; 11116 "lang/octave/octave2/Makefile") CONFIG_FILES="$CONFIG_FILES lang/octave/octave2/Makefile" ;; 11117 "lang/octave/octave3/Makefile") CONFIG_FILES="$CONFIG_FILES lang/octave/octave3/Makefile" ;; 11118 "lang/perl/Makefile") CONFIG_FILES="$CONFIG_FILES lang/perl/Makefile" ;; 11119 "lang/perl/Makefile.PL") CONFIG_FILES="$CONFIG_FILES lang/perl/Makefile.PL" ;; 11120 "lang/python/Makefile") CONFIG_FILES="$CONFIG_FILES lang/python/Makefile" ;; 11121 "lang/python/setup.py") CONFIG_FILES="$CONFIG_FILES lang/python/setup.py" ;; 11122 "lang/ruby/Makefile") CONFIG_FILES="$CONFIG_FILES lang/ruby/Makefile" ;; 11123 "lang/ruby/build.rb") CONFIG_FILES="$CONFIG_FILES lang/ruby/build.rb" ;; 11124 "lang/tcl/Makefile") CONFIG_FILES="$CONFIG_FILES lang/tcl/Makefile" ;; 11125 "lang/tcl/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES lang/tcl/pkgIndex.tcl" ;; 11126 "lang/tcl/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES lang/tcl/scripts/Makefile" ;; 11127 "lang/tcl/src/Makefile") CONFIG_FILES="$CONFIG_FILES lang/tcl/src/Makefile" ;; 11128 "lang/tcl/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lang/tcl/tests/Makefile" ;; 11129 "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; 11130 "lib/objects/Makefile") CONFIG_FILES="$CONFIG_FILES lib/objects/Makefile" ;; 11131 "lib/objects/RpHash.h") CONFIG_FILES="$CONFIG_FILES lib/objects/RpHash.h" ;; 11132 "lib/rappture/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rappture/Makefile" ;; 11133 "lib/rappture2/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rappture2/Makefile" ;; 11139 11134 "packages/DicomToVtk/Makefile") CONFIG_FILES="$CONFIG_FILES packages/DicomToVtk/Makefile" ;; 11140 11135 "packages/DicomToVtk/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES packages/DicomToVtk/pkgIndex.tcl" ;; 11141 11136 "packages/DxToVtk/Makefile") CONFIG_FILES="$CONFIG_FILES packages/DxToVtk/Makefile" ;; 11142 11137 "packages/DxToVtk/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES packages/DxToVtk/pkgIndex.tcl" ;; 11138 "packages/Makefile") CONFIG_FILES="$CONFIG_FILES packages/Makefile" ;; 11143 11139 "packages/PdbToVtk/Makefile") CONFIG_FILES="$CONFIG_FILES packages/PdbToVtk/Makefile" ;; 11144 11140 "packages/PdbToVtk/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES packages/PdbToVtk/pkgIndex.tcl" ;; … … 11157 11153 "packages/system/Makefile") CONFIG_FILES="$CONFIG_FILES packages/system/Makefile" ;; 11158 11154 "packages/system/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES packages/system/pkgIndex.tcl" ;; 11159 "oldtest/Makefile") CONFIG_FILES="$CONFIG_FILES oldtest/Makefile" ;; 11160 "oldtest/src/Makefile") CONFIG_FILES="$CONFIG_FILES oldtest/src/Makefile" ;; 11155 "runner/Makefile") CONFIG_FILES="$CONFIG_FILES runner/Makefile" ;; 11156 "tester/Makefile") CONFIG_FILES="$CONFIG_FILES tester/Makefile" ;; 11157 "tester/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES tester/pkgIndex.tcl" ;; 11158 "tester/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES tester/scripts/Makefile" ;; 11161 11159 11162 11160 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; -
branches/r9/configure.in
r4860 r4866 456 456 AC_CONFIG_FILES([ 457 457 Makefile 458 lib/Makefile459 lib/rappture/Makefile460 lib/rappture2/Makefile461 lib/objects/Makefile462 lib/objects/RpHash.h463 gui/Makefile464 458 apps/Makefile 465 459 apps/about … … 473 467 apps/simsim 474 468 apps/xmldiff 475 gui/pkgIndex.tcl476 gui/scripts/Makefile477 469 builder/Makefile 478 470 builder/pkgIndex.tcl 479 471 builder/scripts/Makefile 480 tester/Makefile481 tester/pkgIndex.tcl482 tester/scripts/Makefile483 runner/Makefile484 lang/Makefile485 lang/java/Makefile486 lang/java/rappture/Makefile487 lang/perl/Makefile488 lang/perl/Makefile.PL489 lang/python/Makefile490 lang/python/setup.py491 lang/matlab/Makefile492 lang/octave/Makefile493 lang/octave/octave2/Makefile494 lang/octave/octave3/Makefile495 lang/R/Makefile496 lang/ruby/Makefile497 lang/ruby/build.rb498 lang/tcl/Makefile499 lang/tcl/pkgIndex.tcl500 lang/tcl/scripts/Makefile501 lang/tcl/src/Makefile502 lang/tcl/tests/Makefile503 lib/Makefile504 472 examples/3D/Makefile 505 473 examples/Makefile 506 474 examples/app-fermi/2.0/Makefile 507 475 examples/app-fermi/Makefile 476 examples/app-fermi/R/Makefile 508 477 examples/app-fermi/cee/Makefile 509 478 examples/app-fermi/fortran/Makefile … … 512 481 examples/app-fermi/matlab/compiled/Makefile 513 482 examples/app-fermi/matlab/uncompiled/Makefile 483 examples/app-fermi/octave/Makefile 514 484 examples/app-fermi/octave/octave2/Makefile 515 485 examples/app-fermi/octave/octave3/Makefile 516 examples/app-fermi/octave/Makefile517 486 examples/app-fermi/perl/Makefile 518 487 examples/app-fermi/python/Makefile … … 524 493 examples/app-fermi/wrapper/python/Makefile 525 494 examples/app-fermi/wrapper/tcl/Makefile 526 examples/app-fermi/R/Makefile527 495 examples/c-example/Makefile 528 496 examples/canvas/Makefile … … 579 547 examples/zoo/structure/examples/Makefile 580 548 examples/zoo/table/Makefile 581 packages/Makefile 549 gui/Makefile 550 gui/pkgIndex.tcl 551 gui/scripts/Makefile 552 lang/Makefile 553 lang/R/Makefile 554 lang/java/Makefile 555 lang/java/rappture/Makefile 556 lang/matlab/Makefile 557 lang/octave/Makefile 558 lang/octave/octave2/Makefile 559 lang/octave/octave3/Makefile 560 lang/perl/Makefile 561 lang/perl/Makefile.PL 562 lang/python/Makefile 563 lang/python/setup.py 564 lang/ruby/Makefile 565 lang/ruby/build.rb 566 lang/tcl/Makefile 567 lang/tcl/pkgIndex.tcl 568 lang/tcl/scripts/Makefile 569 lang/tcl/src/Makefile 570 lang/tcl/tests/Makefile 571 lib/Makefile 572 lib/objects/Makefile 573 lib/objects/RpHash.h 574 lib/rappture/Makefile 575 lib/rappture2/Makefile 582 576 packages/DicomToVtk/Makefile 583 577 packages/DicomToVtk/pkgIndex.tcl 584 578 packages/DxToVtk/Makefile 585 579 packages/DxToVtk/pkgIndex.tcl 580 packages/Makefile 586 581 packages/PdbToVtk/Makefile 587 582 packages/PdbToVtk/pkgIndex.tcl … … 600 595 packages/system/Makefile 601 596 packages/system/pkgIndex.tcl 602 oldtest/Makefile 603 oldtest/src/Makefile 597 runner/Makefile 598 tester/Makefile 599 tester/pkgIndex.tcl 600 tester/scripts/Makefile 604 601 ]) 605 602 AC_OUTPUT -
branches/r9/lib/configure
r4836 r4866 2645 2645 2646 2646 2647 ac_config_headers="$ac_config_headers core/config.h"2647 ac_config_headers="$ac_config_headers rappture/config.h" 2648 2648 2649 2649 … … 7646 7646 7647 7647 7648 ac_config_files="$ac_config_files Makefile core/Makefile core2/Makefile objects/Makefile objects/RpHash.h"7648 ac_config_files="$ac_config_files Makefile rappture/Makefile rappture2/Makefile objects/Makefile objects/RpHash.h" 7649 7649 7650 7650 cat >confcache <<\_ACEOF … … 8340 8340 do 8341 8341 case $ac_config_target in 8342 " core/config.h") CONFIG_HEADERS="$CONFIG_HEADERS core/config.h" ;;8342 "rappture/config.h") CONFIG_HEADERS="$CONFIG_HEADERS rappture/config.h" ;; 8343 8343 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; 8344 " core/Makefile") CONFIG_FILES="$CONFIG_FILES core/Makefile" ;;8345 " core2/Makefile") CONFIG_FILES="$CONFIG_FILES core2/Makefile" ;;8344 "rappture/Makefile") CONFIG_FILES="$CONFIG_FILES rappture/Makefile" ;; 8345 "rappture2/Makefile") CONFIG_FILES="$CONFIG_FILES rappture2/Makefile" ;; 8346 8346 "objects/Makefile") CONFIG_FILES="$CONFIG_FILES objects/Makefile" ;; 8347 8347 "objects/RpHash.h") CONFIG_FILES="$CONFIG_FILES objects/RpHash.h" ;; -
branches/r9/lib/configure.in
r4836 r4866 2 2 AC_INIT([Rappture],[1.4],[rappture@nanohub.org]) 3 3 AC_CONFIG_AUX_DIR(../cf) 4 AC_CONFIG_HEADER( core/config.h)4 AC_CONFIG_HEADER(rappture/config.h) 5 5 6 6 #------------------------------------------------------------------------ … … 163 163 AC_CONFIG_FILES([ 164 164 Makefile 165 core/Makefile166 core2/Makefile165 rappture/Makefile 166 rappture2/Makefile 167 167 objects/Makefile 168 168 objects/RpHash.h -
branches/r9/lib/objects/Makefile.in
r4836 r4866 34 34 INCLUDES = \ 35 35 -I. \ 36 -I../ core \36 -I../rappture \ 37 37 -I$(srcdir) \ 38 -I$(srcdir)/../ core \38 -I$(srcdir)/../rappture \ 39 39 -I$(includedir) 40 LIBS = -L../ core -lrappture40 LIBS = -L../rappture -lrappture 41 41 42 42 -
branches/r9/lib/objects/RpHash.c
r4836 r4866 41 41 */ 42 42 43 #include "../ core/config.h"43 #include "../rappture/config.h" 44 44 #include <RpInt.h> 45 45 -
branches/r9/lib/rappture2/Makefile.in
r4836 r4866 36 36 SHLIB_SUFFIX = @SHLIB_SUFFIX@ 37 37 CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ 38 LIB_SEARCH_DIRS = -L../ core @LIB_SEARCH_DIRS@38 LIB_SEARCH_DIRS = -L../rappture @LIB_SEARCH_DIRS@ 39 39 LIB_RUNTIME_DIR = $(libdir) 40 40 CFLAGS = @CFLAGS@ -fPIC … … 59 59 INCLUDES = \ 60 60 -I$(srcdir) \ 61 -I$(srcdir)/../ core \61 -I$(srcdir)/../rappture \ 62 62 -I$(includedir) 63 63 -
branches/r9/packages/optimizer/src/pgapack/pgapack/configure.in
r816 r4866 442 442 then 443 443 rm -f ./include/mpi.h ./include/mpif.h ./examples/fortran/mpif.h ./examples/mgh/mpif.h ./test/mpif.h 444 ln -s fakempi_h include/mpi.h445 ln -s fakempif_h include/mpif.h446 ln -s ../../include/mpif.h ./examples/fortran/mpif.h447 ln -s ../../include/mpif.h ./examples/mgh/mpif.h448 ln -s ../include/mpif.h ./test/mpif.h444 ln -s fakempi_h ${srcdir}/include/mpi.h 445 ln -s fakempif_h ${srcdir}/include/mpif.h 446 ln -s ../../include/mpif.h ${srcdir}/examples/fortran/mpif.h 447 ln -s ../../include/mpif.h ${srcdir}/examples/mgh/mpif.h 448 ln -s ../include/mpif.h ${srcdir}/test/mpif.h 449 449 TEMP='$(PGA_LIB_DIR)/mpi_stub.o' 450 450 OBJS="$OBJS $TEMP" … … 489 489 AC_SUBST(RANLIB) 490 490 AC_SUBST(SHELL) 491 AC_OUTPUT(Makefile source/Makefile test/Makefile test/Makefile\491 AC_OUTPUT(Makefile source/Makefile test/Makefile \ 492 492 examples/Makefile examples/c/Makefile examples/fortran/Makefile \ 493 493 examples/mgh/Makefile)
Note: See TracChangeset
for help on using the changeset viewer.
