aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCalvin <calvin@EESI>2013-03-26 14:15:57 -0400
committerCalvin <calvin@EESI>2013-03-26 14:15:57 -0400
commit82f5061a0ee200e6e27836e3607d1fe0db06c9da (patch)
treebd51cc47f9dbd66fef725c573946a20a99c1c16f
parent63f3535a58191997dd2f9704dda635a3bf3f8fce (diff)
added a updated makefile to FEAST to enable installation
-rwxr-xr-xFEAST/FSToolbox/FSToolboxMex.mexa64bin22290 -> 0 bytes
-rw-r--r--FEAST/FSToolbox/Makefile6
-rw-r--r--FEAST/MIToolbox/Makefile9
3 files changed, 14 insertions, 1 deletions
diff --git a/FEAST/FSToolbox/FSToolboxMex.mexa64 b/FEAST/FSToolbox/FSToolboxMex.mexa64
deleted file mode 100755
index 0015254..0000000
--- a/FEAST/FSToolbox/FSToolboxMex.mexa64
+++ /dev/null
Binary files differ
diff --git a/FEAST/FSToolbox/Makefile b/FEAST/FSToolbox/Makefile
index c0806a9..2ce5ec3 100644
--- a/FEAST/FSToolbox/Makefile
+++ b/FEAST/FSToolbox/Makefile
@@ -36,6 +36,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+PREFIX = /usr
CXXFLAGS = -O3 -fPIC
COMPILER = gcc
MITOOLBOXPATH = ../MIToolbox/
@@ -94,3 +95,8 @@ clean:
rm *.o
rm libFSToolbox.so
+.PHONY : install
+install:
+ $(MAKE)
+ @echo "installing libFSToolbox.so to $(PREFIX)/lib"
+ cp -v libFSToolbox.so $(PREFIX)/lib
diff --git a/FEAST/MIToolbox/Makefile b/FEAST/MIToolbox/Makefile
index 0135410..992e7cd 100644
--- a/FEAST/MIToolbox/Makefile
+++ b/FEAST/MIToolbox/Makefile
@@ -21,6 +21,7 @@
#You should have received a copy of the GNU Lesser General Public License
#along with MIToolbox. If not, see <http://www.gnu.org/licenses/>.
+PREFIX = /usr
CXXFLAGS = -O3 -fPIC
COMPILER = gcc
objects = ArrayOperations.o CalculateProbability.o Entropy.o \
@@ -80,5 +81,11 @@ intel:
.PHONY : clean
clean:
- rm *.o libMIToolbox.so
+ @rm -v *.o libMIToolbox.so
+
+.PHONY : install
+install:
+ $(MAKE)
+ @echo "installing libMIToolbox.so to $(PREFIX)/lib"
+ @cp -v libMIToolbox.so $(PREFIX)/lib