i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged changes from branch build_system_redesign at revision 14573.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/diffutils/Jamfile
+3 -10
View File
@@ -1,11 +1,4 @@
SubDir OBOS_TOP src bin diffutils ;
SubDir HAIKU_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 bin diffutils lib ;
SubInclude OBOS_TOP src bin diffutils src ;
# restore CCFLAGS
CCFLAGS = $(originalCCFlags) ;
SubInclude HAIKU_TOP src bin diffutils lib ;
SubInclude HAIKU_TOP src bin diffutils src ;
src/bin/diffutils/lib/Jamfile
+9 -4
View File
@@ -1,10 +1,15 @@
SubDir OBOS_TOP src bin diffutils lib ;
SubDir HAIKU_TOP src bin diffutils 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) ] ;
SubDirHdrs [ FDirName $(OBOS_TOP) headers ] ;
SubDirSysHdrs $(SUBDIR) ;
SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
SubDirSysHdrs [ FDirName $(HAIKU_TOP) headers ] ;
StaticLibrary diffutils :
StaticLibrary libdiffutils.a :
# alloca.c
basename.c
c-stack.c
src/bin/diffutils/src/Jamfile
+8 -4
View File
@@ -1,9 +1,13 @@
SubDir OBOS_TOP src bin diffutils src ;
SubDir HAIKU_TOP src bin diffutils 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\"\' -DPR_PROGRAM=\'\"/bin/pr\"\' -DDEFAULT_DIFF_PROGRAM=\'\"diff\"\' ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
SubDirHdrs [ FDirName $(OBOS_TOP) headers ] ;
SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
SubDirSysHdrs [ FDirName $(HAIKU_TOP) headers ] ;
local diffutils_rsrc = [ FGristFiles diffutils.rsrc ] ;
ResComp $(diffutils_rsrc) : [ FGristFiles diffutils.rdef ] ;