Moved bin/ out of apps/, make it build again.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@11910 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/Jamfile

@@ -1,9 +1,10 @@
 SubDir OBOS_TOP src ;
 
-SubInclude OBOS_TOP src kernel ;
 SubInclude OBOS_TOP src add-ons ;
 SubInclude OBOS_TOP src apps ;
+SubInclude OBOS_TOP src bin ;
 SubInclude OBOS_TOP src data ;
+SubInclude OBOS_TOP src kernel ;
 SubInclude OBOS_TOP src kits ;
 SubInclude OBOS_TOP src libs ;
 SubInclude OBOS_TOP src prefs ;

src/apps/Jamfile

@@ -1,6 +1,5 @@
 SubDir OBOS_TOP src apps ;
 
-SubInclude OBOS_TOP src apps bin ;
 SubInclude OBOS_TOP src apps bemail ;
 SubInclude OBOS_TOP src apps cdplayer ;
 SubInclude OBOS_TOP src apps clock ;

src/bin/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin ;
+SubDir OBOS_TOP src bin ;
 
 UsePrivateHeaders kernel ;
 UsePrivateHeaders shared ;
@@ -96,48 +96,48 @@ StdBinCommands
 	: be tracker stdc++.r4 libmail.so
 	;
 
-SubInclude OBOS_TOP src apps bin addattr ;
+SubInclude OBOS_TOP src bin addattr ;
-SubInclude OBOS_TOP src apps bin bash ;
+SubInclude OBOS_TOP src bin bash ;
-SubInclude OBOS_TOP src apps bin bc ;
+SubInclude OBOS_TOP src bin bc ;
-SubInclude OBOS_TOP src apps bin bison ;
+SubInclude OBOS_TOP src bin bison ;
-SubInclude OBOS_TOP src apps bin chkbfs ;
+SubInclude OBOS_TOP src bin chkbfs ;
-SubInclude OBOS_TOP src apps bin compress ;
+SubInclude OBOS_TOP src bin compress ;
-SubInclude OBOS_TOP src apps bin coreutils ;
+SubInclude OBOS_TOP src bin coreutils ;
-SubInclude OBOS_TOP src apps bin desklink ;
+SubInclude OBOS_TOP src bin desklink ;
-SubInclude OBOS_TOP src apps bin diffutils ;
+SubInclude OBOS_TOP src bin diffutils ;
-SubInclude OBOS_TOP src apps bin findutils ;
+SubInclude OBOS_TOP src bin findutils ;
-SubInclude OBOS_TOP src apps bin flex ;
+SubInclude OBOS_TOP src bin flex ;
-SubInclude OBOS_TOP src apps bin gawk ;
+SubInclude OBOS_TOP src bin gawk ;
-SubInclude OBOS_TOP src apps bin grep ;
+SubInclude OBOS_TOP src bin grep ;
-SubInclude OBOS_TOP src apps bin keymap ;
+SubInclude OBOS_TOP src bin keymap ;
-SubInclude OBOS_TOP src apps bin less ;
+SubInclude OBOS_TOP src bin less ;
-SubInclude OBOS_TOP src apps bin listdev ;
+SubInclude OBOS_TOP src bin listdev ;
-SubInclude OBOS_TOP src apps bin make ;
+SubInclude OBOS_TOP src bin make ;
-SubInclude OBOS_TOP src apps bin makeudfimage ;
+SubInclude OBOS_TOP src bin makeudfimage ;
-SubInclude OBOS_TOP src apps bin mkdos ;
+SubInclude OBOS_TOP src bin mkdos ;
-SubInclude OBOS_TOP src apps bin patch ;
+SubInclude OBOS_TOP src bin patch ;
-SubInclude OBOS_TOP src apps bin pc ;
+SubInclude OBOS_TOP src bin pc ;
-SubInclude OBOS_TOP src apps bin sed ;
+SubInclude OBOS_TOP src bin sed ;
-SubInclude OBOS_TOP src apps bin sharutils ;
+SubInclude OBOS_TOP src bin sharutils ;
-SubInclude OBOS_TOP src apps bin strace ;
+SubInclude OBOS_TOP src bin strace ;
-SubInclude OBOS_TOP src apps bin vim ;
+SubInclude OBOS_TOP src bin vim ;
-SubInclude OBOS_TOP src apps bin zic ;
+SubInclude OBOS_TOP src bin zic ;
 
 # RCS commands
