Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Moved termcap.h to headers/libs/termcap/, where it belongs.

Browse Source 
* Removed the headers/gnu from the default headers (the Jamfiles needing it
  use it explicitly, now) and moved it under headers/compatibility/.
* Added libgnu.so to the image. Still untested, though.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32481 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2009-08-17 21:13:51 +00:00
parent c175f2a63e
commit 8bc24c13ab
12 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/jam/HaikuImage
View File

@ -77,12 +77,12 @@ SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations E-mail
SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo
GLTeapot Haiku3d Mandelbrot Pairs Playground Pulse Sudoku Gradients GLTeapot Haiku3d Mandelbrot Pairs Playground Pulse Sudoku Gradients
; ;
SYSTEM_LIBS = libbe.so $(HAIKU_SHARED_LIBSTDC++) libmedia.so libtracker.so SYSTEM_LIBS = libalm.so libbe.so libbsd.so libbnetapi.so libdebug.so
libtranslation.so libbnetapi.so libnetwork.so libdebug.so libbsd.so libdevice.so libfluidsynth.so libfreetype.so libgame.so libGL.so libgnu.so
libmail.so libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so libilmimf.so liblinprog.so liblpsolve55.so libmail.so libmedia.so libmidi.so
libmidi2.so libdevice.so libgame.so libscreensaver.so <revisioned>libroot.so libmidi2.so libnetwork.so libpng.so <revisioned>libroot.so libscreensaver.so
libGL.so libfluidsynth.so liblpsolve55.so liblinprog.so libalm.so libtextencoding.so libtracker.so libtranslation.so libz.so
libilmimf.so $(HAIKU_SHARED_LIBSUPC++) $(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++)
; ;
SYSTEM_SERVERS = app_server cddb_daemon debug_server input_server mail_daemon SYSTEM_SERVERS = app_server cddb_daemon debug_server input_server mail_daemon
media_addon_server media_server midi_server net_server print_server media_addon_server media_server midi_server net_server print_server

9
build/jam/HeadersRules
View File

@ -226,7 +226,7 @@ rule UsePrivateHeaders
# NOTE: This rule must be invoked *before* the rule that builds the objects. # NOTE: This rule must be invoked *before* the rule that builds the objects.
local system = $(2) ; local system = $(2) ;
system ?= true ; system ?= true ;
UseHeaders [ PrivateHeaders $(1) ] : $(system) ; UseHeaders [ PrivateHeaders $(1) ] : $(system) ;
} }
@ -243,7 +243,7 @@ rule UsePrivateObjectHeaders
# search dirs. Defaults to "true". # search dirs. Defaults to "true".
local system = $(4) ; local system = $(4) ;
system ?= true ; system ?= true ;
if $(system) = true { if $(system) = true {
SourceSysHdrs $(1) : [ PrivateHeaders $(2) ] : $(3) ; SourceSysHdrs $(1) : [ PrivateHeaders $(2) ] : $(3) ;
@ -356,7 +356,7 @@ rule FStandardOSHeaders
add-ons/tracker app device drivers game interface add-ons/tracker app device drivers game interface
kernel media mail midi midi2 net opengl storage support kernel media mail midi midi2 net opengl storage support
translation ; translation ;
return [ FDirName $(HAIKU_TOP) headers os ] return [ FDirName $(HAIKU_TOP) headers os ]
[ PublicHeaders $(osIncludes) ] ; [ PublicHeaders $(osIncludes) ] ;
} }
@ -389,9 +389,6 @@ rule FStandardHeaders
# Use posix headers directory # Use posix headers directory
headers += [ FDirName $(HAIKU_TOP) headers posix ] ; headers += [ FDirName $(HAIKU_TOP) headers posix ] ;
# Use GNU headers directory
headers += [ FDirName $(HAIKU_TOP) headers gnu ] ;
# Use glibc headers # Use glibc headers
headers += [ FDirName $(HAIKU_TOP) headers glibc ] ; headers += [ FDirName $(HAIKU_TOP) headers glibc ] ;

5
build/jam/OptionalPackages
View File

@ -366,7 +366,6 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
AddFilesToHaikuImage develop etc : $(makefileEngineFiles) ; AddFilesToHaikuImage develop etc : $(makefileEngineFiles) ;
# headers # headers
AddHeaderDirectoryToHaikuImage gnu : 3rdparty ;
AddHeaderDirectoryToHaikuImage glibc ; AddHeaderDirectoryToHaikuImage glibc ;
AddHeaderDirectoryToHaikuImage os ; AddHeaderDirectoryToHaikuImage os ;
AddHeaderDirectoryToHaikuImage posix ; AddHeaderDirectoryToHaikuImage posix ;
@ -374,13 +373,15 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
# create be -> os symlink for now # create be -> os symlink for now
AddSymlinkToHaikuImage develop headers : os : be ; AddSymlinkToHaikuImage develop headers : os : be ;
# BSD compatibility headers # BSD and GNU compatibility headers
AddHeaderDirectoryToHaikuImage compatibility bsd : bsd ; AddHeaderDirectoryToHaikuImage compatibility bsd : bsd ;
AddHeaderDirectoryToHaikuImage compatibility gnu : gnu ;
# third party libs headers # third party libs headers
AddHeaderDirectoryToHaikuImage libs freetype2 : 3rdparty ; AddHeaderDirectoryToHaikuImage libs freetype2 : 3rdparty ;
AddHeaderDirectoryToHaikuImage libs ncurses : 3rdparty ; AddHeaderDirectoryToHaikuImage libs ncurses : 3rdparty ;
AddHeaderDirectoryToHaikuImage libs png : 3rdparty ; AddHeaderDirectoryToHaikuImage libs png : 3rdparty ;
AddHeaderDirectoryToHaikuImage libs termcap : 3rdparty ;
AddHeaderDirectoryToHaikuImage libs zlib : 3rdparty ; AddHeaderDirectoryToHaikuImage libs zlib : 3rdparty ;
# cpp headers # cpp headers

