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

* 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

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
+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
 	media_addon_server media_server midi_server net_server print_server

build/jam/HeadersRules

@@ -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 ] ;
 

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

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 ] ;
 

src/bin/bash/lib/readline/Jamfile

@@ -8,6 +8,7 @@ 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 ] ;

src/bin/less/Jamfile

@@ -6,6 +6,7 @@ TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS)
 
 SubDirCcFlags -DBINDIR='\"/bin\"' -DSYSDIR='\"/etc\"' ;
 
+UseLibraryHeaders termcap ;
 SubDirSysHdrs $(SUBDIR) ;
 
 BinCommand less :

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 ;

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) ] ;
 

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 ;
 

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 :