From 03598119a7dd0323ab7fd43b3d1e0affeb36b6ed Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 28 Sep 2014 11:46:29 +0200
Subject: [PATCH] libcolumnlistview: hybrid arch build, add to image

* This is a very useful control, and 3rd-party apps should be able to
use it.
* But, there are planned improvements (making a better model/view
interface) which prevents making it part of the stable API yet.
---
 build/jam/packages/HaikuDevel          | 3 ++-
 build/jam/packages/HaikuDevelSecondary | 3 ++-
 src/kits/interface/Jamfile             | 9 +++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/build/jam/packages/HaikuDevel b/build/jam/packages/HaikuDevel
index 93a8ca1baa..b0889aaf84 100644
--- a/build/jam/packages/HaikuDevel
+++ b/build/jam/packages/HaikuDevel
@@ -35,7 +35,8 @@ for lib in [ HaikuImageGetSystemLibs ] $(developmentLibs) {
 }
 
 # static libraries
-AddFilesToPackage develop lib : <$(architecture)>liblocalestub.a libshared.a ;
+AddFilesToPackage develop lib : libcolumnlistview.a
+	<$(architecture)>liblocalestub.a libshared.a ;
 
 # the POSIX error code mapper library
 AddFilesToPackage develop lib : libposix_error_mapper.a ;
diff --git a/build/jam/packages/HaikuDevelSecondary b/build/jam/packages/HaikuDevelSecondary
index 801c715045..6ee894b554 100644
--- a/build/jam/packages/HaikuDevelSecondary
+++ b/build/jam/packages/HaikuDevelSecondary
@@ -34,7 +34,8 @@ for lib in [ HaikuImageGetSystemLibs ] $(developmentLibs) {
 
 # static libraries
 AddFilesToPackage develop lib $(architecture)
-	: <$(architecture)>liblocalestub.a <$(architecture)>libshared.a ;
+	: <$(architecture)>libcolumnlistview.a <$(architecture)>liblocalestub.a
+	<$(architecture)>libshared.a ;
 
 # the POSIX error code mapper library
 AddFilesToPackage develop lib $(architecture)
diff --git a/src/kits/interface/Jamfile b/src/kits/interface/Jamfile
index 0636d30d99..af100e0bfc 100644
--- a/src/kits/interface/Jamfile
+++ b/src/kits/interface/Jamfile
@@ -154,10 +154,11 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 
 			: [ MultiArchDefaultGristFiles libshared.a ]
 			;
+
+		StaticLibrary [ MultiArchDefaultGristFiles libcolumnlistview.a ] :
+			ColumnListView.cpp
+			ColumnTypes.cpp
+		;
 	}
 }
 
-StaticLibrary libcolumnlistview.a :
-	ColumnListView.cpp
-	ColumnTypes.cpp
-;