Ignore:
Timestamp:
Dec 13, 2014 1:10:09 PM (9 years ago)
Author:
gah
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/r9/Makefile.in

    r4866 r4867  
    6666targets = \
    6767        blt builder cmake examples expat expect gui htmlwidget itcl \
    68         itk lang librappture optimizer shape sqlitetcl tcl tcllib \
     68        itk lang lib optimizer shape sqlitetcl tcl tcllib \
    6969        tdom tester tk tkimg tls video vtk zlib  packages
    7070
     
    7373.NOTPARALLEL:
    7474
    75 all: gui packages lang
    76 
    77 fullpkg: tester builder packages
     75all: gui lang all_packages
     76
     77all_packages: runner tester builder packages video optimizer
    7878
    7979# Aliases for package directory names.
     
    9191jpeg = jpeg-8d
    9292libpng = libpng-1.6.15
    93 librappture = librappture
     93lib = lib
    9494openssl = openssl-1.0.1j
    9595optimizer = optimizer
     
    109109builder = builder
    110110lang = lang
     111video = video
     112runner = runner
    111113
    112114subdirs = \
    113115        $(blt) $(builder) $(cmake) $(examples) $(expat) $(expect) \
    114         $(gui) $(htmlwidget) $(itcl) $(itk) $(lang) $(librappture)  \
     116        $(gui) $(htmlwidget) $(itcl) $(itk) $(lang) $(lib)  \
    115117        $(optimizer) $(shape) \
    116118        $(sqlitetcl) $(tcl) $(tcllib) $(tdom) $(tester) $(tk) $(tkimg) \
    117119        $(tls) $(vtk) $(zlib)
    118120
    119 ifneq ("$(HAVE_VTK)", )
     121ifeq ("$(HAVE_VTK)", 1)
    120122  vtk_timestamp   = $(vtk)/timestamp
    121123  cmake_timestamp = $(cmake)/timestamp
     
    474476
    475477gui_flags =     \
    476         --with-tclsh="$(bindir)/tclsh8.4" \
    477         --enable-shared \
    478478        $(common_flags)
    479479
     
    492492touch-gui:
    493493        $(touch_gui)
    494 force-gui: $(librappture)/timestamp \
     494force-gui: $(lib)/timestamp \
    495495                  $(blt)/timestamp \
    496496                  $(itk)/timestamp \
     
    525525endef
    526526
    527 $(gui)/timestamp: $(librappture)/timestamp \
     527$(gui)/timestamp: $(lib)/timestamp \
    528528                  $(blt)/timestamp \
    529529                  $(itk)/timestamp \
     
    766766endef
    767767
    768 $(lang)/timestamp: $(librappture)/timestamp  $(tcl)/timestamp $(itcl)/timestamp
     768$(lang)/timestamp: $(lib)/timestamp  $(tcl)/timestamp $(itcl)/timestamp
    769769        + $(clean_lang)
    770770        + $(fetch_lang)
     
    776776
    777777# -------------------------------------------------------------------------
    778 #  LIBRAPPTURE
    779 # -------------------------------------------------------------------------
    780 
    781 librappture_flags =     \
    782         --enable-shared \
    783         $(common_flags)
    784 
    785 librappture: $(librappture)/timestamp
    786 
    787 clean-librappture:
    788         $(clean_librappture)
    789 fetch-librappture:
    790         $(fetch_librappture)
    791 configure-librappture:
    792         $(configure_librappture)
    793 build-librappture:
    794         $(build_librappture)
    795 install-librappture:
    796         $(install_librappture)
    797 touch-librappture:
    798         $(touch_librappture)
    799 force-librappture:
    800         + $(clean_librappture)
    801         + $(fetch_librappture)
    802         + $(configure_librappture)
    803         + $(build_librappture)
    804         + $(install_librappture)
    805         + $(touch_librappture)
    806 
    807 define clean_librappture
    808         $(RM) -r $(librappture)
    809 endef
    810 define fetch_librappture
    811 endef
    812 define configure_librappture
    813         $(MKDIR_P) $(librappture)
    814         cd $(librappture); $(srcdir)/lib/configure $(librappture_flags)
    815 endef
    816 define build_librappture
    817         $(MAKE)  -C $(librappture) all
    818 endef
    819 define install_librappture
    820         $(MAKE) -C $(librappture) install
    821 endef
    822 define touch_librappture
    823         touch $(librappture)/timestamp
    824 endef
    825 
    826 $(librappture)/timestamp:
    827         + $(clean_librappture)
    828         + $(fetch_librappture)
    829         + $(configure_librappture)
    830         + $(build_librappture)
    831         + $(install_librappture)
    832         + $(touch_librappture)
     778#  LIB
     779# -------------------------------------------------------------------------
     780
     781lib_flags =     \
     782        --enable-shared \
     783        $(common_flags)
     784
     785lib: $(lib)/timestamp
     786
     787clean-lib:
     788        $(clean_lib)
     789fetch-lib:
     790        $(fetch_lib)
     791configure-lib:
     792        $(configure_lib)
     793build-lib:
     794        $(build_lib)
     795install-lib:
     796        $(install_lib)
     797touch-lib:
     798        $(touch_lib)
     799force-lib:
     800        + $(clean_lib)
     801        + $(fetch_lib)
     802        + $(configure_lib)
     803        + $(build_lib)
     804        + $(install_lib)
     805        + $(touch_lib)
     806
     807define clean_lib
     808        $(RM) -r $(lib)
     809endef
     810define fetch_lib
     811endef
     812define configure_lib
     813        $(MKDIR_P) $(lib)
     814        cd $(lib); $(srcdir)/lib/configure $(lib_flags)
     815endef
     816define build_lib
     817        $(MAKE)  -C $(lib) all
     818endef
     819define install_lib
     820        $(MAKE) -C $(lib) install
     821endef
     822define touch_lib
     823        touch $(lib)/timestamp
     824endef
     825
     826$(lib)/timestamp:
     827        + $(clean_lib)
     828        + $(fetch_lib)
     829        + $(configure_lib)
     830        + $(build_lib)
     831        + $(install_lib)
     832        + $(touch_lib)
    833833
    834834# -------------------------------------------------------------------------
     
    871871define configure_optimizer
    872872        $(MKDIR_P) $(optimizer)
    873         cd $(optimizer); $(srcdir)/packages/$(optimizer)/src/configure $(optimizer_flags)
     873        cd $(optimizer); $(srcdir)/packages/$(optimizer)/configure $(optimizer_flags)
    874874endef
    875875define build_optimizer
     
    10581058define install_tcl
    10591059        $(MAKE) -C $(tcl) install
     1060        $(RM) $(bindir)/tclsh
     1061        (cd $(bindir); $(LN_S) tclsh$(TCL_VERSION) tclsh)
    10601062endef
    10611063define touch_tcl
     
    12891291define install_tk
    12901292        $(MAKE) -C $(tk) install
     1293        $(RM) $(bindir)/wish
     1294        (cd $(bindir); $(LN_S) wish$(TK_VERSION) wish)
    12911295endef
    12921296define touch_tk
     
    14411445touch-video:
    14421446        $(touch_video)
    1443 force-video: $(gui)/timestamp
     1447force-video: #$(gui)/timestamp
    14441448        + $(clean_video)
    14451449        + $(fetch_video)
     
    14681472endef
    14691473
    1470 $(video)/timestamp: $(gui)/timestamp
     1474$(video)/timestamp: #$(gui)/timestamp
    14711475        + $(clean_video)
    14721476        + $(fetch_video)
Note: See TracChangeset for help on using the changeset viewer.