[BACK]Return to Makefile CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/Makefile between version 1.96 and 1.97

version 1.96, 1999/04/25 19:13:05 version 1.97, 1999/05/27 21:03:31
Line 27 
Line 27 
 #       libraries installed in DESTDIR.  #       libraries installed in DESTDIR.
 #   EXPORTABLE_SYSTEM, when set, ensures that non-exportable crypto code  #   EXPORTABLE_SYSTEM, when set, ensures that non-exportable crypto code
 #       is not compiled or installed. EXPORTABLE_SYSTEM is ignored if  #       is not compiled or installed. EXPORTABLE_SYSTEM is ignored if
 #       the `domestic' subtree does not exist.  #       the `domestic/crypto-us' subtree does not exist.
 #   FORCE_DOMESTIC, when set, forces a descent into the domestic tree  #   FORCE_DOMESTIC, when set, forces a descent into the domestic/crypto-us tree
 #       when handling the `all', `includes', and `install' targets. This  #       when handling the `all', `includes', and `install' targets. This
 #       flag is incompatible with the `build' target. It's generally a  #       flag is incompatible with the `build' target. It's generally a
 #       bad idea to use FORCE_DOMESTIC unless the ramifications are well  #       bad idea to use FORCE_DOMESTIC unless the ramifications are well
 #       understood, and should never be enabled by default. FORCE_DOMESTIC  #       understood, and should never be enabled by default. FORCE_DOMESTIC
 #       is ignored if the `domestic' subtree does not exist.  #       is ignored if the `domestic/crypto-us' subtree does not exist.
 #  #
 # Targets:  # Targets:
 #   build: builds a full release of netbsd in DESTDIR.  #   build: builds a full release of netbsd in DESTDIR.
Line 63  SUBDIR+= gnu
Line 63  SUBDIR+= gnu
 # This is needed for libstdc++ and gen-params.  # This is needed for libstdc++ and gen-params.
 includes-gnu: includes-include includes-sys  includes-gnu: includes-include includes-sys
   
 # Descend into the domestic tree if it exists AND  # Descend into the domestic/crypto-us tree if it exists AND
 #  1) the target is clean, cleandir, or obj, OR  #  1) the target is clean, cleandir, or obj, OR
 #  2) the the target is install or includes AND  #  2) the the target is install or includes AND
 #     NOT compiling only "exportable" code AND  #     NOT compiling only "exportable" code AND
Line 74  includes-gnu: includes-include includes-
Line 74  includes-gnu: includes-include includes-
 # clean, cleandir, and obj targets on the command line in conjunction  # clean, cleandir, and obj targets on the command line in conjunction
 # with any other target may produce unexpected results.  # with any other target may produce unexpected results.
   
 .if exists(domestic) && \  .if exists(domestic)
   DOMESTIC=domestic
   .elif exists(crypto-us)
   DOMESTIC=crypto-us
   .endif
   
   .if defined(DOMESTIC) && \
     (make(clean) || make(cleandir) || make(obj) || \      (make(clean) || make(cleandir) || make(obj) || \
     ((make(includes) || make(install)) && \      ((make(includes) || make(install)) && \
         !defined(EXPORTABLE_SYSTEM) && defined(_DISTRIB)) || \          !defined(EXPORTABLE_SYSTEM) && defined(_DISTRIB)) || \
     defined(FORCE_DOMESTIC))      defined(FORCE_DOMESTIC))
 SUBDIR+= domestic  SUBDIR+= ${DOMESTIC}
 .endif  .endif
   
 .if exists(regress)  .if exists(regress)
Line 151  build: beforeinstall
Line 157  build: beforeinstall
             ${MAKE} depend && ${MAKE} ${_J} MKMAN=no MKINFO=no && \              ${MAKE} depend && ${MAKE} ${_J} MKMAN=no MKINFO=no && \
             ${MAKE} MKMAN=no MKINFO=no install)              ${MAKE} MKMAN=no MKINFO=no install)
         ${MAKE} depend && ${MAKE} ${_J} && ${MAKE} _BUILD= install          ${MAKE} depend && ${MAKE} ${_J} && ${MAKE} _BUILD= install
 .if exists(domestic) && !defined(EXPORTABLE_SYSTEM)  .if defined(DOMESTIC) && !defined(EXPORTABLE_SYSTEM)
         (cd ${.CURDIR}/domestic && ${MAKE} ${_J} _SLAVE_BUILD= build)          (cd ${.CURDIR}/${DOMESTIC} && ${MAKE} ${_J} _SLAVE_BUILD= build)
 .endif  .endif
         ${MAKE} whatis.db          ${MAKE} whatis.db
         @echo -n "Build finished at: "          @echo -n "Build finished at: "

Legend:
Removed from v.1.96  
changed lines
  Added in v.1.97

CVSweb <webmaster@jp.NetBSD.org>