[SCM] Packaging for LIGGGHTS, an Open Source Discrete Element Method Particle Simulation Software. branch, master, updated. upstream/1.5.1-36-g4f62071

[Anton Gladky]

The following commit has been merged in the master branch:
commit 43fb8bf39184034b425ddf3979637c8a261e7d69
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Mar 2 23:11:44 2012 +0100

    Use compilation flags proposed by build environment instead of hardcoded.

diff --git a/debian/patches/enable_default_compile_flags.patch b/debian/patches/enable_default_compile_flags.patch
new file mode 100644
index 0000000..fa67e7c
--- /dev/null
+++ b/debian/patches/enable_default_compile_flags.patch
@@ -0,0 +1,20 @@
+Description: use CXX and LD-flags, proposed by build environment instead
+ of hardcoded.
+Author: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2012-03-02
+
+--- a/src/MAKE/Makefile.fedora
++++ b/src/MAKE/Makefile.fedora
+@@ -7,10 +7,10 @@
+ # specify flags and libraries needed for your compiler
+ 
+ CC =		mpic++
+-CCFLAGS =	-g -O
++CCFLAGS =	-Wall $(shell dpkg-buildflags --get CXXFLAGS)
+ DEPFLAGS =	-M
+ LINK =		mpic++
+-LINKFLAGS =	-g -O
++LINKFLAGS =	-g -O $(shell dpkg-buildflags --get LDFLAGS)
+ LIB =           
+ ARCHIVE =	ar
+ ARFLAGS =	-rc
diff --git a/debian/patches/series b/debian/patches/series
index e60c4f6..15b0160 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 add_interpretator_name_to_the_examples.patches
+enable_default_compile_flags.patch
diff --git a/debian/rules b/debian/rules
index b5df84c..b4733ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,13 +4,6 @@
 	dh $@ --parallel
 
 export OMPI_MCA_plm_rsh_agent=/bin/false
-CFLAGS := -Wall $(shell dpkg-buildflags --get CFLAGS)
-CXXFLAGS := -Wall $(shell dpkg-buildflags --get CXXFLAGS)
-CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
-LDFLAGS :=  $(shell dpkg-buildflags --get LDFLAGS)
-
-extra_flags += CFLAGS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)'
-
 
 override_dh_auto_clean:
 	cd src; make clean-all

-- 
Packaging for LIGGGHTS, an Open Source Discrete Element Method Particle Simulation Software.