[BACK]Return to Makefile CVS log [TXT][DIR] Up to [local] / src / include

Diff for /src/include/Makefile between version 1.162 and 1.163

version 1.162, 2012/04/22 23:43:38 version 1.163, 2012/06/19 17:15:02
Line 37 
Line 37 
 LDIRS=  altq crypto ddb dev isofs miscfs msdosfs net netinet netinet6 \  LDIRS=  altq crypto ddb dev isofs miscfs msdosfs net netinet netinet6 \
         netmpls netnatm net80211 netbt nfs nnpfs ntfs scsi sys ufs uvm          netmpls netnatm net80211 netbt nfs nnpfs ntfs scsi sys ufs uvm
   
   # Places that need a prerequisite target met before includes
   PRDIRS=
   
 # Directories with an includes target  # Directories with an includes target
 RDIRS=  ../lib/libpthread ../lib/libcompat ../lib/libcurses \  RDIRS=  ../lib/libpthread ../lib/libcompat ../lib/libcurses \
         ../lib/libform ../lib/libssl ../lib/libmenu \          ../lib/libform ../lib/libssl ../lib/libmenu \
Line 46 
Line 49 
         ../lib/libwrap \          ../lib/libwrap \
         ../lib/libz ../lib/libkeynote ../lib/libevent ../usr.bin/lex \          ../lib/libz ../lib/libkeynote ../lib/libevent ../usr.bin/lex \
         ../gnu/lib/libreadline ../gnu/usr.sbin/sendmail/libmilter \          ../gnu/lib/libreadline ../gnu/usr.sbin/sendmail/libmilter \
         ../sys/arch/${MACHINE}          ../sys/arch/${MACHINE} ../usr.sbin/httpd
   
 # Places using Makefile that needs a prerequisite target met before includes  
 PRDIRS=  
   
 # Directories with an includes target that use Makefile.bsd-wrapper  
 WDIRS=  ../usr.sbin/httpd  
   
 # Places using Makefile.bsd-wrapper that needs a prerequisite target met  
 # before includes  
 PWDIRS=  
   
 .if ${COMPILER_VERSION:L} == "gcc3"  .if ${COMPILER_VERSION:L} == "gcc3"
 WDIRS+= ../gnu/lib/libstdc++ ../gnu/usr.bin/gcc ../gnu/lib/libobjc  RDIRS+= ../gnu/usr.bin/gcc ../gnu/lib/libobjc
 PWDIRS+= ../gnu/lib/libstdc++  PRDIRS+= ../gnu/lib/libstdc++
 .elif ${COMPILER_VERSION:L} == "gcc4"  .elif ${COMPILER_VERSION:L} == "gcc4"
 RDIRS+= ../gnu/lib/libstdc++-v3 ../gnu/usr.bin/cc/libobjc  RDIRS+= ../gnu/usr.bin/cc/libobjc
 PRDIRS+= ../gnu/lib/libstdc++-v3  PRDIRS+= ../gnu/lib/libstdc++-v3
 RDIRS+= ../gnu/usr.bin/cc/include  RDIRS+= ../gnu/usr.bin/cc/include
 .else  .else
 WDIRS+= ../gnu/egcs/libio ../gnu/egcs/libstdc++ \  RDIRS+= ../gnu/egcs/libio ../gnu/egcs/libstdc++ \
         ../gnu/lib/libobjc ../gnu/egcs/gcc          ../gnu/lib/libobjc ../gnu/egcs/gcc
 .endif  .endif
   
   # prereq implies includes
   RDIRS += ${PRDIRS}
   
 NOOBJ=  noobj  NOOBJ=  noobj
   
 # Change SYS_INCLUDE in bsd.own.mk to "symlinks" if you don't want copies  # Change SYS_INCLUDE in bsd.own.mk to "symlinks" if you don't want copies
Line 78 
Line 74 
 RDIRS+= ../lib/libkrb5 ../lib/libgssapi ../lib/libkadm5srv  RDIRS+= ../lib/libkrb5 ../lib/libgssapi ../lib/libkadm5srv
 .endif  .endif
   
   RUN_MAKE = if test -f Makefile.bsd-wrapper; then ${MAKE} -f Makefile.bsd-wrapper $@; else ${MAKE} $@; fi
   
 prereq:  prereq:
         @for i in ${PRDIRS}; do \          @for i in ${PRDIRS}; do \
                 echo preparing in ${.CURDIR}/$$i; \                  echo preparing in ${.CURDIR}/$$i; \
                 cd ${.CURDIR}/$$i && ${MAKE} prereq; \                  cd ${.CURDIR}/$$i && ${RUN_MAKE}; \
         done          done
         @for i in ${PWDIRS}; do \  
                 echo preparing in ${.CURDIR}/$$i; \  
                 cd ${.CURDIR}/$$i && ${MAKE} -f Makefile.bsd-wrapper prereq; \  
         done  
   
 includes:  includes:
         @echo installing ${FILES}          @echo installing ${FILES}
Line 125 
Line 119 
                 xargs -0r chmod u=rwx,go=rx                  xargs -0r chmod u=rwx,go=rx
         @for i in ${RDIRS}; do \          @for i in ${RDIRS}; do \
                 echo installing in ${.CURDIR}/$$i; \                  echo installing in ${.CURDIR}/$$i; \
                 cd ${.CURDIR}/$$i && ${MAKE} includes; \                  cd ${.CURDIR}/$$i && ${RUN_MAKE}; \
         done  
         @for i in ${WDIRS}; do \  
                 echo installing in ${.CURDIR}/$$i; \  
                 cd ${.CURDIR}/$$i && ${MAKE} -f Makefile.bsd-wrapper includes; \  
         done          done
   
 copies:  copies:
Legend:
Removed from v.1.162  
changed lines
  Added in v.1.163