Commit 0ffb5496 authored by Daniel Brown's avatar Daniel Brown

fixing makefiles to use cuba 3.2, not sure why this wasnt dont in the merge...

parents 0d6d85dd de0dc47b
......@@ -81,7 +81,7 @@ realclean:
$(MAKE) --directory=$$d clean; \
done
rm lib/KLUsparse/*/Lib/*.a;
rm lib/Cuba-3.0/*.a;
rm lib/Cuba-3.2/*.a;
# print out the possible options to pass to make
help:
......
......@@ -191,10 +191,10 @@ build()
{
echo "Configuring CUBA" | tee -a $LOGFILE
pwdbefore=`pwd`
if [ ! -f "./lib/Cuba-3.0/config.h" ];
# configure cuba if needed
if [ ! -f "./lib/Cuba-3.2/config.h" ];
then
cd ./lib/Cuba-3.0
cd ./lib/Cuba-3.2
chmod 700 ./configure
if [[ $platform == "mac" ]]
......
......@@ -4,9 +4,9 @@
MKDIR = mkdir -p
.PHONY: sparse clean SuperLU_MT_2.1 NICSLU formulc libkatnet libMNet KLUsparse Cuba-3.0
.PHONY: sparse clean SuperLU_MT_2.1 NICSLU formulc libkatnet libMNet KLUsparse Cuba-3.2
default : sparse SuperLU_MT_2.1 NICSLU formulc libkatnet libMNet KLUsparse Cuba-3.0
default : sparse SuperLU_MT_2.1 NICSLU formulc libkatnet libMNet KLUsparse Cuba-3.2
# build the sparse package
SuperLU_MT_2.1:
......@@ -35,17 +35,17 @@ KLUsparse:
$(MAKE) --directory=$@ ARCH=$(ARCH)
# build the cuba package
Cuba-3.0:
Cuba-3.2:
$(MAKE) lib --directory=$@ ARCH=$(ARCH)
cp ./Cuba-3.0/cuba.h ../src/
cp ./Cuba-3.2/cuba.h ../src/
# cleanup targets
clean:
for d in sparse formulc libkatnet libMNet KLUsparse Cuba-3.0 SuperLU_MT_2.1 NICSLU; \
for d in sparse formulc libkatnet libMNet KLUsparse Cuba-3.2 SuperLU_MT_2.1 NICSLU; \
do \
$(MAKE) --directory=$$d clean; \
done
rm ./Cuba-3.0/libcuba.a
rm ./Cuba-3.2/libcuba.a
rm ./KLUsparse/KLU/Lib/lib*.a
rm ./KLUsparse/COLAMD/Lib/lib*.a
rm ./KLUsparse/BTF/Lib/lib*.a
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment