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

@@ -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

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++)
 ;

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++)
 ;
 

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++)
 ;