-SubInclude OBOS_TOP src apps bin rcs ;
+SubInclude OBOS_TOP src bin rcs ;
 
 # Network command line tools
-SubInclude OBOS_TOP src apps bin arp ;
+SubInclude OBOS_TOP src bin arp ;
-SubInclude OBOS_TOP src apps bin ifconfig ;
+SubInclude OBOS_TOP src bin ifconfig ;
-SubInclude OBOS_TOP src apps bin ppp_up ;
+SubInclude OBOS_TOP src bin ppp_up ;
-SubInclude OBOS_TOP src apps bin pppconfig ;
+SubInclude OBOS_TOP src bin pppconfig ;
-SubInclude OBOS_TOP src apps bin ping ;
+SubInclude OBOS_TOP src bin ping ;
-SubInclude OBOS_TOP src apps bin route ;
+SubInclude OBOS_TOP src bin route ;
-SubInclude OBOS_TOP src apps bin traceroute ;
+SubInclude OBOS_TOP src bin traceroute ;
 
 # Compression command line tools
-SubInclude OBOS_TOP src apps bin unzip ;
+SubInclude OBOS_TOP src bin unzip ;
-SubInclude OBOS_TOP src apps bin zip ;
+SubInclude OBOS_TOP src bin zip ;
-SubInclude OBOS_TOP src apps bin gzip ;
+SubInclude OBOS_TOP src bin gzip ;
-SubInclude OBOS_TOP src apps bin bzip2 ;
+SubInclude OBOS_TOP src bin bzip2 ;
-SubInclude OBOS_TOP src apps bin tar ;
+SubInclude OBOS_TOP src bin tar ;

src/bin/addattr/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin addattr ;
+SubDir OBOS_TOP src bin addattr ;
 
 BinCommand addattr :
 	main.cpp

src/bin/arp/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin arp ;
+SubDir OBOS_TOP src bin arp ;
 
 UsePrivateHeaders net ;
 

src/bin/bash/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bash ;
+SubDir OBOS_TOP src bin bash ;
 
 SubDirCcFlags -DHAVE_CONFIG_H -DPROGRAM='\"sh\"' -DCONF_HOSTTYPE='\"i586\"' -DCONF_OSTYPE='\"beos\"' -DCONF_MACHTYPE='\"i586-pc-beos\"' -DCONF_VENDOR='\"pc\"' -DSHELL ;
 
@@ -72,8 +72,8 @@ Includes [ FGristFiles trap.c ] : <bash>signames.h ;
 # some sources include the generated builtext.h
 Includes [ FGristFiles execute_cmd.c nojobs.c parse.c ] : <bash>builtext.h ;
 
-SubInclude OBOS_TOP src apps bin bash lib ;
+SubInclude OBOS_TOP src bin bash lib ;
-SubInclude OBOS_TOP src apps bin bash builtins ;
+SubInclude OBOS_TOP src bin bash builtins ;
 
 # restore CCFLAGS
 CCFLAGS = $(originalCCFlags) ;

src/bin/bash/builtins/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bash builtins ;
+SubDir OBOS_TOP src bin bash builtins ;
 
 SubDirCcFlags -DHAVE_CONFIG_H -DSHELL ;
 

src/bin/bash/lib/Jamfile

@@ -1,6 +1,6 @@
-SubDir OBOS_TOP src apps bin bash lib ;
+SubDir OBOS_TOP src bin bash lib ;
 
-SubInclude OBOS_TOP src apps bin bash lib glob ;
+SubInclude OBOS_TOP src bin bash lib glob ;
-SubInclude OBOS_TOP src apps bin bash lib readline ;
+SubInclude OBOS_TOP src bin bash lib readline ;
-SubInclude OBOS_TOP src apps bin bash lib sh ;
+SubInclude OBOS_TOP src bin bash lib sh ;
-SubInclude OBOS_TOP src apps bin bash lib tilde ;
+SubInclude OBOS_TOP src bin bash lib tilde ;

src/bin/bash/lib/glob/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bash lib glob ;
+SubDir OBOS_TOP src bin bash lib glob ;
 
 SubDirCcFlags -DHAVE_CONFIG_H -DSHELL ;
 

src/bin/bash/lib/readline/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bash lib readline ;
+SubDir OBOS_TOP src bin bash lib readline ;
 
 SubDirCcFlags -DHAVE_CONFIG_H -DSHELL ;
 

