diff --git a/src/bin/Jamfile b/src/bin/Jamfile
index 6f35befabb..e89be6596d 100644
--- a/src/bin/Jamfile
+++ b/src/bin/Jamfile
@@ -201,6 +201,7 @@ SubInclude HAIKU_TOP src bin patch ;
SubInclude HAIKU_TOP src bin pc ;
SubInclude HAIKU_TOP src bin pcmcia-cs ;
SubInclude HAIKU_TOP src bin playsound ;
+SubInclude HAIKU_TOP src bin rc ;
SubInclude HAIKU_TOP src bin rmd160 ;
SubInclude HAIKU_TOP src bin screen_blanker ;
SubInclude HAIKU_TOP src bin sed ;
diff --git a/src/tools/rc/Doxyfile b/src/bin/rc/Doxyfile
similarity index 100%
rename from src/tools/rc/Doxyfile
rename to src/bin/rc/Doxyfile
diff --git a/src/bin/rc/Jamfile b/src/bin/rc/Jamfile
new file mode 100644
index 0000000000..79e2be29b0
--- /dev/null
+++ b/src/bin/rc/Jamfile
@@ -0,0 +1,32 @@
+SubDir HAIKU_TOP src bin rc ;
+
+SetSubDirSupportedPlatformsBeOSCompatible ;
+
+GENERATE_C++ on [ FGristFiles lexer.l parser.y ] = true ;
+
+SubDirC++Flags -Wno-sign-compare -Wno-unused ;
+
+local r5Compatibility = [ FDirName $(SUBDIR) R5Compatibility.h ] ;
+SubDirCcFlags -include $(r5Compatibility) ;
+SubDirC++Flags -include $(r5Compatibility) ;
+
+StaticLibrary librdef.a :
+ compile.cpp decompile.cpp lexer.l parser.y rdef.cpp ;
+
+# On BeOS incompatible platforms we implicitly link against libroot_build.so,
+# which does already include the strl*() routines.
+local strlSources ;
+if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
+ strlSources = strlcpy.c strlcat.c ;
+}
+
+BinCommand rc :
+ rc.cpp
+
+ # these two are needed for R5 only
+ $(strlSources)
+ : librdef.a $(TARGET_LIBSTDC++) be $(TARGET_LIBSUPC++)
+;
+
+SEARCH on [ FGristFiles $(strlSources) ]
+ = [ FDirName $(HAIKU_TOP) src system libroot posix string ] ;
diff --git a/src/tools/rc/Makefile b/src/bin/rc/Makefile
similarity index 100%
rename from src/tools/rc/Makefile
rename to src/bin/rc/Makefile
diff --git a/src/tools/rc/R5Compatibility.h b/src/bin/rc/R5Compatibility.h
similarity index 100%
rename from src/tools/rc/R5Compatibility.h
rename to src/bin/rc/R5Compatibility.h
diff --git a/src/tools/rc/compile.cpp b/src/bin/rc/compile.cpp
similarity index 100%
rename from src/tools/rc/compile.cpp
rename to src/bin/rc/compile.cpp
diff --git a/src/tools/rc/compile.h b/src/bin/rc/compile.h
similarity index 100%
rename from src/tools/rc/compile.h
rename to src/bin/rc/compile.h
diff --git a/src/tools/rc/decompile.cpp b/src/bin/rc/decompile.cpp
similarity index 100%
rename from src/tools/rc/decompile.cpp
rename to src/bin/rc/decompile.cpp
diff --git a/src/tools/rc/docs/beres-deres.html b/src/bin/rc/docs/beres-deres.html
similarity index 100%
rename from src/tools/rc/docs/beres-deres.html
rename to src/bin/rc/docs/beres-deres.html
diff --git a/src/tools/rc/docs/grammar.html b/src/bin/rc/docs/grammar.html
similarity index 100%
rename from src/tools/rc/docs/grammar.html
rename to src/bin/rc/docs/grammar.html
diff --git a/src/tools/rc/docs/history.html b/src/bin/rc/docs/history.html
similarity index 100%
rename from src/tools/rc/docs/history.html
rename to src/bin/rc/docs/history.html
diff --git a/src/tools/rc/docs/librdef.html b/src/bin/rc/docs/librdef.html
similarity index 100%
rename from src/tools/rc/docs/librdef.html
rename to src/bin/rc/docs/librdef.html
diff --git a/src/tools/rc/docs/notes.html b/src/bin/rc/docs/notes.html
similarity index 99%
rename from src/tools/rc/docs/notes.html
rename to src/bin/rc/docs/notes.html
index 4ad189c39b..a6fa19c23a 100644
--- a/src/tools/rc/docs/notes.html
+++ b/src/bin/rc/docs/notes.html
@@ -1,43 +1,43 @@
-
-
-Work notes
-
-
-
-Work notes
-
-These are my notes on the evolution of rc. I used to keep these in separate files on my development machine, but it makes more sense to include them here. Warning: geeky stuff ahead.
-
-
-
-- Unlike in most parsers, the unary minus operator is currently not part of the 'data' rules, but of 'integer' and 'float'. When expression support is more complete, it may make more sense to put this in 'data'. However, 'integer' is used in other places as well and these places allow negative numbers too. Maybe we can replace the calls to 'integer' with 'data' and allow the data to the integer only (by always trying to cast it, perhaps). Then you can do stuff like 'resource(10 + 1) 123;' But maybe that goes too far.
-
-- When filling in boolean fields of user-defined types or messages, you can do either "field = true" or "field = false". I thought it would be nice if you could also do just "field" and "!field". However, that introduced a reduce/reduce conflict in the parser. You see, the name of the field is an IDENT token, but we already have something like that in the 'type' rule of 'data'. The parser doesn't know what the IDENT is supposed to be: the name of the boolean field or the name of the type. Maybe there is a solution for this by shuffling around the parser rules a bit.
-
-- Support for the built-in types point, rect, and rgb_color is currently hardcoded into the decompiler. The other built-in types -- app_flags, mini_icon, etc -- are not supported at all. It would be better to use the type symbol table for this as well. Then the decompiler can also support user-defined types (although these type definitions must be provided to the decompiler somehow). This is advanced stuff that probably no one will ever use.
-
-- The builtin types are added to the symbol table "by hand". You can see this near the bottom of 'parser.y'. This is a bit cumbersome, so I have devised an alternative. We put the builtin type definitions in an rdef script and install this in a "standard include dir", for example: ~/config/include/rc. Before it compiles the user's rdef files, the compiler first loads all scripts from that standard folder. (This also allows us to use these rdef files for decompiling, and users can simply install their own. See above.)
-
-- In "auto names" mode, the decompiler currently does not use the enum symbol table. So if two resources have the same name and that name is a valid C/C++ identifier, the decompiler will add two conflicting symbols to the enum statement. This can also happen when multiple input files have conflicting resource IDs.
-
-- When you decompile certain apps (BeMail, Slayer) and then compile these rdef files again, the archive and message fields in the new .rsrc file are larger than the original's. I think this is because rc doesn't add the message fields as "fixedSize" (see the BMessage docs from the BeBook). This doesn't really hurt, though, since the BMessage will be properly unflattened regardless.
-
-- Right now, archives are treated as messages. Maybe we should give them their own type, B_ARCHIVED_OBJECT (type code 'ARCV').
-
-- New options, stolen from other resource compilers (rez and beres):
-
-
-- -D --define symbol[=value] set the value of symbol to value (or 1 if no value supplied)
-- --no-names do not write any names in resource file
-- -h write resource as C struct in a header file
-- -d dump resource to stdout
-
-
-- Attributes. I would be nice to have a tool that can take text-based descriptions of attributes and write out an attribute file. Of course, rc is the ideal candidate for this, since it already does the same for resources. However, resources and attributes are not the same. Attributes are name/data pairs. The name should be unique. They don't have IDs. They do have a type code, but it isn't used to identify the attribute. It is probably best to add a new kind of definition: attribute(). Should this statement allow only simple data, or must attributes be able to handle flattened messages, arrays, etc too? A source file should either contain resource() statements or attribute() statements, not both.
-
-- User-defined symbolic constants. To keep things simple, adding a #define keyword would suffice, although this always creates global symbols so there is a chance of name collisions. In addition (or instead) we can extend user-defined types to have their own (local) defines too. If we use the #define keyword, we should infer the type of the constant from the data (100 is integer, 10.5 is a float, etc). This is necessary because we don't have a separate preprocessor step like C/C++ does -- that is why our symbolic constants are typed.
-
-
-
-
-
+
+
+Work notes
+
+
+
+Work notes
+
+These are my notes on the evolution of rc. I used to keep these in separate files on my development machine, but it makes more sense to include them here. Warning: geeky stuff ahead.
+
+
+
+- Unlike in most parsers, the unary minus operator is currently not part of the 'data' rules, but of 'integer' and 'float'. When expression support is more complete, it may make more sense to put this in 'data'. However, 'integer' is used in other places as well and these places allow negative numbers too. Maybe we can replace the calls to 'integer' with 'data' and allow the data to the integer only (by always trying to cast it, perhaps). Then you can do stuff like 'resource(10 + 1) 123;' But maybe that goes too far.
+
+- When filling in boolean fields of user-defined types or messages, you can do either "field = true" or "field = false". I thought it would be nice if you could also do just "field" and "!field". However, that introduced a reduce/reduce conflict in the parser. You see, the name of the field is an IDENT token, but we already have something like that in the 'type' rule of 'data'. The parser doesn't know what the IDENT is supposed to be: the name of the boolean field or the name of the type. Maybe there is a solution for this by shuffling around the parser rules a bit.
+
+- Support for the built-in types point, rect, and rgb_color is currently hardcoded into the decompiler. The other built-in types -- app_flags, mini_icon, etc -- are not supported at all. It would be better to use the type symbol table for this as well. Then the decompiler can also support user-defined types (although these type definitions must be provided to the decompiler somehow). This is advanced stuff that probably no one will ever use.
+
+- The builtin types are added to the symbol table "by hand". You can see this near the bottom of 'parser.y'. This is a bit cumbersome, so I have devised an alternative. We put the builtin type definitions in an rdef script and install this in a "standard include dir", for example: ~/config/include/rc. Before it compiles the user's rdef files, the compiler first loads all scripts from that standard folder. (This also allows us to use these rdef files for decompiling, and users can simply install their own. See above.)
+
+- In "auto names" mode, the decompiler currently does not use the enum symbol table. So if two resources have the same name and that name is a valid C/C++ identifier, the decompiler will add two conflicting symbols to the enum statement. This can also happen when multiple input files have conflicting resource IDs.
+
+- When you decompile certain apps (BeMail, Slayer) and then compile these rdef files again, the archive and message fields in the new .rsrc file are larger than the original's. I think this is because rc doesn't add the message fields as "fixedSize" (see the BMessage docs from the BeBook). This doesn't really hurt, though, since the BMessage will be properly unflattened regardless.
+
+- Right now, archives are treated as messages. Maybe we should give them their own type, B_ARCHIVED_OBJECT (type code 'ARCV').
+
+- New options, stolen from other resource compilers (rez and beres):
+
+
+- -D --define symbol[=value] set the value of symbol to value (or 1 if no value supplied)
+- --no-names do not write any names in resource file
+- -h write resource as C struct in a header file
+- -d dump resource to stdout
+
+
+- Attributes. I would be nice to have a tool that can take text-based descriptions of attributes and write out an attribute file. Of course, rc is the ideal candidate for this, since it already does the same for resources. However, resources and attributes are not the same. Attributes are name/data pairs. The name should be unique. They don't have IDs. They do have a type code, but it isn't used to identify the attribute. It is probably best to add a new kind of definition: attribute(). Should this statement allow only simple data, or must attributes be able to handle flattened messages, arrays, etc too? A source file should either contain resource() statements or attribute() statements, not both.
+
+- User-defined symbolic constants. To keep things simple, adding a #define keyword would suffice, although this always creates global symbols so there is a chance of name collisions. In addition (or instead) we can extend user-defined types to have their own (local) defines too. If we use the #define keyword, we should infer the type of the constant from the data (100 is integer, 10.5 is a float, etc). This is necessary because we don't have a separate preprocessor step like C/C++ does -- that is why our symbolic constants are typed.
+
+
+
+
+
diff --git a/src/tools/rc/docs/rc.html b/src/bin/rc/docs/rc.html
similarity index 100%
rename from src/tools/rc/docs/rc.html
rename to src/bin/rc/docs/rc.html
diff --git a/src/tools/rc/docs/todo.html b/src/bin/rc/docs/todo.html
similarity index 100%
rename from src/tools/rc/docs/todo.html
rename to src/bin/rc/docs/todo.html
diff --git a/src/tools/rc/lexer.l b/src/bin/rc/lexer.l
similarity index 100%
rename from src/tools/rc/lexer.l
rename to src/bin/rc/lexer.l
diff --git a/src/tools/rc/parser.y b/src/bin/rc/parser.y
similarity index 100%
rename from src/tools/rc/parser.y
rename to src/bin/rc/parser.y
diff --git a/src/tools/rc/private.h b/src/bin/rc/private.h
similarity index 100%
rename from src/tools/rc/private.h
rename to src/bin/rc/private.h
diff --git a/src/tools/rc/rc.cpp b/src/bin/rc/rc.cpp
similarity index 100%
rename from src/tools/rc/rc.cpp
rename to src/bin/rc/rc.cpp
diff --git a/src/tools/rc/rdef.cpp b/src/bin/rc/rdef.cpp
similarity index 100%
rename from src/tools/rc/rdef.cpp
rename to src/bin/rc/rdef.cpp
diff --git a/src/tools/rc/rdef.h b/src/bin/rc/rdef.h
similarity index 100%
rename from src/tools/rc/rdef.h
rename to src/bin/rc/rdef.h
diff --git a/src/tools/rc/tests/all.rdef b/src/bin/rc/tests/all.rdef
similarity index 100%
rename from src/tools/rc/tests/all.rdef
rename to src/bin/rc/tests/all.rdef
diff --git a/src/tools/rc/tests/array.rdef b/src/bin/rc/tests/array.rdef
similarity index 100%
rename from src/tools/rc/tests/array.rdef
rename to src/bin/rc/tests/array.rdef
diff --git a/src/tools/rc/tests/builtin.rdef b/src/bin/rc/tests/builtin.rdef
similarity index 100%
rename from src/tools/rc/tests/builtin.rdef
rename to src/bin/rc/tests/builtin.rdef
diff --git a/src/tools/rc/tests/defaults.rdef b/src/bin/rc/tests/defaults.rdef
similarity index 100%
rename from src/tools/rc/tests/defaults.rdef
rename to src/bin/rc/tests/defaults.rdef
diff --git a/src/tools/rc/tests/enum.rdef b/src/bin/rc/tests/enum.rdef
similarity index 100%
rename from src/tools/rc/tests/enum.rdef
rename to src/bin/rc/tests/enum.rdef
diff --git a/src/tools/rc/tests/expr.rdef b/src/bin/rc/tests/expr.rdef
similarity index 100%
rename from src/tools/rc/tests/expr.rdef
rename to src/bin/rc/tests/expr.rdef
diff --git a/src/tools/rc/tests/import.txt b/src/bin/rc/tests/import.txt
similarity index 100%
rename from src/tools/rc/tests/import.txt
rename to src/bin/rc/tests/import.txt
diff --git a/src/tools/rc/tests/message.rdef b/src/bin/rc/tests/message.rdef
similarity index 100%
rename from src/tools/rc/tests/message.rdef
rename to src/bin/rc/tests/message.rdef
diff --git a/src/tools/rc/tests/simple.rdef b/src/bin/rc/tests/simple.rdef
similarity index 100%
rename from src/tools/rc/tests/simple.rdef
rename to src/bin/rc/tests/simple.rdef
diff --git a/src/tools/rc/tests/type.rdef b/src/bin/rc/tests/type.rdef
similarity index 100%
rename from src/tools/rc/tests/type.rdef
rename to src/bin/rc/tests/type.rdef
diff --git a/src/tools/rc/Jamfile b/src/tools/rc/Jamfile
index 84896c8c69..0ed8df8c62 100644
--- a/src/tools/rc/Jamfile
+++ b/src/tools/rc/Jamfile
@@ -1,12 +1,14 @@
SubDir HAIKU_TOP src tools rc ;
+SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src bin rc ] ;
+
USES_BE_API on librdef.a rc = true ;
GENERATE_C++ on [ FGristFiles lexer.l parser.y ] = true ;
SubDirC++Flags -Wno-sign-compare -Wno-unused ;
-local r5Compatibility = [ FDirName $(SUBDIR) R5Compatibility.h ] ;
+local r5Compatibility = [ FDirName $(HAIKU_TOP) src bin rc R5Compatibility.h ] ;
SubDirCcFlags -include $(r5Compatibility) ;
SubDirC++Flags -include $(r5Compatibility) ;
@@ -25,9 +27,9 @@ BuildPlatformMain rc :
# these two are needed for R5 only
$(strlSources)
+
+ : librdef.a $(HOST_LIBSTDC++) $(HOST_LIBBE) $(HOST_LIBSUPC++)
;
-LinkAgainst rc
- : librdef.a $(HOST_LIBSTDC++) $(HOST_LIBBE) $(HOST_LIBSUPC++) ;
SEARCH on [ FGristFiles $(strlSources) ]
= [ FDirName $(HAIKU_TOP) src system libroot posix string ] ;