Ignore:
Timestamp:
Dec 12, 2014 7:16:36 AM (9 years ago)
Author:
gah
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/r9/Makefile.in

    r4840 r4852  
    1515WORDSIZE =              @WORDSIZE@
    1616version = $(RAPPTURE_MAJOR_VERSION).$(RAPPTURE_MINOR_VERSION).$(RAPPTURE_RELEASE_SERIAL)
    17 runtime =               $(shell cd ../runtime; pwd)
    18 TAG =                   trunk
     17runtime =               $(shell cd ../rappture/runtime; pwd)
     18TAG =                   branches/blt4
    1919
    2020# ------------------------------------------------------------------------
    … …  
    6464
    6565targets = \
    66         blt builder cmake examples expat expect glew gui geovis \
    67         htmlwidget itcl itk lang librappture nanovis nanoscale \
    68         optimizer osg osgearth pymol \
    69         pymolproxy shape sqlitetcl tcl tcllib tdom tester tk \
    70         tkimg tls video voronoi vtk vtkvis zlib 
     66        blt builder cmake examples expat expect gui htmlwidget itcl \
     67        itk lang librappture optimizer shape sqlitetcl tcl tcllib \
     68        tdom tester tk tkimg tls video vtk zlib  packages
    7169
    7270.PHONY: $(targets)
    … …  
    7472.NOTPARALLEL:
    7573
    76 all: gui
    77 
    78 fullpkg: tester builder renderservers
    79 
    80 renderservers: nanoscale nanovis vtkvis geovis pymolproxy
     74all: gui packages lang
     75
     76fullpkg: tester builder packages
    8177
    8278libshell: $(tcllib)/timestamp $(tls)/timestamp $(itcl)/timestamp
    … …  
    8480# Aliases for package directory names.
    8581
    86 blt = blt2.4z
    87 builder = builder
    88 cmake = cmake-2.8.12
    89 examples =examples
    90 expat = expat-2.0.1
     82blt = blt4
     83cmake = cmake-2.8.12.2
     84examples = examples
     85expat = expat-2.1.0
    9186expect = expect5.45
    92 glew = glew
     87freetype = freetype-2.5.3
    9388gui = gui
    9489htmlwidget = htmlwidget-3a14
    95 itcl = itcl3.3
     90itcl = itcl3.4
    9691itk = itk3.3
     92jpeg = jpeg-8d
     93libpng = libpng-1.6.15
     94librappture = librappture
     95openssl = openssl-1.0.1j
     96optimizer = optimizer
     97shape = shape0.4
     98sqlitetcl = sqlite-src-3080703
     99sqlitetcl = sqlite-3071502
     100tcl = tcl8.5.10
     101tcllib = tcllib-1.15
     102tdom = tDOM-0.8.3
     103tiff = tiff-4.0.3
     104tk = tk8.5.10
     105tkimg = tkimg1.4
     106tls = tls1.6
     107vtk = vtk-6.0.0
     108zlib = zlib
     109tester = tester
     110builder = builder
    97111lang = lang
    98 librappture = librappture
    99 nanoscale = nanoscale
    100 nanovis = nanovis
    101 optimizer = optimizer
    102 osg = OpenSceneGraph-3.2.0
    103 osgearth = osgearth-2.5
    104 pymol = pymol
    105 pymolproxy = pymolproxy
    106 shape = shape0.4
    107 sqlitetcl = sqlite-3071502/tea
    108 tcl = tcl8.4.19
    109 tcllib = tcllib-1.12
    110 tdom = tDOM-0.8.2
    111 tester = tester
    112 tk = tk8.4.19
    113 tkimg = tkimg1.3
    114 tls = tls1.6
    115 video = video
    116 voronoi = voronoi
    117 vtk = vtk-6.0.0
    118 vtkvis = vtkvis
    119 geovis = geovis
    120 zlib = zlib
    121112
    122113subdirs = \
    123         $(blt) $(builder) $(cmake) $(examples) $(expat) $(expect) $(glew) \
    124         $(gui) $(htmlwidget) $(itcl) $(itk) $(lang) $(librappture) $(nanovis) \
    125         $(optimizer) $(osg) $(osgearth) $(pymol) $(pymolproxy) $(shape) \
     114        $(blt) $(builder) $(cmake) $(examples) $(expat) $(expect) \
     115        $(gui) $(htmlwidget) $(itcl) $(itk) $(lang) $(librappture) \
     116        $(optimizer) $(shape) \
    126117        $(sqlitetcl) $(tcl) $(tcllib) $(tdom) $(tester) $(tk) $(tkimg) \
    127         $(tls) $(video) $(voronoi) $(vtk) $(vtkvis) $(zlib) $(geovis)
     118        $(tls) $(vtk) $(zlib)
    128119
    129120
    … …  
    474465        + $(install_expect)
    475466        + $(touch_expect)
    476 
    477 # -------------------------------------------------------------------------
    478 #  GLEW
    479 # -------------------------------------------------------------------------
    480 
    481 glew_flags =    \
    482         --enable-shared \
    483         $(common_flags)
    484 
    485 glew: $(glew)/timestamp
    486 
    487 clean-glew:
    488         $(clean_glew)
    489 fetch-glew:
    490         $(fetch_glew)
    491 configure-glew:
    492         $(configure_glew)
    493 build-glew:
    494         $(build_glew)
    495 install-glew:
    496         $(install_glew)
    497 touch-glew:
    498         $(touch_glew)
    499 force-glew:
    500         + $(clean_glew)
    501         + $(fetch_glew)
    502         + $(configure_glew)
    503         + $(build_glew)
    504         + $(install_glew)
    505         + $(touch_glew)
    506 
    507 define clean_glew
    508         $(RM) -r $(glew)
    509 endef
    510 define fetch_glew
    511         sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(glew)
    512 endef
    513 define configure_glew
    514         $(MKDIR_P) $(glew)
    515         cd $(glew); $(runtime)/$(glew)/configure $(glew_flags)
    516 endef
    517 define build_glew
    518         $(MAKE)  -C $(glew) all
    519 endef
    520 define install_glew
    521         $(MAKE) -C $(glew) install
    522 endef
    523 define touch_glew
    524         touch $(glew)/timestamp
    525 endef
    526 
    527 $(glew)/timestamp:
    528         + $(clean_glew)
    529         + $(fetch_glew)
    530         + $(configure_glew)
    531         + $(build_glew)
    532         + $(install_glew)
    533         + $(touch_glew)
    534467
    535468# -------------------------------------------------------------------------
    … …  
    695628endef
    696629define fetch_itcl
    697         sh $(srcdir)/fetch.sh $(TAG) $(srcdir) $(itcl)
     630        sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(itcl)
    698631endef
    699632define configure_itcl
    … …  
    893826
    894827# -------------------------------------------------------------------------
    895 #  NANOSCALE
    896 # -------------------------------------------------------------------------
    897 
    898 nanoscale_flags =       \
    899         --with-statsdir=$(statsdir) \
    900         $(common_flags)
    901 
    902 nanoscale: $(nanoscale)/timestamp
    903 
    904 clean-nanoscale:
    905         $(clean_nanoscale)
    906 fetch-nanoscale:
    907         $(fetch_nanoscale)
    908 configure-nanoscale:
    909         $(configure_nanoscale)
    910 build-nanoscale:
    911         $(build_nanoscale)
    912 install-nanoscale:
    913         $(install_nanoscale)
    914 touch-nanoscale:
    915         $(touch_nanoscale)
    916 force-nanoscale: $(pymol)/timestamp
    917         + $(clean_nanoscale)
    918         + $(fetch_nanoscale)
    919         + $(configure_nanoscale)
    920         + $(build_nanoscale)
    921         + $(install_nanoscale)
    922         + $(touch_nanoscale)
    923 
    924 define clean_nanoscale
    925         $(RM) -r $(nanoscale)
    926 endef
    927 define fetch_nanoscale
    928 endef
    929 define configure_nanoscale
    930         $(MKDIR_P) $(nanoscale)
    931         cd $(nanoscale); $(srcdir)/packages/vizservers/$(nanoscale)/configure $(nanoscale_flags)
    932 endef
    933 define build_nanoscale
    934         $(MAKE) -C $(nanoscale) all
    935 endef
    936 define install_nanoscale
    937         $(MAKE) -C $(nanoscale) install
    938 endef
    939 define touch_nanoscale
    940         touch $(nanoscale)/timestamp
    941 endef
    942 
    943 $(nanoscale)/timestamp: $(pymol)/timestamp
    944         + $(clean_nanoscale)
    945         + $(fetch_nanoscale)
    946         + $(configure_nanoscale)
    947         + $(build_nanoscale)
    948         + $(install_nanoscale)
    949         + $(touch_nanoscale)
    950 
    951 
    952 # -------------------------------------------------------------------------
    953 #  NANOVIS
    954 # -------------------------------------------------------------------------
    955 
    956 nanovis_flags = \
    957         --with-tcllib=$(libdir) \
    958         --with-rappture=$(exec_prefix) \
    959         --with-vtk="6.0" \
    960         --with-vtk-includes=$(incdir) \
    961         --with-vtk-libs=$(libdir) \
    962         --with-statsdir=$(statsdir) \
    963         $(common_flags)
    964 
    965 nanovis: $(nanovis)/timestamp
    966 
    967 clean-nanovis:
    968         $(clean_nanovis)
    969 fetch-nanovis:
    970         $(fetch_nanoscale)
    971 configure-nanovis:
    972         $(configure_nanovis)
    973 build-nanovis:
    974         $(build_nanovis)
    975 install-nanovis:
    976         $(install_nanovis)
    977 touch-nanovis:
    978         $(touch_nanovis)
    979 force-nanovis: $(librappture)/timestamp $(vtk)/timestamp
    980         + $(clean_nanovis)
    981         + $(fetch_nanovis)
    982         + $(configure_nanovis)
    983         + $(build_nanovis)
    984         + $(install_nanovis)
    985         + $(touch_nanovis)
    986 
    987 define clean_nanovis
    988         $(RM) -r $(nanovis)
    989 endef
    990 define fetch_nanovis
    991 endef
    992 define configure_nanovis
    993         $(MKDIR_P) $(nanovis)
    994         cd $(nanovis); $(srcdir)/packages/vizservers/$(nanovis)/configure $(nanovis_flags)
    995 endef
    996 define build_nanovis
    997         $(MAKE) -C $(nanovis) all
    998 endef
    999 define install_nanovis
    1000         $(MAKE) -C $(nanovis) install
    1001 endef
    1002 define touch_nanovis
    1003         touch $(nanovis)/timestamp
    1004 endef
    1005 
    1006 $(nanovis)/timestamp: $(librappture)/timestamp $(vtk)/timestamp
    1007         + $(clean_nanovis)
    1008         + $(fetch_nanovis)
    1009         + $(configure_nanovis)
    1010         + $(build_nanovis)
    1011         + $(install_nanovis)
    1012         + $(touch_nanovis)
    1013 
    1014 # -------------------------------------------------------------------------
    1015828#  OPTIMIZER
    1016829# -------------------------------------------------------------------------
    … …  
    1071884
    1072885# -------------------------------------------------------------------------
    1073 #  OSG
    1074 # -------------------------------------------------------------------------
    1075 
    1076 osg_flags =     \
    1077         --with-tclsh="$(bindir)/tclsh8.4" \
    1078         --enable-shared \
    1079         $(common_flags)
    1080 
    1081 osg: $(osg)/timestamp
    1082 
    1083 clean-osg:
    1084         $(clean_osg)
    1085 fetch-osg:
    1086         $(fetch_osg)
    1087 configure-osg:
    1088         $(configure_osg)
    1089 build-osg:
    1090         $(build_osg)
    1091 install-osg:
    1092         $(install_osg)
    1093 touch-osg:
    1094         $(touch_osg)
    1095 force-osg: $(gui)/timestamp
    1096         + $(clean_osg)
    1097         + $(fetch_osg)
    1098         + $(configure_osg)
    1099         + $(build_osg)
    1100         + $(install_osg)
    1101         + $(touch_osg)
    1102 
    1103 define clean_osg
    1104         $(RM) -r $(osg)
    1105 endef
    1106 define fetch_osg
    1107         sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(osg)
    1108 endef
    1109 define configure_osg
    1110         $(MKDIR_P) $(osg)
    1111         cd $(osg); $(runtime)/$(osg)/configure $(osg_flags)
    1112 endef
    1113 define build_osg
    1114         $(MAKE) -C $(osg) all
    1115 endef
    1116 define install_osg
    1117         $(MAKE) -C $(osg) install
    1118 endef
    1119 define touch_osg
    1120         touch $(osg)/timestamp
    1121 endef
    1122 
    1123 $(osg)/timestamp:
    1124         + $(clean_osg)
    1125         + $(fetch_osg)
    1126         + $(configure_osg)
    1127         + $(build_osg)
    1128         + $(install_osg)
    1129         + $(touch_osg)
    1130 
    1131 # -------------------------------------------------------------------------
    1132 #  OSGEARTH
    1133 # -------------------------------------------------------------------------
    1134 
    1135 osgearth_flags =        \
    1136         --with-tclsh="$(bindir)/tclsh8.4" \
    1137         --enable-shared \
    1138         $(common_flags)
    1139 
    1140 osgearth: $(osgearth)/timestamp
    1141 
    1142 clean-osgearth:
    1143         $(clean_osgearth)
    1144 fetch-osgearth:
    1145         $(fetch_osgearth)
    1146 configure-osgearth:
    1147         $(configure_osgearth)
    1148 build-osgearth:
    1149         $(build_osgearth)
    1150 install-osgearth:
    1151         $(install_osgearth)
    1152 touch-osgearth:
    1153         $(touch_osgearth)
    1154 force-osgearth: $(gui)/timestamp
    1155         + $(clean_osgearth)
    1156         + $(fetch_osgearth)
    1157         + $(configure_osgearth)
    1158         + $(build_osgearth)
    1159         + $(install_osgearth)
    1160         + $(touch_osgearth)
    1161 
    1162 define clean_osgearth
    1163         $(RM) -r $(osgearth)
    1164 endef
    1165 define fetch_osgearth
    1166         sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(osgearth)
    1167 endef
    1168 define configure_osgearth
    1169         $(MKDIR_P) $(osgearth)
    1170         cd $(osgearth); $(runtime)/$(osgearth)/configure $(osgearth_flags)
    1171 endef
    1172 define build_osgearth
    1173         $(MAKE) -C $(osgearth) all
    1174 endef
    1175 define install_osgearth
    1176         $(MAKE) -C $(osgearth) install
    1177 endef
    1178 define touch_osgearth
    1179         touch $(osgearth)/timestamp
    1180 endef
    1181 
    1182 $(osgearth)/timestamp: $(osg)/timestamp
    1183         + $(clean_osgearth)
    1184         + $(fetch_osgearth)
    1185         + $(configure_osgearth)
    1186         + $(build_osgearth)
    1187         + $(install_osgearth)
    1188         + $(touch_osgearth)
    1189 
    1190 # -------------------------------------------------------------------------
    1191 #  PYMOL
    1192 # -------------------------------------------------------------------------
    1193 
    1194 pymol_flags =   \
    1195         $(common_flags)
    1196 
    1197 pymol: $(pymol)/timestamp
    1198 
    1199 clean-pymol:
    1200         $(clean_pymol)
    1201 fetch-pymol:
    1202         $(fetch_pymol)
    1203 configure-pymol:
    1204         $(configure_pymol)
    1205 build-pymol:
    1206         $(build_pymol)
    1207 install-pymol:
    1208         $(install_pymol)
    1209 touch-pymol:
    1210         $(touch_pymol)
    1211 force-pymol: $(glew)/timestamp
    1212         + $(clean_pymol)
    1213         + $(fetch_pymol)
    1214         + $(configure_pymol)
    1215         + $(build_pymol)
    1216         + $(install_pymol)
    1217         + $(touch_pymol)
    1218 
    1219 define clean_pymol
    1220         $(RM) -r $(pymol)
    1221 endef
    1222 define fetch_pymol
    1223         sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(pymol)
    1224 endef
    1225 define configure_pymol
    1226         $(MKDIR_P) $(pymol)
    1227         cd $(pymol); $(runtime)/$(pymol)/configure $(pymol_flags)
    1228 endef
    1229 define build_pymol
    1230         $(MAKE) -C $(pymol) all
    1231 endef
    1232 define install_pymol
    1233         $(MAKE) -C $(pymol) install
    1234 endef
    1235 define touch_pymol
    1236         touch $(pymol)/timestamp
    1237 endef
    1238 
    1239 $(pymol)/timestamp: $(glew)/timestamp
    1240         + $(clean_pymol)
    1241         + $(fetch_pymol)
    1242         + $(configure_pymol)
    1243         + $(build_pymol)
    1244         + $(install_pymol)
    1245         + $(touch_pymol)
    1246 
    1247 
    1248 # -------------------------------------------------------------------------
    1249 #  PYMOLPROXY
    1250 # -------------------------------------------------------------------------
    1251 
    1252 pymolproxy_flags =      \
    1253         --with-tcllib=$(libdir) \
    1254         --with-statsdir=$(statsdir) \
    1255         $(common_flags)
    1256 
    1257 pymolproxy: $(pymolproxy)/timestamp
    1258 
    1259 clean-pymolproxy:
    1260         $(clean_pymolproxy)
    1261 fetch-pymolproxy:
    1262         $(fetch_pymolproxy)
    1263 configure-pymolproxy:
    1264         $(configure_pymolproxy)
    1265 build-pymolproxy:
    1266         $(build_pymolproxy)
    1267 install-pymolproxy:
    1268         $(install_pymolproxy)
    1269 touch-pymolproxy:
    1270         $(touch_pymolproxy)
    1271 force-pymolproxy: $(pymol)/timestamp
    1272         + $(clean_pymolproxy)
    1273         + $(fetch_pymolproxy)
    1274         + $(configure_pymolproxy)
    1275         + $(build_pymolproxy)
    1276         + $(install_pymolproxy)
    1277         + $(touch_pymolproxy)
    1278 
    1279 define clean_pymolproxy
    1280         $(RM) -r $(pymolproxy)
    1281 endef
    1282 define fetch_pymolproxy
    1283 endef
    1284 define configure_pymolproxy
    1285         $(MKDIR_P) $(pymolproxy)
    1286         cd $(pymolproxy); $(srcdir)/packages/vizservers/$(pymolproxy)/configure $(pymolproxy_flags)
    1287 endef
    1288 define build_pymolproxy
    1289         $(MAKE) -C $(pymolproxy) all
    1290 endef
    1291 define install_pymolproxy
    1292         $(MAKE) -C $(pymolproxy) install
    1293 endef
    1294 define touch_pymolproxy
    1295         touch $(pymolproxy)/timestamp
    1296 endef
    1297 
    1298 $(pymolproxy)/timestamp: $(pymol)/timestamp
    1299         + $(clean_pymolproxy)
    1300         + $(fetch_pymolproxy)
    1301         + $(configure_pymolproxy)
    1302         + $(build_pymolproxy)
    1303         + $(install_pymolproxy)
    1304         + $(touch_pymolproxy)
    1305 
    1306 # -------------------------------------------------------------------------
    1307886#  SHAPE
    1308887# -------------------------------------------------------------------------
    … …  
    1398977endef
    1399978define fetch_sqlitetcl
    1400         sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(sqllitetcl)
     979        sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(sqlitetcl)
    1401980endef
    1402981define configure_sqlitetcl
    1403982        $(MKDIR_P) $(sqlitetcl)
    1404         cd $(sqlitetcl); $(runtime)/$(sqlitetcl)/configure $(sqlitetcl_flags)
     983        cd $(sqlitetcl); $(runtime)/$(sqlitetcl)/autoconf/tea/configure $(sqlitetcl_flags)
    1405984endef
    1406985define build_sqlitetcl
    … …  
    14541033
    14551034define fetch_tcl
    1456         sh $(srcdir)/fetch.sh trunk $(srcdir) $(tcl)
     1035        sh $(srcdir)/fetch.sh $(TAG) $(srcdir) $(tcl)
    14571036endef
    14581037define clean_tcl
    … …  
    16371216endef
    16381217define configure_tester
    1639         $(MKDIR_P) $(tester)
    16401218endef
    16411219define build_tester
    … …  
    18331411
    18341412# -------------------------------------------------------------------------
    1835 #  VIDEO
    1836 # -------------------------------------------------------------------------
    1837 
    1838 video_flags =   \
    1839         --with-tclsh="$(bindir)/tclsh8.4" \
    1840         --enable-shared \
    1841         $(common_flags)
    1842 
    1843 video: $(video)/timestamp
    1844 
    1845 clean-video:
    1846         $(clean_video)
    1847 fetch-video:
    1848         $(fetch_video)
    1849 configure-video:
    1850         $(configure_video)
    1851 build-video:
    1852         $(build_video)
    1853 install-video:
    1854         $(install_video)
    1855 touch-video:
    1856         $(touch_video)
    1857 force-video: $(gui)/timestamp
    1858         + $(clean_video)
    1859         + $(fetch_video)
    1860         + $(configure_video)
    1861         + $(build_video)
    1862         + $(install_video)
    1863         + $(touch_video)
    1864 
    1865 define clean_video
    1866         $(RM) -r $(video)
    1867 endef
    1868 define fetch_video
    1869 endef
    1870 define configure_video
    1871         $(MKDIR_P) $(video)
    1872         cd $(video); $(srcdir)/$(video)/configure $(video_flags)
    1873 endef
    1874 define build_video
    1875         $(MAKE) -C $(video) all
    1876 endef
    1877 define install_video
    1878         $(MAKE) -C $(video) install
    1879 endef
    1880 define touch_video
    1881         touch $(video)/timestamp
    1882 endef
    1883 
    1884 $(video)/timestamp: $(gui)/timestamp
    1885         + $(clean_video)
    1886         + $(fetch_video)
    1887         + $(configure_video)
    1888         + $(build_video)
    1889         + $(install_video)
    1890         + $(touch_video)
    1891 
    1892 
    1893 # -------------------------------------------------------------------------
    1894 #  VORONOI
    1895 # -------------------------------------------------------------------------
    1896 
    1897 voronoi_flags = \
    1898         --enable-shared \
    1899         $(common_flags)
    1900 
    1901 voronoi: $(voronoi)/timestamp
    1902 
    1903 clean-voronoi:
    1904         $(clean_voronoi)
    1905 fetch-voronoi:
    1906         $(fetch_voronoi)
    1907 configure-voronoi:
    1908         $(configure_voronoi)
    1909 build-voronoi:
    1910         $(build_voronoi)
    1911 install-voronoi:
    1912         $(install_voronoi)
    1913 touch-voronoi:
    1914         $(touch_voronoi)
    1915 force-voronoi:
    1916         + $(clean_voronoi)
    1917         + $(fetch_voronoi)
    1918         + $(configure_voronoi)
    1919         + $(build_voronoi)
    1920         + $(install_voronoi)
    1921         + $(touch_voronoi)
    1922 
    1923 define clean_voronoi
    1924         $(RM) -r $(voronoi)
    1925 endef
    1926 define fetch_voronoi
    1927         sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(voronoi)
    1928 endef
    1929 define configure_voronoi
    1930         $(MKDIR_P) $(voronoi)
    1931         cd $(voronoi); $(runtime)/$(voronoi)/configure $(voronoi_flags)
    1932 endef
    1933 define build_voronoi
    1934         $(MAKE)  -C $(voronoi) all
    1935 endef
    1936 define install_voronoi
    1937         $(MAKE) -C $(voronoi) install
    1938 endef
    1939 define touch_voronoi
    1940         touch $(voronoi)/timestamp
    1941 endef
    1942 
    1943 $(voronoi)/timestamp:
    1944         + $(clean_voronoi)
    1945         + $(fetch_voronoi)
    1946         + $(configure_voronoi)
    1947         + $(build_voronoi)
    1948         + $(install_voronoi)
    1949         + $(touch_voronoi)
    1950 
    1951 # -------------------------------------------------------------------------
    19521413#  VTK
    19531414# -------------------------------------------------------------------------
    … …  
    19701431touch-vtk:
    19711432        $(touch_vtk)
    1972 force-vtk: $(cmake)/timestamp $(glew)/timestamp $(tk)/timestamp
     1433force-vtk: $(cmake)/timestamp $(tcl)/timestamp $(tk)/timestamp
    19731434        + $(clean_vtk)
    19741435        + $(fetch_vtk)
    … …  
    19821443endef
    19831444define fetch_vtk
    1984         sh $(srcdir)/fetch.sh $(TAG) $(srcdir) $(vtk)
     1445        sh $(srcdir)/fetch.sh $(TAG) $(runtime) $(vtk)
    19851446endef
    19861447define configure_vtk
    … …  
    19981459endef
    19991460
    2000 $(vtk)/timestamp: $(cmake)/timestamp $(glew)/timestamp $(tk)/timestamp
     1461$(vtk)/timestamp: $(cmake)/timestamp $(tcl)/timestamp $(tk)/timestamp
    20011462        + $(clean_vtk)
    20021463        + $(fetch_vtk)
    … …  
    20051466        + $(install_vtk)
    20061467        + $(touch_vtk)
    2007 
    2008 # -------------------------------------------------------------------------
    2009 #  VTKVIS
    2010 # -------------------------------------------------------------------------
    2011 
    2012 vtkvis_flags =  \
    2013         --with-tcllib=$(libdir) \
    2014         --with-rappture=$(libdir) \
    2015         --with-vtk="6.0" \
    2016         --with-vtk-includes=$(incdir) \
    2017         --with-vtk-libs=$(libdir) \
    2018         --with-statsdir=$(statsdir) \
    2019         $(common_flags)
    2020 
    2021 vtkvis: $(vtkvis)/timestamp
    2022 
    2023 clean-vtkvis:
    2024         $(clean_vtkvis)
    2025 fetch-vtkvis:
    2026         $(fetch_vtkvis)
    2027 configure-vtkvis:
    2028         $(configure_vtkvis)
    2029 build-vtkvis:
    2030         $(build_vtkvis)
    2031 install-vtkvis:
    2032         $(install_vtkvis)
    2033 touch-vtkvis:
    2034         $(touch_vtkvis)
    2035 force-vtkvis: $(vtk)/timestamp
    2036         + $(clean_vtkvis)
    2037         + $(fetch_vtkvis)
    2038         + $(configure_vtkvis)
    2039         + $(build_vtkvis)
    2040         + $(install_vtkvis)
    2041         + $(touch_vtkvis)
    2042 
    2043 define clean_vtkvis
    2044         $(RM) -r $(vtkvis)
    2045 endef
    2046 define fetch_vtkvis
    2047 endef
    2048 define configure_vtkvis
    2049         $(MKDIR_P) $(vtkvis)
    2050         cd $(vtkvis); $(srcdir)/packages/vizservers/$(vtkvis)/configure $(vtkvis_flags)
    2051 endef
    2052 define build_vtkvis
    2053         $(MAKE) -C $(vtkvis) all
    2054 endef
    2055 define install_vtkvis
    2056         $(MAKE) -C $(vtkvis) install
    2057 endef
    2058 define touch_vtkvis
    2059         touch $(vtkvis)/timestamp
    2060 endef
    2061 
    2062 $(vtkvis)/timestamp: $(vtk)/timestamp
    2063         + $(clean_vtkvis)
    2064         + $(fetch_vtkvis)
    2065         + $(configure_vtkvis)
    2066         + $(build_vtkvis)
    2067         + $(install_vtkvis)
    2068         + $(touch_vtkvis)
    2069 
    2070 # -------------------------------------------------------------------------
    2071 #  GEOVIS
    2072 # -------------------------------------------------------------------------
    2073 
    2074 geovis_flags =  \
    2075         --with-tcllib=$(libdir) \
    2076         --with-rappture=$(libdir) \
    2077         --with-vtk="6.0" \
    2078         --with-vtk-includes=$(incdir) \
    2079         --with-vtk-libs=$(libdir) \
    2080         --with-statsdir=$(statsdir) \
    2081         $(common_flags)
    2082 
    2083 geovis: $(geovis)/timestamp
    2084 
    2085 clean-geovis:
    2086         $(clean_geovis)
    2087 fetch-geovis:
    2088         $(fetch_geovis)
    2089 configure-geovis:
    2090         $(configure_geovis)
    2091 build-geovis:
    2092         $(build_geovis)
    2093 install-geovis:
    2094         $(install_geovis)
    2095 touch-geovis:
    2096         $(touch_geovis)
    2097 force-geovis: $(vtk)/timestamp
    2098         + $(clean_geovis)
    2099         + $(fetch_geovis)
    2100         + $(configure_geovis)
    2101         + $(build_geovis)
    2102         + $(install_geovis)
    2103         + $(touch_geovis)
    2104 
    2105 define clean_geovis
    2106         $(RM) -r $(geovis)
    2107 endef
    2108 define fetch_geovis
    2109 endef
    2110 define configure_geovis
    2111         $(MKDIR_P) $(geovis)
    2112         cd $(geovis); $(srcdir)/packages/vizservers/$(geovis)/configure $(geovis_flags)
    2113 endef
    2114 define build_geovis
    2115         $(MAKE) -C $(geovis) all
    2116 endef
    2117 define install_geovis
    2118         $(MAKE) -C $(geovis) install
    2119 endef
    2120 define touch_geovis
    2121         touch $(geovis)/timestamp
    2122 endef
    2123 
    2124 $(geovis)/timestamp: $(osgearth)/timestamp
    2125         + $(clean_geovis)
    2126         + $(fetch_geovis)
    2127         + $(configure_geovis)
    2128         + $(build_geovis)
    2129         + $(install_geovis)
    2130         + $(touch_geovis)
    21311468
    21321469# -------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.