From 695f0b114bf724d98eb4aa786697723aeff375c7 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Thu, 4 Feb 2010 12:59:37 +0000
Subject: [PATCH] Moved resattr.cpp to src/bin, made it buildable for Haiku,
 and fixed a warning.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35406 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/bin/Jamfile                        | 1 +
 src/{tools/resattr => bin}/resattr.cpp | 7 ++++---
 src/tools/resattr/Jamfile              | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)
 rename src/{tools/resattr => bin}/resattr.cpp (98%)

diff --git a/src/bin/Jamfile b/src/bin/Jamfile
index 77a45c608b..586b895ae8 100644
--- a/src/bin/Jamfile
+++ b/src/bin/Jamfile
@@ -113,6 +113,7 @@ StdBinCommands
 	dstcheck.cpp
 	hey.cpp
 	reindex.cpp
+	resattr.cpp
 	settype.cpp
 	spybmessage.cpp
 	urlwrapper.cpp
diff --git a/src/tools/resattr/resattr.cpp b/src/bin/resattr.cpp
similarity index 98%
rename from src/tools/resattr/resattr.cpp
rename to src/bin/resattr.cpp
index 16e855d6b7..ec02f48daf 100644
--- a/src/tools/resattr/resattr.cpp
+++ b/src/bin/resattr.cpp
@@ -98,8 +98,9 @@ write_attributes(BNode &out, const char *inFileName, BResources &resources,
 		const void *data = resources.LoadResource(type, id, &size);
 		if (!data && size > 0) {
 			// should not happen
-			fprintf(stderr, "Failed to get resource `%s', type: %lx, id: %ld "
-				"from input file `%s'\n", name, type, id, inFileName);
+			fprintf(stderr, "Failed to get resource `%s', type: %" B_PRIx32
+				", id: %" B_PRId32 " from input file `%s'\n", name, type, id,
+				inFileName);
 			exit(1);
 		}
 
@@ -257,7 +258,7 @@ attributes_to_resources(const char *outputFile, const char **inputFiles,
 		}
 
 		// add the resources
-		
+
 		write_resources(resources, inputFiles[i], in, resID);
 	}
 }
diff --git a/src/tools/resattr/Jamfile b/src/tools/resattr/Jamfile
index 4c33c26ff6..504bc5a776 100644
--- a/src/tools/resattr/Jamfile
+++ b/src/tools/resattr/Jamfile
@@ -2,6 +2,7 @@ SubDir HAIKU_TOP src tools resattr ;
 
 USES_BE_API on <build>resattr = true ;
 
-BuildPlatformMain <build>resattr : resattr.cpp ;
-LinkAgainst <build>resattr : $(HOST_LIBBE) $(HOST_LIBSTDC++) $(HOST_LIBSUPC++) ;
+BuildPlatformMain <build>resattr : resattr.cpp
+	: $(HOST_LIBBE) $(HOST_LIBSUPC++) ;
 
+SEARCH on [ FGristFiles resattr.cpp ] = [ FDirName $(HAIKU_TOP) src bin ] ;