Merged changes from branch build_system_redesign at revision 14573.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14574 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2005-10-29 16:27:43 +00:00
parent 5412b02d50
commit 338b8dc301
1836 changed files with 114718 additions and 14057 deletions
+4 -11
View File
@@ -1,12 +1,5 @@
SubDir OBOS_TOP src bin coreutils ;
SubDir HAIKU_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 bin coreutils lib ;
SubInclude OBOS_TOP src bin coreutils man ;
SubInclude OBOS_TOP src bin coreutils src ;
# restore CCFLAGS
CCFLAGS = $(originalCCFlags) ;
SubInclude HAIKU_TOP src bin coreutils lib ;
SubInclude HAIKU_TOP src bin coreutils man ;
SubInclude HAIKU_TOP src bin coreutils src ;
+8 -3
View File
@@ -1,10 +1,15 @@
SubDir OBOS_TOP src bin coreutils lib ;
SubDir HAIKU_TOP src bin coreutils lib ;
# filter warnings we don't want here
TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS)
: -Wall -Wmissing-prototypes -Wsign-compare ] ;
SubDirCcFlags -DHAVE_CONFIG_H ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
SubDirSysHdrs $(SUBDIR) ;
SubDirSysHdrs $(SUBDIR) $(DOTDOT) ;
StaticLibrary fetish :
StaticLibrary libfetish.a :
__fpending.c
acl.c
# alloca.c
+3 -2
View File
@@ -1,4 +1,4 @@
SubDir OBOS_TOP src bin coreutils man ;
SubDir HAIKU_TOP src bin coreutils man ;
local manpages =
basename.1
@@ -100,7 +100,8 @@ rule GenerateChapterXML
local template = [ FGristFiles $(2) ] ;
local target = [ FGristFiles $(1) ] ;
MakeLocate $(target) : [ FDirName $(OBOS_OBJECT_TARGET) documentation Shell_Tools ] ;
MakeLocate $(target)
: [ FDirName $(HAIKU_DOCUMENTATION_OBJECT_DIR) Shell_Tools ] ;
SEARCH on $(template) = $(SEARCH_SOURCE) ;
local xmls = [ FGristFiles $(sources:S=.xml) ] ;
+7 -3
View File
@@ -1,8 +1,12 @@
SubDir OBOS_TOP src bin coreutils src ;
SubDir HAIKU_TOP src bin coreutils src ;
# filter warnings we don't want here
TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS)
: -Wall -Wmissing-prototypes -Wsign-compare ] ;
SubDirCcFlags -DHAVE_CONFIG_H -DLOCALEDIR=\'\"/share/locale\"\' ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
local coreutils_rsrc = [ FGristFiles coreutils.rsrc ] ;
@@ -127,6 +131,6 @@ BinCommand sha1sum :
BinCommand vdir :
ls.c ls-vdir.c : libfetish.a : $(coreutils_rsrc) ;
MakeLocate groups : $(OBOS_BIN_DIR) ;
MakeLocatePlatform groups ;
Shell groups : groups.sh ;