[med-svn] [SCM] aghermann branch, master, updated. 9c95ea59282c4fc6ef7eb192072500f9d0659fc3
Andrei Zavada
johnhommer at gmail.com
Tue Jan 8 00:24:50 UTC 2013
The following commit has been merged in the master branch:
commit fc384124f56d4416055518d6da4285e3f7ed53b3
Author: Andrei Zavada <johnhommer at gmail.com>
Date: Fri Jan 4 10:35:27 2013 +0200
update AM_CXXFLAGS to use -fno-rtti and -std-c++11
diff --git a/src/Makefile.am b/src/Makefile.am
index 7ce5cdc..29cc54c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS := \
tools
AM_CXXFLAGS := \
- -Wall -std=c++0x \
+ -Wall -std=c++11 -fno-rtti \
$(GTK_CFLAGS) $(UNIQUE_CFLAGS) \
$(OPENMP_CXXFLAGS) \
-DBUILT_BY=\"@user@\"
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 9ceb99b..fced200 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,5 +1,5 @@
AM_CXXFLAGS := \
- -Wall -std=c++0x \
+ -Wall -std=c++11 -fno-rtti \
-I$(top_srcdir)/src
noinst_LIBRARIES := \
diff --git a/src/expdesign/Makefile.am b/src/expdesign/Makefile.am
index 743de78..d72ffe9 100644
--- a/src/expdesign/Makefile.am
+++ b/src/expdesign/Makefile.am
@@ -1,5 +1,5 @@
AM_CXXFLAGS := \
- -Wall -std=c++0x \
+ -Wall -std=c++11 -fno-rtti \
$(OPENMP_CXXFLAGS) \
-I$(top_srcdir)/src
diff --git a/src/ica/Makefile.am b/src/ica/Makefile.am
index d06ab09..f88513e 100644
--- a/src/ica/Makefile.am
+++ b/src/ica/Makefile.am
@@ -1,5 +1,5 @@
AM_CXXFLAGS := \
- -Wall -std=c++0x \
+ -Wall -std=c++11 -fno-rtti \
-I$(top_srcdir)/src
diff --git a/src/libsigfile/Makefile.am b/src/libsigfile/Makefile.am
index 668901f..a7f1d8e 100644
--- a/src/libsigfile/Makefile.am
+++ b/src/libsigfile/Makefile.am
@@ -1,5 +1,5 @@
AM_CXXFLAGS := \
- -Wall -std=c++0x -shared \
+ -Wall -std=c++11 -fno-rtti -shared \
-I$(top_srcdir)/src \
-fPIC
diff --git a/src/metrics/Makefile.am b/src/metrics/Makefile.am
index 2af483e..f6ecfd2 100644
--- a/src/metrics/Makefile.am
+++ b/src/metrics/Makefile.am
@@ -1,5 +1,5 @@
AM_CXXFLAGS := \
- -Wall -std=c++0x \
+ -Wall -std=c++11 -fno-rtti \
$(OPENMP_CXXFLAGS) \
-I$(top_srcdir)/src
diff --git a/src/model/Makefile.am b/src/model/Makefile.am
index 0b1fa73..0110481 100644
--- a/src/model/Makefile.am
+++ b/src/model/Makefile.am
@@ -1,5 +1,5 @@
AM_CXXFLAGS := \
- -Wall -std=c++0x \
+ -Wall -std=c++11 -fno-rtti \
-I$(top_srcdir)/src
noinst_LIBRARIES := liba.a
diff --git a/src/sigproc/Makefile.am b/src/sigproc/Makefile.am
index 5c037bb..eab6284 100644
--- a/src/sigproc/Makefile.am
+++ b/src/sigproc/Makefile.am
@@ -1,5 +1,5 @@
AM_CXXFLAGS := \
- -Wall -std=c++0x \
+ -Wall -std=c++11 -fno-rtti \
-I$(top_srcdir)/src
noinst_LIBRARIES := liba.a
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 99e4edf..37d2d8b 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -1,5 +1,5 @@
AM_CXXFLAGS := \
- -Wall -std=c++0x \
+ -Wall -std=c++11 -fno-rtti \
-I$(top_srcdir)/src
bin_PROGRAMS := \
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index 87af932..391d2db 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS := sm mw sf mf
AM_CXXFLAGS := \
- -std=c++0x -Wdeprecated-declarations \
+ -std=c++11 -fno-rtti -Wdeprecated-declarations \
$(GTK_CFLAGS) $(UNIQUE_CFLAGS) \
-DPACKAGE_DATADIR=\"$(datadir)\" \
$(OPENMP_CXXFLAGS) \
diff --git a/src/ui/mf/Makefile.am b/src/ui/mf/Makefile.am
index 9560715..a5de050 100644
--- a/src/ui/mf/Makefile.am
+++ b/src/ui/mf/Makefile.am
@@ -1,5 +1,5 @@
AM_CXXFLAGS := \
- -std=c++0x -Wdeprecated-declarations -Wall \
+ -std=c++11 -fno-rtti -Wdeprecated-declarations -Wall \
$(GTK_CFLAGS) $(LIBCONFIGXX_CFLAGS) $(UNIQUE_CFLAGS) \
-DPACKAGE_DATADIR=\"$(datadir)\" \
$(OPENMP_CXXFLAGS) \
diff --git a/src/ui/mw/Makefile.am b/src/ui/mw/Makefile.am
index 6499a99..d8290cc 100644
--- a/src/ui/mw/Makefile.am
+++ b/src/ui/mw/Makefile.am
@@ -1,5 +1,5 @@
AM_CXXFLAGS = \
- -std=c++0x -Wdeprecated-declarations -Wall \
+ -std=c++11 -fno-rtti -Wdeprecated-declarations -Wall \
$(GTK_CFLAGS) $(VTE_CFLAGS) $(CAIRO_CFLAGS) $(UNIQUE_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
-DPACKAGE_DATADIR=\"$(datadir)\" \
$(OPENMP_CXXFLAGS) \
diff --git a/src/ui/sf/Makefile.am b/src/ui/sf/Makefile.am
index ee307b2..0e17eee 100644
--- a/src/ui/sf/Makefile.am
+++ b/src/ui/sf/Makefile.am
@@ -1,5 +1,5 @@
AM_CXXFLAGS := \
- -std=c++0x -Wdeprecated-declarations -Wall \
+ -std=c++11 -fno-rtti -Wdeprecated-declarations -Wall \
$(GTK_CFLAGS) $(UNIQUE_CFLAGS) $(CAIRO_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
-DPACKAGE_DATADIR=\"$(datadir)\" \
$(OPENMP_CXXFLAGS) \
diff --git a/src/ui/sm/Makefile.am b/src/ui/sm/Makefile.am
index 2371aab..1598031 100644
--- a/src/ui/sm/Makefile.am
+++ b/src/ui/sm/Makefile.am
@@ -1,5 +1,5 @@
AM_CXXFLAGS := \
- -std=c++0x -Wdeprecated-declarations -Wall \
+ -std=c++11 -fno-rtti -Wdeprecated-declarations -Wall \
$(GTK_CFLAGS) $(UNIQUE_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
-DPACKAGE_DATADIR=\"$(datadir)\" \
$(OPENMP_CXXFLAGS) \
--
Sleep experiment manager
More information about the debian-med-commit
mailing list