Updates to make file for new lal version

git-svn-id: https://svn.ligo.caltech.edu/svn/bayeswave/tags/bwb-er7@399 c56465c9-8126-4a4f-9d7d-ac845eff4865

src/Declarations.h

@@ -38,7 +38,7 @@
 #include <lal/GenerateInspiral.h>
 #include <lal/NRWaveInject.h>
 #include <lal/GenerateInspRing.h>
-#include <lal/LALErrno.h>
+#include <lal/LALError.h>
 
 #include <lal/LALInference.h>
 #include <lal/LALInferenceReadData.h>

src/Makefile

@@ -5,7 +5,8 @@
 INCDIR = /usr/include /ldas/include /usr/include/gsl
 LIBDIR = /usr/lib64 /ldas/lib 
 
-LIBS  = lalburst lalsupport lalframe Frame lalinference lalinspiral lalpulsar lalmetaio lalsimulation metaio lal gsl fftw3 fftw3f gslcblas m
+# LIBS  = lalburst lalsupport lalframe Frame lalinference lalinspiral lalpulsar lalmetaio lalsimulation metaio lal gsl fftw3 fftw3f gslcblas m
+LIBS  = lalsupport lalframe Frame lalinference lalinspiral lalpulsar lalmetaio lalsimulation metaio lal gsl fftw3 fftw3f gslcblas m
 # FILES  = liblalburst.a liblalsupport.a liblalframe.a libFrame.a liblalinference.a liblalinspiral.a liblalpulsar.a liblalmetaio.a liblalsimulation.a libmetaio.a liblal.a libgsl.a libfftw3.a libfftw3f.a libgslcblas.a libm.a
 
 CCFLAGS = -Wall -O3 -std=gnu99 -march=native -mtune=native -Wl,--unresolved-symbols=ignore-in-object-files 
@@ -15,16 +16,20 @@ OBJS = Subroutines.o BayesLine.o
 all: $(OBJS) BayesWaveBurst BayesWavePost
 
 BayesLine.o : BayesLine.c BayesLine.h
-	condor_compile gcc $(CCFLAGS) -c BayesLine.c $($INCDIR:%=-I%)
+	gcc $(CCFLAGS) -c BayesLine.c $($INCDIR:%=-I%)	
+#	condor_compile gcc $(CCFLAGS) -c BayesLine.c $($INCDIR:%=-I%)
 
 Subroutines.o : Subroutines.c BayesLine.c BayesLine.h Declarations.h Constants.h numrec.h
-	condor_compile gcc $(CCFLAGS) -c Subroutines.c $(INCDIR:%=-I%)
+	gcc $(CCFLAGS) -c Subroutines.c $(INCDIR:%=-I%)	
+#	condor_compile gcc $(CCFLAGS) -c Subroutines.c $(INCDIR:%=-I%)
 
 BayesWaveBurst: BayesWaveBurst.c Declarations.h Constants.h numrec.h  $(OBJS)
-	condor_compile gcc $(CCFLAGS) -o BayesWaveBurst BayesWaveBurst.c $(OBJS) $(LIBDIR:%=-L%) $(INCDIR:%=-I%) $(LIBS:%=-l%)
+	gcc $(CCFLAGS) -o BayesWaveBurst BayesWaveBurst.c $(OBJS) $(LIBDIR:%=-L%) $(INCDIR:%=-I%) $(LIBS:%=-l%)
+# condor_compile gcc $(CCFLAGS) -o BayesWaveBurst BayesWaveBurst.c $(OBJS) $(LIBDIR:%=-L%) $(INCDIR:%=-I%) $(LIBS:%=-l%)
 
 BayesWavePost: BayesWavePost.c Declarations.h Constants.h numrec.h  $(OBJS)
-	condor_compile gcc $(CCFLAGS) -o BayesWavePost BayesWavePost.c $(OBJS) $(LIBDIR:%=-L%) $(INCDIR:%=-I%) $(LIBS:%=-l%)
+	 gcc $(CCFLAGS) -o BayesWavePost BayesWavePost.c $(OBJS) $(LIBDIR:%=-L%) $(INCDIR:%=-I%) $(LIBS:%=-l%)
+#	condor_compile gcc $(CCFLAGS) -o BayesWavePost BayesWavePost.c $(OBJS) $(LIBDIR:%=-L%) $(INCDIR:%=-I%) $(LIBS:%=-l%)
 
 BayesWavePostPEC: BayesWavePostPEC.c Declarations.h Constants.h numrec.h  $(OBJS)
 	condor_compile gcc $(CCFLAGS) -o BayesWavePostPEC BayesWavePostPEC.c $(OBJS) $(LIBDIR:%=-L%) $(INCDIR:%=-I%) $(LIBS:%=-l%)