0
headers/gnu/sys/xattr.h → headers/compatibility/gnu/sys/xattr.h
View File

0
headers/gnu/termcap.h → headers/libs/termcap/termcap.h
View File

1
src/bin/Jamfile
View File

@ -6,6 +6,7 @@ UsePrivateHeaders app shared storage support usb ;
UsePrivateSystemHeaders ; UsePrivateSystemHeaders ;
SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_cache ; SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_cache ;
UseLibraryHeaders ncurses ; UseLibraryHeaders ncurses ;
UseLibraryHeaders termcap ;
local haiku-utils_rsrc = [ FGristFiles haiku-utils.rsrc ] ; local haiku-utils_rsrc = [ FGristFiles haiku-utils.rsrc ] ;

9
src/bin/bash/lib/readline/Jamfile
View File

@ -8,11 +8,12 @@ TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS)
SubDirCcFlags -DHAVE_CONFIG_H -DSHELL ; SubDirCcFlags -DHAVE_CONFIG_H -DSHELL ;
UseLibraryHeaders termcap ;
SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) ] ; SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) ] ;
SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ; SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) include ] ; SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) include ] ;
StaticLibrary libreadline.a : StaticLibrary libreadline.a :
readline.c readline.c
vi_mode.c vi_mode.c
funmap.c funmap.c
@ -35,7 +36,7 @@ StaticLibrary libreadline.a :
text.c text.c
nls.c nls.c
misc.c misc.c
history.c history.c
histexpand.c histexpand.c
histfile.c histfile.c
@ -43,9 +44,9 @@ StaticLibrary libreadline.a :
# shell.c # shell.c
savestring.c savestring.c
mbutil.c mbutil.c
tilde.c tilde.c
xmalloc.c xmalloc.c
compat.c compat.c
; ;

7
src/bin/less/Jamfile
View File

@ -6,11 +6,12 @@ TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS)
SubDirCcFlags -DBINDIR='\"/bin\"' -DSYSDIR='\"/etc\"' ; SubDirCcFlags -DBINDIR='\"/bin\"' -DSYSDIR='\"/etc\"' ;
UseLibraryHeaders termcap ;
SubDirSysHdrs $(SUBDIR) ; SubDirSysHdrs $(SUBDIR) ;
BinCommand less : BinCommand less :
main.c screen.c brac.c ch.c charset.c cmdbuf.c command.c decode.c edit.c filename.c forwback.c main.c screen.c brac.c ch.c charset.c cmdbuf.c command.c decode.c edit.c filename.c forwback.c
help.c ifile.c input.c jump.c line.c linenum.c lsystem.c mark.c optfunc.c option.c opttbl.c os.c help.c ifile.c input.c jump.c line.c linenum.c lsystem.c mark.c optfunc.c option.c opttbl.c os.c
output.c position.c prompt.c search.c signal.c tags.c ttyin.c version.c : output.c position.c prompt.c search.c signal.c tags.c ttyin.c version.c :
libtermcap.a : less.rdef ; libtermcap.a : less.rdef ;

1
src/bin/network/telnetd/Jamfile
View File

@ -1,5 +1,6 @@
SubDir HAIKU_TOP src bin network telnetd ; SubDir HAIKU_TOP src bin network telnetd ;
UseLibraryHeaders termcap ;
UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
UseHeaders [ FDirName $(HAIKU_TOP) src libs ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs ] : true ;
UseHeaders [ FDirName $(HAIKU_TOP) src libs libtelnet ] : false ; UseHeaders [ FDirName $(HAIKU_TOP) src libs libtelnet ] : false ;

1
src/bin/vim/src/Jamfile
View File

@ -1,5 +1,6 @@
SubDir HAIKU_TOP src bin vim src ; SubDir HAIKU_TOP src bin vim src ;
UseLibraryHeaders termcap ;
SubDirHdrs [ FDirName $(SUBDIR) proto ] ; SubDirHdrs [ FDirName $(SUBDIR) proto ] ;
SubDirHdrs [ FDirName $(SUBDIR) ] ; SubDirHdrs [ FDirName $(SUBDIR) ] ;

1
src/libs/edit/Jamfile
View File

@ -2,6 +2,7 @@ SubDir HAIKU_TOP src libs edit ;
SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ; SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ;
UseLibraryHeaders termcap ;
UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
UseHeaders [ FDirName $(HAIKU_TOP) headers libs ncurses ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) headers libs ncurses ] : true ;

1
src/libs/gnu/Jamfile
View File

@ -1,5 +1,6 @@
SubDir HAIKU_TOP src libs gnu ; SubDir HAIKU_TOP src libs gnu ;
UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility gnu ] : true ;
UsePrivateHeaders shared ; UsePrivateHeaders shared ;
SharedLibrary libgnu.so : SharedLibrary libgnu.so :