On Wed, 2005-04-13 at 16:57 +0200, Axel Dörfler wrote: > Thanks for your work, but I was still in the middle of the changes - > it's fixed now. > Sorry for the inconvenience as I had some files in another branch > (silly me), I could not do all changes in one commit... oh :) sorry, to spam again, but after revision 12364 there are still a few jamfiles left, the only one important to get makehdimage work is the one in src/libs/stdc++/Jamfile, but I tought I'll update every reference to "src kernel" (grep "src kernel"). greets philipp ps: the default keymap file (x86.R1/beos/etc/Keymap/US-International) isn't created by makehdimage anymore -- Philipp Schmid <schmidp@xxxxxxxxxxx> OpenResearch
Index: Jamrules =================================================================== --- Jamrules (revision 12364) +++ Jamrules (working copy) @@ -333,11 +333,11 @@ # are conflicts with STL/gcc headers, if we do that. # # This is nasty, but we don't get around it, since some public headers # # include _G_config.h which in turn includes other private headers. -# HDRS += [ FDirName $(OBOS_TOP) src kernel libroot posix glibc include ] ; -# HDRS += [ FDirName $(OBOS_TOP) src kernel libroot posix glibc include arch +# HDRS += [ FDirName $(OBOS_TOP) src system libroot posix glibc include ] ; +# HDRS += [ FDirName $(OBOS_TOP) src system libroot posix glibc include arch # $(OBOS_ARCH) ] ; -# HDRS += [ FDirName $(OBOS_TOP) src kernel libroot posix glibc ] ; -# HDRS += [ FDirName $(OBOS_TOP) src kernel libroot posix glibc libio ] ; +# HDRS += [ FDirName $(OBOS_TOP) src system libroot posix glibc ] ; +# HDRS += [ FDirName $(OBOS_TOP) src system libroot posix glibc libio ] ; # # for _G_config.h HDRS += $(STL_HEADERS) ; Index: src/tools/copy_to_bfs_image/Jamfile =================================================================== --- src/tools/copy_to_bfs_image/Jamfile (revision 12364) +++ src/tools/copy_to_bfs_image/Jamfile (working copy) @@ -46,11 +46,11 @@ SEARCH on [ FGristFiles kernel_cpp.cpp - ] = [ FDirName $(OBOS_TOP) src kernel core util ] ; + ] = [ FDirName $(OBOS_TOP) src system kernel util ] ; SEARCH on [ FGristFiles strlcat.c - ] = [ FDirName $(OBOS_TOP) src kernel libroot posix string ] ; + ] = [ FDirName $(OBOS_TOP) src system libroot posix string ] ; SEARCH on [ FGristFiles rootfs.c initfs.c kernel.c cache.c sl.c stub.c sysdep.c hexdump.c argv.c Index: src/apps/pulse/Jamfile =================================================================== --- src/apps/pulse/Jamfile (revision 12364) +++ src/apps/pulse/Jamfile (working copy) @@ -30,5 +30,5 @@ SEARCH on [ FGristFiles strlcpy.c - ] = [ FDirName $(OBOS_TOP) src kernel libroot posix string ] ; + ] = [ FDirName $(OBOS_TOP) src system libroot posix string ] ; Index: src/add-ons/kernel/file_systems/udf/Jamfile =================================================================== --- src/add-ons/kernel/file_systems/udf/Jamfile (revision 12364) +++ src/add-ons/kernel/file_systems/udf/Jamfile (working copy) @@ -47,7 +47,7 @@ SEARCH on [ FGristFiles kernel_cpp.cpp - ] = [ FDirName $(OBOS_TOP) src kernel core util ] ; + ] = [ FDirName $(OBOS_TOP) src system kernel util ] ; rule InstallUDF Index: src/add-ons/kernel/drivers/audio/echo/24/Jamfile =================================================================== --- src/add-ons/kernel/drivers/audio/echo/24/Jamfile (revision 12364) +++ src/add-ons/kernel/drivers/audio/echo/24/Jamfile (working copy) @@ -63,7 +63,7 @@ SEARCH on [ FGristFiles kernel_cpp.cpp - ] = [ FDirName $(OBOS_TOP) src kernel core util ] ; + ] = [ FDirName $(OBOS_TOP) src system kernel util ] ; SEARCH on [ FGristFiles debug.c Index: src/add-ons/kernel/drivers/audio/echo/gals/Jamfile =================================================================== --- src/add-ons/kernel/drivers/audio/echo/gals/Jamfile (revision 12364) +++ src/add-ons/kernel/drivers/audio/echo/gals/Jamfile (working copy) @@ -59,7 +59,7 @@ SEARCH on [ FGristFiles kernel_cpp.cpp - ] = [ FDirName $(OBOS_TOP) src kernel core util ] ; + ] = [ FDirName $(OBOS_TOP) src system kernel util ] ; SEARCH on [ FGristFiles debug.c Index: src/libs/stdc++/Jamfile =================================================================== --- src/libs/stdc++/Jamfile (revision 12364) +++ src/libs/stdc++/Jamfile (working copy) @@ -11,13 +11,13 @@ # but this doesn't work yet, as the libio we are using here and the one # contained in our libroot are different versions. HDRS = - [ FDirName $(OBOS_TOP) src kernel libroot posix glibc libio ] - [ FDirName $(OBOS_TOP) src kernel libroot posix glibc stdlib ] - [ FDirName $(OBOS_TOP) src kernel libroot posix glibc stdio-common ] - [ FDirName $(OBOS_TOP) src kernel libroot posix glibc include ] - [ FDirName $(OBOS_TOP) src kernel libroot posix glibc include arch x86 ] + [ FDirName $(OBOS_TOP) src system libroot posix glibc libio ] + [ FDirName $(OBOS_TOP) src system libroot posix glibc stdlib ] + [ FDirName $(OBOS_TOP) src system libroot posix glibc stdio-common ] + [ FDirName $(OBOS_TOP) src system libroot posix glibc include ] + [ FDirName $(OBOS_TOP) src system libroot posix glibc include arch x86 ] [ FDirName $(OBOS_TOP) headers cpp ] - [ FDirName $(OBOS_TOP) src kernel libroot posix glibc ] + [ FDirName $(OBOS_TOP) src system libroot posix glibc ] [ FDirName $(OBOS_TOP) headers posix ] [ FDirName $(OBOS_TOP) headers os ] [ FDirName $(OBOS_TOP) headers os kernel ]