From 5e5bfc87cc0282c00bb956d1fefb3337620529de Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Mon, 19 Dec 2011 22:27:01 +0000 Subject: [PATCH] Workarounded LP #905893 removed '-pedantic' option for src/lib compilation to avoid build failure during the inclusion of a Glib header file. added -Wno-deprecated-deprecations option for src to avoid build failure due to new gthread deprecation warnings. --- src/Makefile.am | 3 ++- src/lib/Makefile.am | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 622d225..1cc4d74 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,7 +8,8 @@ SUBDIRS += server endif endif -AM_CPPFLAGS = -Wall -pedantic -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\ +# -no-deprecated-declarations to avoid some glib deprecation warnings +AM_CPPFLAGS = -Wno-deprecated-declarations -Wall -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/unity \ $(GTK_CFLAGS)\ diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 9fa01e7..9242946 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -33,8 +33,6 @@ if LIBATIADL LIBS += $(LIBATIADL_LIBS) AM_CPPFLAGS += $(LIBATIADL_CFLAGS) libpsensor_a_SOURCES += amd.c -else -libpsensor_a_CFLAGS += -pedantic endif if GTOP -- 2.7.4