Changeset 5899 for branches/r9/Makefile.in

Timestamp:

Oct 7, 2015, 11:54:16 AM (9 years ago)

Author:

gah

Message:

rename lib directory

File:

• branches/r9/Makefile.in (modified) (8 diffs)

branches/r9/Makefile.in

@@ -78 +78 @@
 targets = \
         apps blt cmake examples expat expect gui htmlwidget itcl \
-        itk lang lib optimizer shape sqlitetcl tcl tcllib \
+        itk lang libs optimizer shape sqlitetcl tcl tcllib \
         tdom tk tkimg tls video vtk zlib  packages \
 
@@ -108 +108 @@
 jpeg = jpeg-8d
 libpng = libpng-1.6.15
-lib = lib
+libs = libs
 openssl = openssl-1.0.1j
 optimizer = optimizer
@@ -130 +130 @@
 subdirs = \
         $(blt) $(cmake) $(expat) $(expect) \
-        $(gui) $(htmlwidget) $(itcl) $(itk) $(lang) $(lib)  \
+        $(gui) $(htmlwidget) $(itcl) $(itk) $(lang) $(libs)  \
         $(optimizer) $(shape) \
         $(sqlitetcl) $(tcl) $(tcllib) $(tdom) $(tk) $(tkimg) \
@@ -150 +150 @@
         $(clean_itk)
         $(clean_lang)
-        $(clean_lib)
+        $(clean_libs)
         $(clean_optimizer)
         $(clean_shape)
@@ -531 +531 @@
 touch-gui: 
         $(touch_gui)
-force-gui: $(lib)/timestamp \
+force-gui: $(libs)/timestamp \
                   $(blt)/timestamp \
                   $(itk)/timestamp \
@@ -564 +564 @@
 endef
 
-$(gui)/timestamp: $(lib)/timestamp \
+$(gui)/timestamp: $(libs)/timestamp \
                   $(blt)/timestamp \
                   $(itk)/timestamp \
@@ -815 +815 @@
 endef
 
-$(lang)/timestamp: $(lib)/timestamp  $(tcl)/timestamp $(itcl)/timestamp
+$(lang)/timestamp: $(libs)/timestamp  $(tcl)/timestamp $(itcl)/timestamp
         + $(clean_lang)
         + $(fetch_lang)
@@ -828 +828 @@
 # -------------------------------------------------------------------------
 
-lib_flags =     \
-        --enable-shared \
-        $(common_flags)
-
-lib: $(lib)/timestamp
-
-clean-lib: 
-        $(clean_lib)
-fetch-lib: 
-        $(fetch_lib)
-configure-lib: 
-        $(configure_lib)
-build-lib: 
-        $(build_lib)
-install-lib: 
-        $(install_lib)
-touch-lib: 
-        $(touch_lib)
-force-lib: 
-        + $(clean_lib)
-        + $(fetch_lib)
-        + $(configure_lib)
-        + $(build_lib)
-        + $(install_lib)
-        + $(touch_lib)
-
-define clean_lib
-        $(MAKE) -C $(lib) clean
-        $(RM) $(lib)/timestamp
-endef
-define fetch_lib
-endef
-define configure_lib
-endef
-define build_lib
-        $(MAKE) -C $(lib) all
-endef
-define install_lib
-        $(MAKE) -C $(lib) install
+libs_flags =    \
+        --enable-shared \
+        $(common_flags)
+
+libs: $(libs)/timestamp
+
+clean-libs: 
+        $(clean_libs)
+fetch-libs: 
+        $(fetch_libs)
+configure-libs: 
+        $(configure_libs)
+build-libs: 
+        $(build_libs)
+install-libs: 
+        $(install_libs)
+touch-libs: 
+        $(touch_libs)
+force-libs: 
+        + $(clean_libs)
+        + $(fetch_libs)
+        + $(configure_libs)
+        + $(build_libs)
+        + $(install_libs)
+        + $(touch_libs)
+
+define clean_libs
+        $(MAKE) -C $(libs) clean
+        $(RM) $(libs)/timestamp
+endef
+define fetch_libs
+endef
+define configure_libs
+endef
+define build_libs
+        $(MAKE) -C $(libs) all
+endef
+define install_libs
+        $(MAKE) -C $(libs) install
         $(MKDIR_P) $(libdir)
         $(INSTALL) -m 0444 rapptureConfig.sh $(libdir)
 endef
-define touch_lib
-        touch $(lib)/timestamp
-endef
-
-$(lib)/timestamp: 
-        + $(clean_lib)
-        + $(fetch_lib)
-        + $(configure_lib)
-        + $(build_lib)
-        + $(install_lib)
-        + $(touch_lib)
+define touch_libs
+        touch $(libs)/timestamp
+endef
+
+$(libs)/timestamp: 
+        + $(clean_libs)
+        + $(fetch_libs)
+        + $(configure_libs)
+        + $(build_libs)
+        + $(install_libs)
+        + $(touch_libs)
 
 # -------------------------------------------------------------------------