Changeset 5899 for branches


Ignore:
Timestamp:
Oct 7, 2015 11:54:16 AM (9 years ago)
Author:
gah
Message:

rename lib directory

Location:
branches/r9
Files:
4 edited
1 moved

Legend:

Unmodified
Added
Removed

  • branches/r9/Makefile.in

    r4916 r5899  
    7878targets = \
    7979        apps blt cmake examples expat expect gui htmlwidget itcl \
    80         itk lang lib optimizer shape sqlitetcl tcl tcllib \
     80        itk lang libs optimizer shape sqlitetcl tcl tcllib \
    8181        tdom tk tkimg tls video vtk zlib  packages \
    8282
    … …  
    108108jpeg = jpeg-8d
    109109libpng = libpng-1.6.15
    110 lib = lib
     110libs = libs
    111111openssl = openssl-1.0.1j
    112112optimizer = optimizer
    … …  
    130130subdirs = \
    131131        $(blt) $(cmake) $(expat) $(expect) \
    132         $(gui) $(htmlwidget) $(itcl) $(itk) $(lang) $(lib)  \
     132        $(gui) $(htmlwidget) $(itcl) $(itk) $(lang) $(libs)  \
    133133        $(optimizer) $(shape) \
    134134        $(sqlitetcl) $(tcl) $(tcllib) $(tdom) $(tk) $(tkimg) \
    … …  
    150150        $(clean_itk)
    151151        $(clean_lang)
    152         $(clean_lib)
     152        $(clean_libs)
    153153        $(clean_optimizer)
    154154        $(clean_shape)
    … …  
    531531touch-gui:
    532532        $(touch_gui)
    533 force-gui: $(lib)/timestamp \
     533force-gui: $(libs)/timestamp \
    534534                  $(blt)/timestamp \
    535535                  $(itk)/timestamp \
    … …  
    564564endef
    565565
    566 $(gui)/timestamp: $(lib)/timestamp \
     566$(gui)/timestamp: $(libs)/timestamp \
    567567                  $(blt)/timestamp \
    568568                  $(itk)/timestamp \
    … …  
    815815endef
    816816
    817 $(lang)/timestamp: $(lib)/timestamp  $(tcl)/timestamp $(itcl)/timestamp
     817$(lang)/timestamp: $(libs)/timestamp  $(tcl)/timestamp $(itcl)/timestamp
    818818        + $(clean_lang)
    819819        + $(fetch_lang)
    … …  
    828828# -------------------------------------------------------------------------
    829829
    830 lib_flags =     \
    831         --enable-shared \
    832         $(common_flags)
    833 
    834 lib: $(lib)/timestamp
    835 
    836 clean-lib:
    837         $(clean_lib)
    838 fetch-lib:
    839         $(fetch_lib)
    840 configure-lib:
    841         $(configure_lib)
    842 build-lib:
    843         $(build_lib)
    844 install-lib:
    845         $(install_lib)
    846 touch-lib:
    847         $(touch_lib)
    848 force-lib:
    849         + $(clean_lib)
    850         + $(fetch_lib)
    851         + $(configure_lib)
    852         + $(build_lib)
    853         + $(install_lib)
    854         + $(touch_lib)
    855 
    856 define clean_lib
    857         $(MAKE) -C $(lib) clean
    858         $(RM) $(lib)/timestamp
    859 endef
    860 define fetch_lib
    861 endef
    862 define configure_lib
    863 endef
    864 define build_lib
    865         $(MAKE) -C $(lib) all
    866 endef
    867 define install_lib
    868         $(MAKE) -C $(lib) install
     830libs_flags =    \
     831        --enable-shared \
     832        $(common_flags)
     833
     834libs: $(libs)/timestamp
     835
     836clean-libs:
     837        $(clean_libs)
     838fetch-libs:
     839        $(fetch_libs)
     840configure-libs:
     841        $(configure_libs)
     842build-libs:
     843        $(build_libs)
     844install-libs:
     845        $(install_libs)
     846touch-libs:
     847        $(touch_libs)
     848force-libs:
     849        + $(clean_libs)
     850        + $(fetch_libs)
     851        + $(configure_libs)
     852        + $(build_libs)
     853        + $(install_libs)
     854        + $(touch_libs)
     855
     856define clean_libs
     857        $(MAKE) -C $(libs) clean
     858        $(RM) $(libs)/timestamp
     859endef
     860define fetch_libs
     861endef
     862define configure_libs
     863endef
     864define build_libs
     865        $(MAKE) -C $(libs) all
     866endef
     867define install_libs
     868        $(MAKE) -C $(libs) install
    869869        $(MKDIR_P) $(libdir)
    870870        $(INSTALL) -m 0444 rapptureConfig.sh $(libdir)
    871871endef
    872 define touch_lib
    873         touch $(lib)/timestamp
    874 endef
    875 
    876 $(lib)/timestamp:
    877         + $(clean_lib)
    878         + $(fetch_lib)
    879         + $(configure_lib)
    880         + $(build_lib)
    881         + $(install_lib)
    882         + $(touch_lib)
     872define touch_libs
     873        touch $(libs)/timestamp
     874endef
     875
     876$(libs)/timestamp:
     877        + $(clean_libs)
     878        + $(fetch_libs)
     879        + $(configure_libs)
     880        + $(build_libs)
     881        + $(install_libs)
     882        + $(touch_libs)
    883883
    884884# -------------------------------------------------------------------------

  • branches/r9/configure

    r4917 r5899  
    27102710
    27112711
    2712 ac_config_headers="$ac_config_headers lib/rappture/config.h"
     2712ac_config_headers="$ac_config_headers libs/rappture/config.h"
    27132713
    27142714
    … …  
    80408040
    80418041
    8042 ac_config_files="$ac_config_files Makefile fixrunpaths.tcl 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 lib/Makefile lib/objects/Makefile lib/objects/RpHash.h lib/rappture/Makefile lib/rappture2/Makefile rapptureConfig.sh"
     8042ac_config_files="$ac_config_files Makefile fixrunpaths.tcl 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 libs/Makefile libs/objects/Makefile libs/objects/RpHash.h libs/rappture/Makefile libs/rappture2/Makefile rapptureConfig.sh"
    80438043
    80448044cat >confcache <<\_ACEOF
    … …  
    87348734do
    87358735  case $ac_config_target in
    8736     "lib/rappture/config.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/rappture/config.h" ;;
     8736    "libs/rappture/config.h") CONFIG_HEADERS="$CONFIG_HEADERS libs/rappture/config.h" ;;
    87378737    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    87388738    "fixrunpaths.tcl") CONFIG_FILES="$CONFIG_FILES fixrunpaths.tcl" ;;
    … …  
    87488748    "apps/simsim") CONFIG_FILES="$CONFIG_FILES apps/simsim" ;;
    87498749    "apps/xmldiff") CONFIG_FILES="$CONFIG_FILES apps/xmldiff" ;;
    8750     "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
    8751     "lib/objects/Makefile") CONFIG_FILES="$CONFIG_FILES lib/objects/Makefile" ;;
    8752     "lib/objects/RpHash.h") CONFIG_FILES="$CONFIG_FILES lib/objects/RpHash.h" ;;
    8753     "lib/rappture/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rappture/Makefile" ;;
    8754     "lib/rappture2/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rappture2/Makefile" ;;
     8750    "libs/Makefile") CONFIG_FILES="$CONFIG_FILES libs/Makefile" ;;
     8751    "libs/objects/Makefile") CONFIG_FILES="$CONFIG_FILES libs/objects/Makefile" ;;
     8752    "libs/objects/RpHash.h") CONFIG_FILES="$CONFIG_FILES libs/objects/RpHash.h" ;;
     8753    "libs/rappture/Makefile") CONFIG_FILES="$CONFIG_FILES libs/rappture/Makefile" ;;
     8754    "libs/rappture2/Makefile") CONFIG_FILES="$CONFIG_FILES libs/rappture2/Makefile" ;;
    87558755    "rapptureConfig.sh") CONFIG_FILES="$CONFIG_FILES rapptureConfig.sh" ;;
    87568756

  • branches/r9/configure.in

    r4917 r5899  
    66AC_INIT([Rappture],[Version],[rappture@nanohub.org])
    77AC_CONFIG_AUX_DIR(cf)
    8 AC_CONFIG_HEADER(lib/rappture/config.h)
     8AC_CONFIG_HEADER(libs/rappture/config.h)
    99
    1010RAPPTURE_MAJOR_VERSION=Major_Version
    … …  
    320320    apps/simsim
    321321    apps/xmldiff
    322     lib/Makefile
    323     lib/objects/Makefile
    324     lib/objects/RpHash.h
    325     lib/rappture/Makefile
    326     lib/rappture2/Makefile
     322    libs/Makefile
     323    libs/objects/Makefile
     324    libs/objects/RpHash.h
     325    libs/rappture/Makefile
     326    libs/rappture2/Makefile
    327327    rapptureConfig.sh
    328328])

  • branches/r9/libs/rappture/config.h.in

    r4909 r5899  
    1 /* lib/rappture/config.h.in.  Generated from configure.in by autoheader.  */
     1/* libs/rappture/config.h.in.  Generated from configure.in by autoheader.  */
    22
    33/* Define if building universal (internal helper macro) */
Note: See TracChangeset for help on using the changeset viewer.