[SCM] lcalc: program for computing zeros and values of L-functions branch, master, updated. debian/0.0.20080205-1.2-15-gb903849

[Tobias Hansen]

The following commit has been merged in the master branch:
commit e9832b1ee94ac94c27e4a695b642e267270e842c
Author: Tobias Hansen <tobias.han at gmx.de>
Date:   Sat Jan 12 04:27:28 2013 +0100

    Use CPPFLAGS and remove GMP_FLAGS from debian/rules.

diff --git a/debian/patches/Makefile.patch b/debian/patches/Makefile.patch
index e50a6fb..58eccc5 100644
--- a/debian/patches/Makefile.patch
+++ b/debian/patches/Makefile.patch
@@ -24,7 +24,7 @@
 -CCFLAGS =  -Wa,-W -O3 $(OPENMP_FLAG) -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA)
 -#CCFLAGS =  -Wa,-W -O3 $(OPENMP_FLAG)  $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA)
 -#CCFLAGS =  -Wa,-W -O2 -fno-exceptions -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA)
-+CCFLAGS = $(CCFLAGS) $(CXXFLAGS) -O3  $(OPENMP_FLAG)  $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA)
++CCFLAGS += $(CXXFLAGS) $(CPPFLAGS) -O3  $(OPENMP_FLAG)  $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA)
  
  #warning- O2 doesn't help with -DUSE_LONG_DOUBLE on mac, and actually seems to hurt, making runtime longer
  #by a factor of 1.5
@@ -67,7 +67,7 @@
 -else
 -    LDFLAGS = $(LDFLAGS2)
 -endif
-+LDFLAGS = $(LDFLAGS) -L$(LOCATION_PARI_LIBRARY) -lpari -lgmp
++LDFLAGS += -L$(LOCATION_PARI_LIBRARY) -lpari -lgmp
  
  
  
diff --git a/debian/rules b/debian/rules
index b36c196..1e31f8c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,7 @@
 	dh $@ --sourcedirectory=src --parallel
 
 override_dh_auto_build:
-	dh_auto_build -- PARI_DEFINE=-DINCLUDE_PARI \
-                GMP_FLAGS="-lpari -lmpfr -lgmpxx -lgmp -lgmpxx"
+	dh_auto_build -- PARI_DEFINE=-DINCLUDE_PARI
 
 override_dh_auto_test:
 

-- 
lcalc: program for computing zeros and values of L-functions