src/bin/bash/lib/sh/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bash lib sh ;
+SubDir OBOS_TOP src bin bash lib sh ;
 
 SubDirCcFlags -DHAVE_CONFIG_H -DSHELL ;
 

src/bin/bash/lib/tilde/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bash lib tilde ;
+SubDir OBOS_TOP src bin bash lib tilde ;
 
 SubDirCcFlags -DHAVE_CONFIG_H -DSHELL ;
 

src/bin/bc/Jamfile

@@ -1,5 +1,5 @@
-SubDir OBOS_TOP src apps bin bc ;
+SubDir OBOS_TOP src bin bc ;
 
-SubInclude OBOS_TOP src apps bin bc lib ;
+SubInclude OBOS_TOP src bin bc lib ;
-SubInclude OBOS_TOP src apps bin bc bc ; 
+SubInclude OBOS_TOP src bin bc bc ; 
-SubInclude OBOS_TOP src apps bin bc dc ; 
+SubInclude OBOS_TOP src bin bc dc ; 

src/bin/bc/bc/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bc bc ;
+SubDir OBOS_TOP src bin bc bc ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;

src/bin/bc/dc/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bc dc ;
+SubDir OBOS_TOP src bin bc dc ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;

src/bin/bc/lib/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bc lib ;
+SubDir OBOS_TOP src bin bc lib ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 

src/bin/bison/Jamfile

@@ -1,5 +1,5 @@
-SubDir OBOS_TOP src apps bin bison ;
+SubDir OBOS_TOP src bin bison ;
 
-SubInclude OBOS_TOP src apps bin bison data ;
+SubInclude OBOS_TOP src bin bison data ;
-SubInclude OBOS_TOP src apps bin bison lib ;
+SubInclude OBOS_TOP src bin bison lib ;
-SubInclude OBOS_TOP src apps bin bison src ;
+SubInclude OBOS_TOP src bin bison src ;

src/bin/bison/data/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bison data ;
+SubDir OBOS_TOP src bin bison data ;
 
 MakeLocate <etc>c.m4 : $(OBOS_ETC_DIR) ;
 File <etc>c.m4 : c.m4 ;

src/bin/bison/lib/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bison lib ;
+SubDir OBOS_TOP src bin bison lib ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 

src/bin/bison/src/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bison src ;
+SubDir OBOS_TOP src bin bison src ;
 
 SubDirCcFlags -DHAVE_CONFIG_H   -DPKGDATADIR=\'\"/etc\"\' -DLOCALEDIR=\'\"/etc/locale\"\' ;
 

