summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fondu/makefile.mk69
-rw-r--r--fondu/prj/build.lst2
-rw-r--r--fondu/prj/d.lst2
-rw-r--r--lpsolve/lp_solve_5.5.patch5
4 files changed, 4 insertions, 74 deletions
diff --git a/fondu/makefile.mk b/fondu/makefile.mk
deleted file mode 100644
index b684461e0e34..000000000000
--- a/fondu/makefile.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=fondu
-TARGET=fondu
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=fondu_src-051010
-
-.IF "$(OS)"!="MACOSX" || "$(GUIBASE)"=="aqua"
-dummy:
- @echo "Nothing to build for OS $(OS)"
-.ENDIF # "$(OS)"!="MACOSX" || "$(GUIBASE)"=="aqua"
-
-CONFIGURE_DIR=.
-
-#relative to CONFIGURE_DIR
-CONFIGURE_ACTION=configure
-
-CONFIGURE_FLAGS=
-
-BUILD_DIR=$(CONFIGURE_DIR)
-
-BUILD_ACTION=$(GNUMAKE) fondu
-
-OUT2BIN=$(BUILD_DIR)$/fondu
-
-# --- Targets ------------------------------------------------------
-
-# contains some necessary variables.
-
-.INCLUDE : set_ext.mk
-
-.INCLUDE : target.mk
-
-# contains the "magic" to create targets out of the set variables.
-
-.INCLUDE : tg_ext.mk
diff --git a/fondu/prj/build.lst b/fondu/prj/build.lst
deleted file mode 100644
index d99a2c230c02..000000000000
--- a/fondu/prj/build.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-fd fondu : solenv NULL
-fd fondu nmake - u fd_fondu NULL
diff --git a/fondu/prj/d.lst b/fondu/prj/d.lst
deleted file mode 100644
index d68d83e80b74..000000000000
--- a/fondu/prj/d.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\fondu
-..\%__SRC%\bin\fondu %_DEST%\bin%_EXT%\fondu
diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch
index fc446a4e5727..c6c780668554 100644
--- a/lpsolve/lp_solve_5.5.patch
+++ b/lpsolve/lp_solve_5.5.patch
@@ -26,7 +26,10 @@
+rm *.o 2>/dev/null
--- misc/lp_solve_5.5/lpsolve55/ccc.osx Thu Jun 23 22:53:08 2005
+++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx Wed May 21 17:19:56 2008
-@@ -3,6 +3,10 @@
+@@ -1,8 +1,12 @@
+ 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
def=
so=