Updating gcc+atlas+gstreamer-1.0 makefile

gstlal-inspiral/share/ER9/optimised/Makefile.ligosoftware_gcc_sl7_gstreamer-1.0

@@ -4,7 +4,7 @@
 #
 
 # albert.einstein for git checkout
-USER=duncan.meacher
+USER=chad.hanna
 
 # Set directories and paths
 SRC_DIR:=src
@@ -41,10 +41,10 @@ SWIG=swig-2.0.11
 METAIO=metaio-8.4.0
 LIBFRAME=libframe-8.21
 OPROFILE=oprofile-0.9.9
-GSTPYTHON=gst-python-1.8.2
-GSTPLUGINSGOOD=gst-plugins-good-1.8.2
-GSTPLUGINSBASE=gst-plugins-base-1.8.2
-GSTREAMER=gstreamer-1.8.2
+GSTPYTHON=gst-python-1.4.0
+GSTPLUGINSGOOD=gst-plugins-good-1.4.5
+GSTPLUGINSBASE=gst-plugins-base-1.4.5
+GSTREAMER=gstreamer-1.4.5
 GSL=gsl-1.16
 ORC=orc-0.4.25
 FFTW=fftw-3.3.4
@@ -62,7 +62,9 @@ env.sh :
 	echo 'unset GST_PLUGIN_PATH PYTHONPATH' > $@
 	echo 'unset LD_LIBRARY_PATH LIBRARY_PATH' >> $@
 	echo 'LAL_PATH=${PWD}/opt' >> $@
-	echo 'export CFLAGS="-fPIC -O3 -march=native -L${ATLAS_PATH} -lsatlas"' >> $@
+	echo 'export CFLAGS="-fPIC -O3 -march=native -lcblas -lsatlas -Wl,-rpath,${ATLAS_PATH}"' >> $@
+	echo 'export LDLIBS="-lcblas -lsatlas"' >> $@
+	echo 'export LDFLAGS="-L${ATLAS_PATH}"' >> $@
 	echo '# These are environment variables that do get exported' >> $@
 	echo 'PATH=$${LAL_PATH}/bin:$${PATH}' >> $@
 	echo 'PKG_CONFIG_PATH=$${LAL_PATH}/lib/pkgconfig:$${LAL_PATH}/lib64/pkgconfig:$${PKG_CONFIG_PATH}' >> $@
@@ -344,12 +346,14 @@ logs/gsl.txt : $(LOGS_DIR)/orc.txt $(INSTALL_DIR)/lib/libgsl.so $(INSTALL_DIR)/l
 ## FIXME Hack to make gsl default to atlas for blas
 $(INSTALL_DIR)/lib/pkgconfig/gsl.pc.orig : $(INSTALL_DIR)/lib/libgsl.so
 	cp $(INSTALL_DIR)/lib/pkgconfig/gsl.pc $@
-	sed 's/-latlas/-lgslcblas -lsatlas/' $@ > $(INSTALL_DIR)/lib/pkgconfig/gsl.pc
+	#sed -e 's@-lgslcblas@-lsatlas@' -e 's@Libs: @Libs: -L$(ATLAS_PATH)/ @' $@ > $(INSTALL_DIR)/lib/pkgconfig/gsl.pc
+	sed 's/-lgslcblas/-lcblas -lsatlas/' $@ > $(INSTALL_DIR)/lib/pkgconfig/gsl.pc
 
 $(INSTALL_DIR)/lib/libgsl.so : $(INSTALL_DIR)/lib/liborc-0.4.so
 	echo $(GSL) 1>&2
 	tar -xf $(TAR_DIR)/$(GSL).tar.gz -C $(SRC_DIR)
-	cd $(SRC_DIR)/$(GSL) && ./configure --prefix=$(INSTALL_DIR) LDFLAGS="-L$(INSTALL_DIR)/lib" GSL_CBLAS_LIB='-latlas -lsatlas'
+	cd $(SRC_DIR)/$(GSL) && ./configure --prefix=$(INSTALL_DIR) CFLAGS="-fPIC -O3 -march=native"
+	#cd $(SRC_DIR)/$(GSL) && ./configure --prefix=$(INSTALL_DIR)
 	cd $(SRC_DIR)/$(GSL) && make -j$(CORES) && make install -j$(CORES)
 
 # ORC
@@ -479,12 +483,12 @@ $(TAR_DIR)/$(FFTW).tar.gz : $(GSTLAL_REPO)/gstlal/configure.ac
 logs/git.txt : $(GSTLAL_REPO)/gstlal/configure.ac
 	echo $^ | sed -e "s@ @\n@g" > $@
 
-$(GSTLAL_REPO)/gstlal/configure.ac : $(TAR_DIR)
+$(GSTLAL_REPO)/gstlal/configure.ac : $(LOGS_DIR)
 	mkdir -p $(GSTLAL_REPO)
 	ecp-cookie-init LIGO.ORG https://versions.ligo.org/git $(USER)
 	git clone https://versions.ligo.org/git/gstlal.git $(GSTLAL_REPO)
 
-$(TAR_DIR) :
+$(LOGS_DIR) :
 	mkdir -p $(SRC_DIR) $(INSTALL_DIR) $(PATCH_DIR) $(LOGS_DIR) $(TAR_DIR)
 
 ############