Skip to content

Commit

Permalink
use $(DOWNLOAD) instead of a hardcoding curl -O in the external/Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
ViralBShah committed May 13, 2011
1 parent b28aad7 commit 23d8358
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
2 changes: 2 additions & 0 deletions Make.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ EXTROOT = $(JULIAHOME)/external/root
EXTROOTLIB = $(EXTROOT)/lib
LLVMROOT = $(EXTROOT)
OS = $(shell uname)
DOWNLOAD = curl -O
#DOWNLOAD = wget

CC = gcc
CXX = g++
Expand Down
14 changes: 9 additions & 5 deletions external/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ llvm: $(LLVM_OBJ)

READLINE_OBJ = $(EXTROOTLIB)/libreadline.$(SHLIB_EXT)
readline-$(READLINE_VER).tar.gz:
curl -O ftp:https://ftp.gnu.org/gnu/readline/readline-$(READLINE_VER).tar.gz
$(DOWNLOAD) ftp:https://ftp.gnu.org/gnu/readline/readline-$(READLINE_VER).tar.gz
readline-$(READLINE_VER): readline-$(READLINE_VER).tar.gz
tar zxf readline-$(READLINE_VER).tar.gz
$(READLINE_OBJ): readline-$(READLINE_VER)
Expand All @@ -50,7 +50,7 @@ readline_install: $(READLINE_OBJ) $(JULIALIB)

PCRE_OBJ = $(EXTROOTLIB)/libpcre.$(SHLIB_EXT)
pcre-$(PCRE_VER).tar.bz2:
curl -O ftp:https://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$(PCRE_VER).tar.bz2
$(DOWNLOAD) ftp:https://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$(PCRE_VER).tar.bz2
pcre-$(PCRE_VER): pcre-$(PCRE_VER).tar.bz2
tar jxvf pcre-$(PCRE_VER).tar.bz2
$(PCRE_OBJ): pcre-$(PCRE_VER)
Expand All @@ -65,7 +65,7 @@ fdlibmf/libmf.a: fdlibmf/*.c

FDLIBM_OBJ = $(EXTROOTLIB)/libfdm.$(SHLIB_EXT)
fdlibm.tar.gz:
curl -O -u anonymous:[email protected] ftp:https://netlib.org/fdlibm.tar.gz
$(DOWNLOAD) -u anonymous:[email protected] ftp:https://netlib.org/fdlibm.tar.gz
fdlibm: fdlibm.tar.gz
tar zxf fdlibm.tar.gz
$(FDLIBM_OBJ): fdlibm fdlibmf
Expand All @@ -75,7 +75,7 @@ fdlibm_install: $(FDLIBM_OBJ) $(JULIALIB)

LAPACK_OBJ = $(EXTROOTLIB)/libLAPACK.$(SHLIB_EXT)
lapack-$(LAPACK_VER).tgz:
curl -O https://www.netlib.org/lapack/lapack-$(LAPACK_VER).tgz
$(DOWNLOAD) https://www.netlib.org/lapack/lapack-$(LAPACK_VER).tgz
lapack-$(LAPACK_VER): lapack-$(LAPACK_VER).tgz
tar zxf lapack-$(LAPACK_VER).tgz
$(LAPACK_OBJ): lapack-$(LAPACK_VER)
Expand All @@ -87,8 +87,12 @@ $(LAPACK_OBJ): lapack-$(LAPACK_VER)
lapack_install: $(LAPACK_OBJ) $(JULIALIB)
ln -sf $(LAPACK_OBJ) $(JULIALIB)/libLAPACK.$(SHLIB_EXT)

arpack:
$(DOWNLOAD) https://www.caam.rice.edu/software/ARPACK/SRC/parpack96.tar.gz
curl -O https://www.caam.rice.edu/software/ARPACK/SRC/ppatch.tar.gz

mongoose-$(MONGOOSE_VER).tgz:
curl -O https://mongoose.googlecode.com/files/mongoose-$(MONGOOSE_VER).tgz
$(DOWNLOAD) https://mongoose.googlecode.com/files/mongoose-$(MONGOOSE_VER).tgz
mongoose-$(MONGOOSE_VER): mongoose-$(MONGOOSE_VER).tgz
tar zxf mongoose-$(MONGOOSE_VER).tgz
mongoose_install: mongoose-$(MONGOOSE_VER)
Expand Down

0 comments on commit 23d8358

Please sign in to comment.