src/bin/bzip2/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin bzip2 ;
+SubDir OBOS_TOP src bin bzip2 ;
 
 # set some additional defines
 {

src/bin/chkbfs/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin chkbfs ;
+SubDir OBOS_TOP src bin chkbfs ;
 
 SubDirHdrs $(OBOS_TOP) src add-ons kernel file_systems bfs ;
 UsePrivateHeaders kernel ;

src/bin/compress/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin compress ;
+SubDir OBOS_TOP src bin compress ;
 
 SubDirCcFlags -DSACREDMEM=256000 -D_FPOS_T -DUSERMEM=2097152 -DBEOS=1 -w ;
 

src/bin/coreutils/Jamfile

@@ -1,11 +1,11 @@
-SubDir OBOS_TOP src apps bin coreutils ;
+SubDir OBOS_TOP src bin coreutils ;
 
 # filter warnings we don't want here
 local originalCCFlags = $(CCFLAGS) ;
 CCFLAGS = [ Filter $(CCFLAGS) : -Wall -Wmissing-prototypes -Wsign-compare ] ;
 
-SubInclude OBOS_TOP src apps bin coreutils lib ;
+SubInclude OBOS_TOP src bin coreutils lib ;
-SubInclude OBOS_TOP src apps bin coreutils src ; 
+SubInclude OBOS_TOP src bin coreutils src ; 
 
 # restore CCFLAGS
 CCFLAGS = $(originalCCFlags) ;

src/bin/coreutils/lib/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin coreutils lib ;
+SubDir OBOS_TOP src bin coreutils lib ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 

src/bin/coreutils/src/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin coreutils src ;
+SubDir OBOS_TOP src bin coreutils src ;
 
 SubDirCcFlags -DHAVE_CONFIG_H  -DLOCALEDIR=\'\"/share/locale\"\' ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;

src/bin/desklink/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin desklink ;
+SubDir OBOS_TOP src bin desklink ;
 
 AddResources desklink : desklink.rsrc ;
 

src/bin/diffutils/Jamfile

@@ -1,11 +1,11 @@
-SubDir OBOS_TOP src apps bin diffutils ;
+SubDir OBOS_TOP src bin diffutils ;
 
 # filter warnings we don't want here
 local originalCCFlags = $(CCFLAGS) ;
 CCFLAGS = [ Filter $(CCFLAGS) : -Wall -Wmissing-prototypes -Wsign-compare ] ;
 
-SubInclude OBOS_TOP src apps bin diffutils lib ;
+SubInclude OBOS_TOP src bin diffutils lib ;
-SubInclude OBOS_TOP src apps bin diffutils src ; 
+SubInclude OBOS_TOP src bin diffutils src ; 
 
 # restore CCFLAGS
 CCFLAGS = $(originalCCFlags) ;

src/bin/diffutils/lib/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin diffutils lib ;
+SubDir OBOS_TOP src bin diffutils lib ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;

src/bin/diffutils/src/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin diffutils src ;
+SubDir OBOS_TOP src bin diffutils src ;
 
 SubDirCcFlags -DHAVE_CONFIG_H  -DLOCALEDIR=\'\"/share/locale\"\' -DPR_PROGRAM=\'\"/bin/pr\"\' -DDEFAULT_DIFF_PROGRAM=\'\"diff\"\' ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;

src/bin/findutils/Jamfile

@@ -1,13 +1,13 @@
-SubDir OBOS_TOP src apps bin findutils ;
+SubDir OBOS_TOP src bin findutils ;
 
 # filter warnings we don't want here
 local originalCCFlags = $(CCFLAGS) ;
 CCFLAGS = [ Filter $(CCFLAGS) : -Wall -Wmissing-prototypes -Wsign-compare ] ;
 
-SubInclude OBOS_TOP src apps bin findutils lib ;
+SubInclude OBOS_TOP src bin findutils lib ;
-SubInclude OBOS_TOP src apps bin findutils find ;
+SubInclude OBOS_TOP src bin findutils find ;
-SubInclude OBOS_TOP src apps bin findutils locate ;
+SubInclude OBOS_TOP src bin findutils locate ;
-SubInclude OBOS_TOP src apps bin findutils xargs ;
+SubInclude OBOS_TOP src bin findutils xargs ;
 
 # restore CCFLAGS
 CCFLAGS = $(originalCCFlags) ;

src/bin/findutils/find/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin findutils find ;
+SubDir OBOS_TOP src bin findutils find ;
 
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;

src/bin/findutils/lib/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin findutils lib ;
+SubDir OBOS_TOP src bin findutils lib ;
 
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
 

src/bin/findutils/locate/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin findutils locate ;
+SubDir OBOS_TOP src bin findutils locate ;
 
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;

src/bin/findutils/xargs/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin findutils xargs ;
+SubDir OBOS_TOP src bin findutils xargs ;
 
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;

src/bin/flex/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin flex ;
+SubDir OBOS_TOP src bin flex ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 

src/bin/gawk/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin gawk ;
+SubDir OBOS_TOP src bin gawk ;
 
 # filter warnings we don't want here
 local originalCCFlags = $(CCFLAGS) ;
@@ -35,7 +35,7 @@ RelSymLink awk : gawk ;
 MakeLocate igawk : $(OBOS_BIN_DIR) ;
 RelSymLink igawk : gawk ;
 
-SubInclude OBOS_TOP src apps bin gawk intl ;
+SubInclude OBOS_TOP src bin gawk intl ;
 
 # restore CCFLAGS
 CCFLAGS = $(originalCCFlags) ;

src/bin/gawk/intl/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin gawk intl ;
+SubDir OBOS_TOP src bin gawk intl ;
 
 SubDirCcFlags -DLOCALEDIR='\"/share/locale\"' -DLOCALE_ALIAS_PATH='\"/share/locale\"' -DLIBDIR='\"/usr/local/lib\"' -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR='\"/usr/local/lib\"' -DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H ;
 

src/bin/grep/Jamfile

@@ -1,11 +1,11 @@
-SubDir OBOS_TOP src apps bin grep ;
+SubDir OBOS_TOP src bin grep ;
 
 # filter warnings we don't want here
 local originalCCFlags = $(CCFLAGS) ;
 CCFLAGS = [ Filter $(CCFLAGS) : -Wall -Wmissing-prototypes -Wsign-compare ] ;
 
-SubInclude OBOS_TOP src apps bin grep lib ;
+SubInclude OBOS_TOP src bin grep lib ;
-SubInclude OBOS_TOP src apps bin grep src ; 
+SubInclude OBOS_TOP src bin grep src ; 
 
 # restore CCFLAGS
 CCFLAGS = $(originalCCFlags) ;

src/bin/grep/lib/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin grep lib ;
+SubDir OBOS_TOP src bin grep lib ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 

src/bin/grep/src/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin grep src ;
+SubDir OBOS_TOP src bin grep src ;
 
 SubDirCcFlags -DHAVE_CONFIG_H -DLOCALEDIR='\"/boot/beos/share/locale\"' ;
 

src/bin/gzip/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin gzip ;
+SubDir OBOS_TOP src bin gzip ;
 
 SubDirCcFlags -w ;
 

src/bin/ifconfig/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin ifconfig ;
+SubDir OBOS_TOP src bin ifconfig ;
 
 UsePrivateHeaders net ;
 

src/bin/keymap/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin keymap ;
+SubDir OBOS_TOP src bin keymap ;
 
 BinCommand keymap :
 	key_map.cpp

src/bin/less/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin less ;
+SubDir OBOS_TOP src bin less ;
 
 # filter warnings we don't want here
 local originalCCFlags = $(CCFLAGS) ;

src/bin/listdev/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin listdev ;
+SubDir OBOS_TOP src bin listdev ;
 
 BinCommand listdev :
 	cm_wrapper.c

src/bin/make/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin make ;
+SubDir OBOS_TOP src bin make ;
 
 # filter warnings we don't want here
 local originalCCFlags = $(CCFLAGS) ;
@@ -35,7 +35,7 @@ BinCommand make :
 	vpath.c
 : <make>libglob.a : make.rdef ;
 
-SubInclude OBOS_TOP src apps bin make glob ;
+SubInclude OBOS_TOP src bin make glob ;
 
 # restore CCFLAGS
 CCFLAGS = $(originalCCFlags) ;

src/bin/make/glob/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin make glob ;
+SubDir OBOS_TOP src bin make glob ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 

src/bin/makeudfimage/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin makeudfimage ;
+SubDir OBOS_TOP src bin makeudfimage ;
 
 UsePrivateHeaders [ FDirName kernel util ] ;	# For kernel_cpp.h
 SubDirHdrs [ FDirName $(OBOS_TOP) src add-ons kernel file_systems udf ] ;

src/bin/mkdos/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin mkdos ;
+SubDir OBOS_TOP src bin mkdos ;
 
 BinCommand mkdos :
 	mkdos.cpp

src/bin/patch/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin patch ;
+SubDir OBOS_TOP src bin patch ;
 
 SubDirCcFlags -DHAVE_CONFIG_H -Ded_PROGRAM='\"ed\"' -w ;
 

src/bin/pc/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin pc ;
+SubDir OBOS_TOP src bin pc ;
 
 BinCommand pc :
 	pc.c

src/bin/ping/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin ping ;
+SubDir OBOS_TOP src bin ping ;
 
 UsePrivateHeaders net ;
 

src/bin/ppp_up/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin ppp_up ;
+SubDir OBOS_TOP src bin ppp_up ;
 
 UsePrivateHeaders net ;
 UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libppp headers ] ;

src/bin/pppconfig/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin pppconfig ;
+SubDir OBOS_TOP src bin pppconfig ;
 
 UsePrivateHeaders net ;
 UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libppp headers ] ;

src/bin/rcs/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin rcs ;
+SubDir OBOS_TOP src bin rcs ;
 
 SubDirCcFlags -w ;
 

src/bin/route/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin route ;
+SubDir OBOS_TOP src bin route ;
 
 UsePrivateHeaders net ;
 

src/bin/sed/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin sed ;
+SubDir OBOS_TOP src bin sed ;
 
-SubInclude OBOS_TOP src apps bin sed lib ;
+SubInclude OBOS_TOP src bin sed lib ;
-SubInclude OBOS_TOP src apps bin sed sed ; 
+SubInclude OBOS_TOP src bin sed sed ; 

src/bin/sed/lib/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin sed lib ;
+SubDir OBOS_TOP src bin sed lib ;
 
 SubDirCcFlags -DHAVE_CONFIG_H -w ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;

src/bin/sed/sed/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin sed sed ;
+SubDir OBOS_TOP src bin sed sed ;
 
 SubDirCcFlags -I ../lib -DHAVE_CONFIG_H  -DLOCALEDIR=\'\"/share/locale\"\' -w ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;

src/bin/sharutils/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin sharutils ;
+SubDir OBOS_TOP src bin sharutils ;
 
