From d9c5a02fff69b35b708a64b79b68cda2177ae02e Mon Sep 17 00:00:00 2001
From: Clemens Zeidler <clemens.zeidler@googlemail.com>
Date: Mon, 4 Oct 2010 19:32:35 +0000
Subject: [PATCH] Put liblinprog.so into a static library and compile it into
 libalm.so.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38886 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/HaikuImage       |  2 +-
 src/libs/alm/Jamfile       |  2 +-
 src/libs/linprog/Jamfile   |  4 +---
 src/tests/libs/alm/Jamfile | 12 ++++++------
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 55a1212ddb..26e9d74039 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -96,7 +96,7 @@ SYSTEM_LIBS =
 PRIVATE_SYSTEM_LIBS =
 	libfluidsynth.so
 	libilmimf.so
-	liblinprog.so liblpsolve55.so
+	liblpsolve55.so
 ;
 SYSTEM_SERVERS = app_server cddb_daemon debug_server input_server mail_daemon
 	media_addon_server media_server midi_server mount_server net_server
diff --git a/src/libs/alm/Jamfile b/src/libs/alm/Jamfile
index cd17f88565..24caf9656d 100644
--- a/src/libs/alm/Jamfile
+++ b/src/libs/alm/Jamfile
@@ -13,5 +13,5 @@ SharedLibrary libalm.so :
 	ALMLayout.cpp
 	Row.cpp
 	:
-	be liblpsolve55.so liblinprog.so $(TARGET_LIBSTDC++)
+	liblpsolve55.so liblinprog.a be $(TARGET_LIBSTDC++)
 ;
diff --git a/src/libs/linprog/Jamfile b/src/libs/linprog/Jamfile
index 5b8f77d4e3..5431f51e45 100644
--- a/src/libs/linprog/Jamfile
+++ b/src/libs/linprog/Jamfile
@@ -5,13 +5,11 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
 UseLibraryHeaders lp_solve linprog ;
 UsePrivateHeaders shared ;
 
-SharedLibrary liblinprog.so : 
+StaticLibrary liblinprog.a : 
 	Constraint.cpp
 	LinearSpec.cpp
 	Summand.cpp
 	PenaltyFunction.cpp
 	Variable.cpp
-	:
-	be liblpsolve55.so $(TARGET_LIBSUPC++)
 ;
 
diff --git a/src/tests/libs/alm/Jamfile b/src/tests/libs/alm/Jamfile
index 2a1d71ed96..df3d16b3a5 100644
--- a/src/tests/libs/alm/Jamfile
+++ b/src/tests/libs/alm/Jamfile
@@ -9,35 +9,35 @@ UsePrivateHeaders shared ;
 Application ALMHelloWorld :
 	HelloWorld.cpp
 	:
-	be liblpsolve55.so liblinprog.so libalm.so $(TARGET_LIBSUPC++)
+	be liblpsolve55.so libalm.so $(TARGET_LIBSUPC++)
 ;
 
 Application ALMViews :
 	Views.cpp
 	:
-	be liblpsolve55.so be liblinprog.so libalm.so $(TARGET_LIBSUPC++)
+	be liblpsolve55.so be libalm.so $(TARGET_LIBSUPC++)
 ;
 
 Application ALMPinwheel :
 	Pinwheel.cpp
 	:
-	be liblpsolve55.so be liblinprog.so libalm.so $(TARGET_LIBSUPC++)
+	be liblpsolve55.so be libalm.so $(TARGET_LIBSUPC++)
 ;
 
 Application ALMAreas :
 	Areas.cpp
 	:
-	be liblpsolve55.so be liblinprog.so libalm.so $(TARGET_LIBSUPC++)
+	be liblpsolve55.so be libalm.so $(TARGET_LIBSUPC++)
 ;
 
 Application ALMTableDemo :
 	TableDemo.cpp
 	:
-	be liblpsolve55.so be liblinprog.so libalm.so $(TARGET_LIBSUPC++)
+	be liblpsolve55.so be libalm.so $(TARGET_LIBSUPC++)
 ;
 
 Application ALMOperator :
 	OperatorLayout.cpp
 	:
-	be liblpsolve55.so be liblinprog.so libalm.so $(TARGET_LIBSTDC++)
+	be liblpsolve55.so be libalm.so $(TARGET_LIBSTDC++)
 ;