From: Paul K. <pki...@us...> - 2004-07-14 19:59:23
|
Update of /cvsroot/octave/octave-forge/main/gsl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25229 Modified Files: Makefile Log Message: Make sure -lgsl is used on all gsl oct-files. Symlinks shouldn't depend on base file. Index: Makefile =================================================================== RCS file: /cvsroot/octave/octave-forge/main/gsl/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile 7 Jul 2004 09:38:46 -0000 1.5 +++ Makefile 14 Jul 2004 19:59:13 -0000 1.6 @@ -4,14 +4,16 @@ SF_LINKS=$(shell grep octave_name $(SF_BUILDSCRIPT) | sed 's/^.*octave_name=\([[:alnum:]_]*\) *$$/\1.oct/g') RM=rm LN_S=ln -s -#LIBS=$(shell gsl-config --libs-without-cblas) -LIBS=-lgsl +#LIBGSL=$(shell gsl-config --libs-without-cblas) +LIBGSL=-lgsl # all compiled functions -PROGS=coupling_3j.oct coupling_6j.oct coupling_9j.oct legendre_sphPlm_array.oct gsl_sf.oct $(SF_LINKS) +PROGS=coupling_3j.oct coupling_6j.oct coupling_9j.oct legendre_sphPlm_array.oct gsl_sf.oct + +%.oct: %.cc ; $(MKOCTFILE) $< $(LIBGSL) ifdef HAVE_LIBGSL -all: gsl_sf.cc $(PROGS) +all: gsl_sf.cc $(PROGS) $(SF_LINKS) else all: endif @@ -21,10 +23,7 @@ gsl_sf.cc: $(SF_BUILDSCRIPT) /bin/sh $(SF_BUILDSCRIPT) -gsl_sf.oct: gsl_sf.cc - $(MKOCTFILE) $(LIBS) gsl_sf.cc - -$(SF_LINKS): gsl_sf.oct +$(SF_LINKS): -$(RM) -f $@ $(LN_S) gsl_sf.oct $@ |