-SubInclude OBOS_TOP src apps bin sharutils lib ;
+SubInclude OBOS_TOP src bin sharutils lib ;
-SubInclude OBOS_TOP src apps bin sharutils src ; 
+SubInclude OBOS_TOP src bin sharutils src ; 

src/bin/sharutils/lib/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin sharutils lib ;
+SubDir OBOS_TOP src bin sharutils lib ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;

src/bin/sharutils/src/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin sharutils src ;
+SubDir OBOS_TOP src bin sharutils src ;
 
 SubDirCcFlags -I ../lib -DHAVE_CONFIG_H  -DLOCALEDIR=\'\"/share/locale\"\' ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;

src/bin/strace/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin strace ;
+SubDir OBOS_TOP src bin strace ;
 
 # We need our objects dir in the include paths.
 SetupObjectsDir ;

src/bin/tar/Jamfile

@@ -1,11 +1,11 @@
-SubDir OBOS_TOP src apps bin tar ;
+SubDir OBOS_TOP src bin tar ;
 
 # filter warnings we don't want here
 local originalCCFlags = $(CCFLAGS) ;
 CCFLAGS = [ Filter $(CCFLAGS) : -Wall -Wmissing-prototypes -Wsign-compare ] ;
 
-SubInclude OBOS_TOP src apps bin tar lib ;
+SubInclude OBOS_TOP src bin tar lib ;
-SubInclude OBOS_TOP src apps bin tar src ;
+SubInclude OBOS_TOP src bin tar src ;
 
 # restore CCFLAGS
 CCFLAGS = $(originalCCFlags) ;

src/bin/tar/lib/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin tar lib ;
+SubDir OBOS_TOP src bin tar lib ;
 
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
 

src/bin/tar/src/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin tar src ;
+SubDir OBOS_TOP src bin tar src ;
 
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;

src/bin/traceroute/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin traceroute ;
+SubDir OBOS_TOP src bin traceroute ;
 
 UsePrivateHeaders net ;
 

src/bin/unzip/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin unzip ;
+SubDir OBOS_TOP src bin unzip ;
 
 StaticLibrary unzip : 
 	crc32.c

src/bin/vim/Jamfile

@@ -1,10 +1,10 @@
-SubDir OBOS_TOP src apps bin vim ;
+SubDir OBOS_TOP src bin vim ;
 
 # filter warnings we don't want here
 local originalCCFlags = $(CCFLAGS) ;
 CCFLAGS = [ Filter $(CCFLAGS) : -Wall -Wmissing-prototypes -Wsign-compare ] ;
 
-SubInclude OBOS_TOP src apps bin vim src ;
+SubInclude OBOS_TOP src bin vim src ;
 
 # restore CCFLAGS
 CCFLAGS = $(originalCCFlags) ;

src/bin/vim/runtime/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin vim runtime ;
+SubDir OBOS_TOP src bin vim runtime ;
 
 # rules difference and glob-tree come from boost project
 #  (C) Copyright David Abrahams and Carlos Pinto Coelho 2001. Permission to 

src/bin/vim/src/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin vim src ;
+SubDir OBOS_TOP src bin vim src ;
 
 SubDirHdrs [ FDirName $(SUBDIR) proto ] ;
 SubDirHdrs [ FDirName $(SUBDIR) ] ;

src/bin/zic/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin zic ;
+SubDir OBOS_TOP src bin zic ;
 
 SubDirCcFlags -DNOID ;
 

src/bin/zip/Jamfile

@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src apps bin zip ;
+SubDir OBOS_TOP src bin zip ;
 
 local zip_rsrc = [ FGristFiles zip.rsrc ] ;
 ResComp $(zip_rsrc) : [ FGristFiles zip.rdef ] ;