diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 4b8fce82e5..0d9b9d499f 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -77,12 +77,12 @@ SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations E-mail SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo GLTeapot Haiku3d Mandelbrot Pairs Playground Pulse Sudoku Gradients ; -SYSTEM_LIBS = libbe.so $(HAIKU_SHARED_LIBSTDC++) libmedia.so libtracker.so - libtranslation.so libbnetapi.so libnetwork.so libdebug.so libbsd.so - libmail.so libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so - libmidi2.so libdevice.so libgame.so libscreensaver.so libroot.so - libGL.so libfluidsynth.so liblpsolve55.so liblinprog.so libalm.so - libilmimf.so $(HAIKU_SHARED_LIBSUPC++) +SYSTEM_LIBS = libalm.so libbe.so libbsd.so libbnetapi.so libdebug.so + libdevice.so libfluidsynth.so libfreetype.so libgame.so libGL.so libgnu.so + libilmimf.so liblinprog.so liblpsolve55.so libmail.so libmedia.so libmidi.so + libmidi2.so libnetwork.so libpng.so libroot.so libscreensaver.so + libtextencoding.so libtracker.so libtranslation.so libz.so + $(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++) ; SYSTEM_SERVERS = app_server cddb_daemon debug_server input_server mail_daemon media_addon_server media_server midi_server net_server print_server diff --git a/build/jam/HeadersRules b/build/jam/HeadersRules index 34498343f4..b475e4dfdd 100644 --- a/build/jam/HeadersRules +++ b/build/jam/HeadersRules @@ -226,7 +226,7 @@ rule UsePrivateHeaders # NOTE: This rule must be invoked *before* the rule that builds the objects. local system = $(2) ; - system ?= true ; + system ?= true ; UseHeaders [ PrivateHeaders $(1) ] : $(system) ; } @@ -243,7 +243,7 @@ rule UsePrivateObjectHeaders # search dirs. Defaults to "true". local system = $(4) ; - system ?= true ; + system ?= true ; if $(system) = true { SourceSysHdrs $(1) : [ PrivateHeaders $(2) ] : $(3) ; @@ -356,7 +356,7 @@ rule FStandardOSHeaders add-ons/tracker app device drivers game interface kernel media mail midi midi2 net opengl storage support translation ; - + return [ FDirName $(HAIKU_TOP) headers os ] [ PublicHeaders $(osIncludes) ] ; } @@ -389,9 +389,6 @@ rule FStandardHeaders # Use posix headers directory headers += [ FDirName $(HAIKU_TOP) headers posix ] ; - # Use GNU headers directory - headers += [ FDirName $(HAIKU_TOP) headers gnu ] ; - # Use glibc headers headers += [ FDirName $(HAIKU_TOP) headers glibc ] ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 631aba5d4b..78e1979392 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -366,7 +366,6 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 { AddFilesToHaikuImage develop etc : $(makefileEngineFiles) ; # headers - AddHeaderDirectoryToHaikuImage gnu : 3rdparty ; AddHeaderDirectoryToHaikuImage glibc ; AddHeaderDirectoryToHaikuImage os ; AddHeaderDirectoryToHaikuImage posix ; @@ -374,13 +373,15 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 { # create be -> os symlink for now AddSymlinkToHaikuImage develop headers : os : be ; - # BSD compatibility headers + # BSD and GNU compatibility headers AddHeaderDirectoryToHaikuImage compatibility bsd : bsd ; + AddHeaderDirectoryToHaikuImage compatibility gnu : gnu ; # third party libs headers AddHeaderDirectoryToHaikuImage libs freetype2 : 3rdparty ; AddHeaderDirectoryToHaikuImage libs ncurses : 3rdparty ; AddHeaderDirectoryToHaikuImage libs png : 3rdparty ; + AddHeaderDirectoryToHaikuImage libs termcap : 3rdparty ; AddHeaderDirectoryToHaikuImage libs zlib : 3rdparty ; # cpp headers diff --git a/headers/gnu/sys/xattr.h b/headers/compatibility/gnu/sys/xattr.h similarity index 100% rename from headers/gnu/sys/xattr.h rename to headers/compatibility/gnu/sys/xattr.h diff --git a/headers/gnu/termcap.h b/headers/libs/termcap/termcap.h similarity index 100% rename from headers/gnu/termcap.h rename to headers/libs/termcap/termcap.h diff --git a/src/bin/Jamfile b/src/bin/Jamfile index e3827ec79c..e0feb7f200 100644 --- a/src/bin/Jamfile +++ b/src/bin/Jamfile @@ -6,6 +6,7 @@ UsePrivateHeaders app shared storage support usb ; UsePrivateSystemHeaders ; SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_cache ; UseLibraryHeaders ncurses ; +UseLibraryHeaders termcap ; local haiku-utils_rsrc = [ FGristFiles haiku-utils.rsrc ] ; diff --git a/src/bin/bash/lib/readline/Jamfile b/src/bin/bash/lib/readline/Jamfile index 73b88042a0..f9218da6c2 100644 --- a/src/bin/bash/lib/readline/Jamfile +++ b/src/bin/bash/lib/readline/Jamfile @@ -8,11 +8,12 @@ TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS) SubDirCcFlags -DHAVE_CONFIG_H -DSHELL ; +UseLibraryHeaders termcap ; SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) ] ; SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ; SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) include ] ; -StaticLibrary libreadline.a : +StaticLibrary libreadline.a : readline.c vi_mode.c funmap.c @@ -35,7 +36,7 @@ StaticLibrary libreadline.a : text.c nls.c misc.c - + history.c histexpand.c histfile.c @@ -43,9 +44,9 @@ StaticLibrary libreadline.a : # shell.c savestring.c mbutil.c - + tilde.c - + xmalloc.c compat.c ; diff --git a/src/bin/less/Jamfile b/src/bin/less/Jamfile index e3e6c1c33f..9c5c97cd85 100644 --- a/src/bin/less/Jamfile +++ b/src/bin/less/Jamfile @@ -6,11 +6,12 @@ TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS) SubDirCcFlags -DBINDIR='\"/bin\"' -DSYSDIR='\"/etc\"' ; +UseLibraryHeaders termcap ; SubDirSysHdrs $(SUBDIR) ; -BinCommand less : - 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 +BinCommand less : + 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 output.c position.c prompt.c search.c signal.c tags.c ttyin.c version.c : libtermcap.a : less.rdef ; diff --git a/src/bin/network/telnetd/Jamfile b/src/bin/network/telnetd/Jamfile index c975e66fb1..13e1238a64 100644 --- a/src/bin/network/telnetd/Jamfile +++ b/src/bin/network/telnetd/Jamfile @@ -1,5 +1,6 @@ SubDir HAIKU_TOP src bin network telnetd ; +UseLibraryHeaders termcap ; UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src libs libtelnet ] : false ; diff --git a/src/bin/vim/src/Jamfile b/src/bin/vim/src/Jamfile index 3488de3b74..fc2fee5814 100644 --- a/src/bin/vim/src/Jamfile +++ b/src/bin/vim/src/Jamfile @@ -1,5 +1,6 @@ SubDir HAIKU_TOP src bin vim src ; +UseLibraryHeaders termcap ; SubDirHdrs [ FDirName $(SUBDIR) proto ] ; SubDirHdrs [ FDirName $(SUBDIR) ] ; diff --git a/src/libs/edit/Jamfile b/src/libs/edit/Jamfile index 79eeaba49b..6363d5f04b 100644 --- a/src/libs/edit/Jamfile +++ b/src/libs/edit/Jamfile @@ -2,6 +2,7 @@ SubDir HAIKU_TOP src libs edit ; SetSubDirSupportedPlatforms $(HAIKU_BONE_COMPATIBLE_PLATFORMS) ; +UseLibraryHeaders termcap ; UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) headers libs ncurses ] : true ; diff --git a/src/libs/gnu/Jamfile b/src/libs/gnu/Jamfile index 3e83d3beee..bc275def40 100644 --- a/src/libs/gnu/Jamfile +++ b/src/libs/gnu/Jamfile @@ -1,5 +1,6 @@ SubDir HAIKU_TOP src libs gnu ; +UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility gnu ] : true ; UsePrivateHeaders shared ; SharedLibrary libgnu.so :