lpsolve/lp_solve-aix.patch | 39 ---------
lpsolve/lp_solve_5.5-windows.patch | 40 ---------
lpsolve/lp_solve_5.5.patch | 150 -------------------------------------
lpsolve/makefile.mk | 76 ++++++------------
ooo.lst.in | 2
5 files changed, 28 insertions(+), 279 deletions(-)
New commits:
commit 21155b8739b1a90455e75b9b527c75e27390455c
Author: Tomas Chvatal <tchva...@suse.cz>
Date: Mon May 14 19:10:15 2012 +0200
Update lpsolve to 5.5.2.0. Resolves bug fdo#39496.
Change-Id: I10b6043bf43d0b65a982a8c4f0067ac726189c53
diff --git a/lpsolve/lp_solve-aix.patch b/lpsolve/lp_solve-aix.patch
deleted file mode 100644
index 6ad5877..0000000
--- a/lpsolve/lp_solve-aix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- /dev/null 2010-07-28 04:47:47.000000000 -0500
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc.aix.gcc 2010-06-29
17:44:53.000000000 -0500
-@@ -0,0 +1,25 @@
-+src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c
../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c
../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c
../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c
../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c
../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-+c=$CC
-+
-+def=
-+so=
-+if [ "$PLATFORM" = "SCO_UNIX" ]
-+then def='-dy -K PIC -DNOLONGLONG'
-+ dl=-lc
-+else dl=-ldl
-+ so=y
-+fi
-+
-+opts='-O3'
-+
-+$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL
-I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-+ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
-+ranlib liblpsolve55.a
-+
-+if [ "$so" != "" ]
-+then
-+ $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-+ $c -shared $lpsolve_LDFLAGS -o liblpsolve55.so `echo $src|sed
s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
-+fi
-+
-+rm *.o 2>/dev/null
---- misc/lp_solve_5.5/lp_lib.h 2010-07-28 05:15:10.000000000 -0500
-+++ misc/build/lp_solve_5.5/lp_lib.h 2010-07-28 05:15:55.000000000 -0500
-@@ -56,7 +56,7 @@
- /* Define user program feature option switches
*/
- /* -------------------------------------------------------------------------
*/
-
--#if !defined _WINDOWS && !defined _WIN32 && !defined WIN32
-+#if !defined _WINDOWS && !defined _WIN32 && !defined WIN32 && !defined(_AIX)
- # define _isnan(x) FALSE
- #endif
-
diff --git a/lpsolve/lp_solve_5.5-windows.patch
b/lpsolve/lp_solve_5.5-windows.patch
deleted file mode 100644
index aae56fc..0000000
--- a/lpsolve/lp_solve_5.5-windows.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-*** misc/lp_solve_5.5/lpsolve55/cgcc.bat Sun Jun 12 04:27:28 2005
---- misc/build/lp_solve_5.5/lpsolve55/cgcc.bat Sun Dec 14 07:55:19 2008
-***************
-*** 7,14 ****
-
- set c=gcc
-
-! rem rc lpsolve.rc
-! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin
-enable-stdcall-fixup -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP
-DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% ..\lp_solve.def
-o lpsolve55.dll
-
- %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL
-DRoleIsExternalInvEngine %src% -o liblpsolve55.so
-
---- 7,14 ----
-
- set c=gcc
-
-! windres lpsolve.rc lpsolve_res.obj
-! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin
-enable-stdcall-fixup -mthreads %lpsolve_LDFLAGS% -D_USRDLL -DWIN32
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL
-DRoleIsExternalInvEngine %src% lpsolve_res.obj ..\lp_solve.def %lpsolve_LIBS%
-o lpsolve55.dll
-
- %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL
-DRoleIsExternalInvEngine %src% -o liblpsolve55.so
-
-*** misc/lp_solve_5.5/lpsolve55/lpsolve.rc Sun Jun 4 00:15:24 2006
---- misc/build/lp_solve_5.5/lpsolve55/lpsolve.rc Fri Nov 23 16:34:22 2007
-***************
-*** 7,13 ****
- //
- // Generated from the TEXTINCLUDE 2 resource.
- //
-! #include "afxres.h"
-
- /////////////////////////////////////////////////////////////////////////////
- #undef APSTUDIO_READONLY_SYMBOLS
---- 7,13 ----
- //
- // Generated from the TEXTINCLUDE 2 resource.
- //
-! #include "winresrc.h"
-
- /////////////////////////////////////////////////////////////////////////////
- #undef APSTUDIO_READONLY_SYMBOLS
diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch
deleted file mode 100644
index bca62f4..0000000
--- a/lpsolve/lp_solve_5.5.patch
+++ /dev/null
@@ -1,150 +0,0 @@
---- misc/build/lp_solve_5.5/lpsolve55/ccc.orig Sat Jun 11 21:27:18 2005
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc Sun May 22 11:20:19 2011
-@@ -1,25 +1,42 @@
- src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c
../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c
../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c
../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c
../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c
../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
--c=cc
-+ar=$AR
-+c=$CC
-+ranlib=$RANLIB
-
- def=
- so=
--if [ "$PLATFORM" = "SCO_UNIX" ]
--then def='-dy -K PIC -DNOLONGLONG'
-- dl=-lc
--else dl=-ldl
-- so=y
-+soprefix=
-+libs=
-+pic=
-+ldflags=
-+inline=
-+if [ "$GUI" = "WNT" -a "$COM" = "GCC" ]; then
-+ so=dll
-+ a=dll.a
-+ inline=-DINLINE=static
-+else
-+ so=so
-+ a=a
-+ soprefix=lib
-+ libs="-lm"
-+ pic=-fpic
-+ ldflags="-Wl,-Bsymbolic -Wl,-soname,liblpsolve55.$so"
- fi
-
-+if [ "$OS" = "LINUX" ]; then
-+ libs="$libs -ldl"
-+fi
-+
- opts='-O3'
-
--$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL
-I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-+$c -s $inline -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL
-I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
--ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
--ranlib liblpsolve55.a
-+$ar rv liblpsolve55.$a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
-+$ranlib liblpsolve55.$a
-
- if [ "$so" != "" ]
- then
-- $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-- $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so
`echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
-+ $c $pic -s $inline -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-+ $c -shared $ldflags -o ${soprefix}lpsolve55.$so `echo $src|sed
s/[.]c/.o/g|sed 's/[^ ]*\///g'` $libs
- fi
-
- rm *.o 2>/dev/null
---- misc/build/lp_solve_5.5/lpsolve55/ccc.osx.orig Thu Jun 23 22:53:08 2005
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx Sun May 22 11:19:48 2011
-@@ -1,23 +1,36 @@
- src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c
../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c
../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c
../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c
../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c
../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
--c=cc
-+c=$CC
-
-+if test -n "$verbose"; then
-+ set -x
-+fi
-+
- def=
- so=
-+extra_cflags=$EXTRA_CFLAGS
-+extra_cdefs=$EXTRA_CDEFS
-+extra_linkflags=$EXTRA_LINKFLAGS
-+
- if [ "$PLATFORM" = "SCO_UNIX" ]
- then def='-DLoadInverseLib=0 -DLoadLanguageLib=0 -D__HYPER=long'
- else dl=-ldl
- so=y
- fi
-
--opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME -Wno-long-double'
-+if [ "$HAVE_GCC_NO_LONG_DOUBLE" = "YES" ] ; then
-+ opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME -Wno-long-double'
-+else
-+ opts='-idirafter /usr/include/sys -O3 -DINTEGERTIME'
-+fi
-+
-
--$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL
-I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-+$c $extra_cflags -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL
-I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine
$extra_cdefs $src
- libtool -static -o liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^
]*\///g'`
-
- if [ "$so" != "" ]
- then
-- $c -fPIC -fno-common -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-- $c -dynamiclib liblpsolve55.a -compatibility_version 5.5.0 -current_version
5.5.0 -o liblpsolve55.dylib `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc
-+ $c $extra_cflags -fPIC -fno-common -s -c -I.. -I../shared -I../bfp
-I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts
-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL
-DRoleIsExternalInvEngine $extra_cdefs $src
-+ $c $extra_linkflags -dynamiclib liblpsolve55.a -compatibility_version 5.5.0
-current_version 5.5.0 -o liblpsolve55.dylib `echo $src|sed s/[.]c/.o/g|sed
's/[^ ]*\///g'` -lc
- fi
-
- rm *.o 2>/dev/null
---- misc/build/lp_solve_5.5/lpsolve55/ccc.solaris.orig Sun May 22 11:19:48 2011
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc.solaris Sun May 22 11:19:48 2011
-@@ -1 +1,31 @@
--dummy
-+src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c
../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c
../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c
../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c
../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c
../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-+c=$CC
-+
-+if [ "$CPU" = "U" -o "$CPU" = "X" ]
-+then
-+ extra_cflags=-m64
-+ extra_linkflags=-m64
-+fi
-+
-+def=
-+so=
-+if [ "$PLATFORM" = "SCO_UNIX" ]
-+then def='-dy -K PIC -DNOLONGLONG'
-+ dl=-lc
-+else dl=-ldl
-+ so=y
-+fi
-+
-+opts='-xO3'
-+
-+$c $extra_cflags -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL
-I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-+ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
-+ranlib liblpsolve55.a
-+
-+if [ "$so" != "" ]
-+then
-+ $c $extra_cflags -K PIC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL
-I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-+ $c $extra_linkflags -G -Bsymbolic -h liblpsolve55.so -o liblpsolve55.so
`echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` $SOLARLIB -lc -lm -ldl
-+fi
-+
-+rm *.o 2>/dev/null
---- misc/build/lp_solve_5.5/lpsolve55/ccc.ios.orig Sun May 22 11:19:48 2011
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc.ios Sun May 22 11:19:48 2011
-@@ -1 +1,11 @@
--dummy
-+src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c
../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c
../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c
../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c
../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c
../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-+obj=`echo $src|sed -e 's/\.c/.o/g' -e 's!\([^ ]*/\)*!!g'`
-+
-+opts='-O3'
-+
-+def=
-+
-+$CC -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd
-I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP
-DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine -c $src
-+ls -l
-+ar -r liblpsolve55.a $obj
-+rm $obj
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk
index c91e3a0..8c7fc32 100644
--- a/lpsolve/makefile.mk
+++ b/lpsolve/makefile.mk
@@ -36,65 +36,43 @@ TARGET=lpsolve
# --- Files --------------------------------------------------------
-TARFILE_NAME=lp_solve_5.5
-TARFILE_MD5=26b3e95ddf3d9c077c480ea45874b3b8
-
-.IF "$(GUI_FOR_BUILD)"=="WNT"
-PATCH_FILES=lp_solve_5.5-windows.patch
-.ELSE
-PATCH_FILES=\
- lp_solve_5.5.patch \
- lp_solve-aix.patch
-ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.ios
-.ENDIF
+TARFILE_NAME=$(PRJNAME)-5.5.2.0
+TARFILE_MD5=b7aeff93c2cf713056b30f832843ba3e
CONFIGURE_DIR=
-CONFIGURE_ACTION=
+CONFIGURE_ACTION=.$/configure
CONFIGURE_FLAGS=
+.IF "$(CROSS_COMPILING)"=="YES"
+BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+CONFIGURE_FLAGS+=$(BUILD_AND_HOST)
+.ENDIF # "$(CROSS_COMPILING)"=="YES"
+
+.IF "$(OS)"=="IOS"
+CONFIGURE_FLAGS+=--disable-shared
+.ELSE # "$(OS)"=="IOS"
+CONFIGURE_FLAGS+=--disable-static
+.ENDIF # "$(OS)"=="IOS"
+
+BUILD_DIR=$(CONFIGURE_DIR)
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
+
+OUTDIR2INC=.$/
-BUILD_DIR=lpsolve55
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
-lpsolve_LDFLAGS=-shared-libgcc
-.ENDIF
-.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP)
-.ENDIF
-.IF "$(GUI_FOR_BUILD)"=="WNT"
-BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS)
cmd /c cgcc.bat
-.ELSE
-BUILD_ACTION=sh ccc
-OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dll.a
-.ENDIF
-.ELSE
-BUILD_ACTION=cmd /c cvc6.bat
-OUT2LIB=$(BUILD_DIR)$/lpsolve55.lib
-.ENDIF
-OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll
-.ELSE
.IF "$(OS)"=="MACOSX"
-.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS verbose
-BUILD_ACTION=sh ccc.osx
-OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dylib
+EXTRPATH=URELIB
+OUT2LIB+=.libs$/liblpsolve55.*.dylib
.ELIF "$(OS)"=="IOS"
-.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS
-BUILD_ACTION=sh ccc.ios
-OUT2LIB=$(BUILD_DIR)$/liblpsolve55.a
-.ELSE
-.IF "$(COMNAME)"=="sunpro5"
-BUILD_ACTION=sh ccc.solaris
-.ELIF "$(OS)$(COM)"=="AIXGCC"
-BUILD_ACTION=lpsolve_LDFLAGS="$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)" sh
ccc.aix.gcc
+OUT2LIB+=.libs$/liblpsolve55.a
+.ELIF "$(OS)"=="WNT"
+.IF "$(COM)"=="GCC"
+OUT2LIB+=.libs$/liblpsolve55*.a
.ELSE
-BUILD_ACTION=sh ccc
-.ENDIF
-OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
+OUT2LIB+=win32$/bin.msvc$/*.lib
.ENDIF
+.ELSE
+OUT2LIB+=.libs$/liblpsolve55.so*
.ENDIF
-OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h
lp_SOS.h
-
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
diff --git a/ooo.lst.in b/ooo.lst.in
index e31a791..77bac56 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -9,7 +9,7 @@ e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html
-26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
+b7aeff93c2cf713056b30f832843ba3e-lpsolve-5.5.2.0.tar.xz
284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
