GNOME.org
 

[libegg/spread-table-dnd: 28/45] Use gnome-common warning and deprecation macros

commit 6981a74f938ba6bade0498b2365b4ef52d3f313e
Author: David King <davidk openismus com>
Date:   Wed Mar 23 10:17:07 2011 +0100

    Use gnome-common warning and deprecation macros
    
    Additionally, use AM_CPPFLAGS instead of INCLUDES in Makefile.am, as
    INCLUDES is deprecated.

 configure.ac                          |    6 +-
 libegg/Makefile.am                    |    4 +-
 libegg/background-monitor/Makefile.am |    4 +-
 libegg/column-chooser/Makefile.am     |    4 +-
 libegg/datetime/Makefile.am           |    6 +-
 libegg/dock/Makefile.am               |    4 +-
 libegg/fileformatchooser/Makefile.am  |    4 +-
 libegg/iconchooser/Makefile.am        |    6 +-
 libegg/pixbufthumbnail/Makefile.am    |    6 +-
 libegg/smclient/Makefile.am           |    6 +-
 libegg/spreadtable/Makefile.am        |    4 +-
 libegg/thumbnailpreview/Makefile.am   |    7 +--
 libegg/toolbareditor/Makefile.am      |    4 +-
 libegg/treeviewutils/Makefile.am      |    4 +-
 libegg/util/Makefile.am               |    8 +--
 m4/dk-warn.m4                         |  114 ---------------------------------
 16 files changed, 33 insertions(+), 158 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 41b5bd5..bd8dd8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,10 +136,8 @@ fi
 AC_SUBST(HTML_DIR)
 AM_CONDITIONAL(ENABLE_GTK_DOC, true)
 
-DK_ARG_ENABLE_WARNINGS([EGG_WARNING_FLAGS],
-                       [-Wall -w1],
-                       [-pedantic -Wall -Wextra -w1],
-                       [GTK GDK GDK_PIXBUF G])
+GNOME_COMPILE_WARNINGS
+GNOME_MAINTAINER_MODE_DEFINES
 
 AC_OUTPUT([
 Makefile
diff --git a/libegg/Makefile.am b/libegg/Makefile.am
index a8d7072..7efbc1c 100644
--- a/libegg/Makefile.am
+++ b/libegg/Makefile.am
@@ -39,8 +39,8 @@ SUBDIRS = util column-chooser treeviewutils \
 # Don't compile broken code
 #$(iconchooser_SUBDIRS)
 
-INCLUDES = \
-  $(EGG_CFLAGS) $(EGG_WARNING_FLAGS)  \
+AM_CPPFLAGS = \
+  $(EGG_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) \
   -DEGG_COMPILATION
 
 ##noinst_LTLIBRARIES = libegg.la
diff --git a/libegg/background-monitor/Makefile.am b/libegg/background-monitor/Makefile.am
index 4e2d8d7..b694313 100644
--- a/libegg/background-monitor/Makefile.am
+++ b/libegg/background-monitor/Makefile.am
@@ -1,6 +1,6 @@
 
-INCLUDES = \
-  $(EGG_CFLAGS) $(EGG_WARNING_FLAGS) \
+AM_CPPFLAGS = \
+  $(EGG_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) \
   -DEGG_COMPILATION
 
 
diff --git a/libegg/column-chooser/Makefile.am b/libegg/column-chooser/Makefile.am
index d7ae73f..9625dcc 100644
--- a/libegg/column-chooser/Makefile.am
+++ b/libegg/column-chooser/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
-  $(EGG_30_CFLAGS) $(EGG_WARNING_FLAGS) \
+AM_CPPFLAGS = \
+  $(EGG_30_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) \
   -DEGG_COMPILATION
 
 noinst_LTLIBRARIES = libegg-columnchooser.la
diff --git a/libegg/datetime/Makefile.am b/libegg/datetime/Makefile.am
index e1d6577..5652e75 100644
--- a/libegg/datetime/Makefile.am
+++ b/libegg/datetime/Makefile.am
@@ -1,7 +1,5 @@
-# $Id$
-
-INCLUDES = \
-	$(EGG_CFLAGS) $(EGG_WARNING_FLAGS)			\
+AM_CPPFLAGS = \
+	$(EGG_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) \
 	-DGETTEXT_PACKAGE=NULL
 
 noinst_LTLIBRARIES = libeggdatetime.la
diff --git a/libegg/dock/Makefile.am b/libegg/dock/Makefile.am
index 83f828b..c8492ae 100644
--- a/libegg/dock/Makefile.am
+++ b/libegg/dock/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
-	$(EGG_CFLAGS) $(EGG_WARNING_FLAGS) \
+AM_CPPFLAGS = \
+	$(EGG_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) \
 	$(EGG_DOCK_CFLAGS) \
 	$(EGG_XML_CFLAGS) \
 	-DG_LOG_DOMAIN=\"Egg\" \
diff --git a/libegg/fileformatchooser/Makefile.am b/libegg/fileformatchooser/Makefile.am
index 7ed505a..a547f6d 100644
--- a/libegg/fileformatchooser/Makefile.am
+++ b/libegg/fileformatchooser/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
-  $(EGG_30_CFLAGS) $(EGG_WARNING_FLAGS) \
+AM_CPPFLAGS = \
+  $(EGG_30_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) \
   -I$(top_srcdir)/libegg/util \
   -DEGG_COMPILATION
 
diff --git a/libegg/iconchooser/Makefile.am b/libegg/iconchooser/Makefile.am
index 5803b05..b626fdd 100644
--- a/libegg/iconchooser/Makefile.am
+++ b/libegg/iconchooser/Makefile.am
@@ -1,12 +1,12 @@
 # This file will be processed with automake-1.7 to create Makefile.in
 
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN="\"EggIconChooser\"" \
 	-I$(top_srcdir)/libegg/util \
 	-I$(top_srcdir)/libegg/pixbufthumbnail \
 	-I$(top_srcdir)/libegg/thumbnailpreview \
-	$(EGG_CFLAGS) $(EGG_WARNING_FLAGS)
+	$(EGG_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
 
 
 noinst_LTLIBRARIES = \
@@ -49,7 +49,7 @@ testiconchooser_SOURCES =	\
 	prop-editor.c
 
 testiconchooser_CFLAGS = \
-	$(EGG_CFLAGS) $(EGG_WARNING_FLAGS) \
+	$(EGG_CFLAGS) $(WARN_CFLAGS) \
 	-DG_LOG_DOMAIN="\"TestIconChooser\""
 
 testiconchooser_LDFLAGS = \
diff --git a/libegg/pixbufthumbnail/Makefile.am b/libegg/pixbufthumbnail/Makefile.am
index 4db3164..a22d13c 100644
--- a/libegg/pixbufthumbnail/Makefile.am
+++ b/libegg/pixbufthumbnail/Makefile.am
@@ -1,7 +1,5 @@
-# This file will be processed with automake-1.7 to create Makefile.in
-
-INCLUDES = \
-	$(EGG_CFLAGS) $(EGG_WARNING_FLAGS)
+AM_CPPFLAGS = \
+	$(EGG_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
 
 noinst_LTLIBRARIES = \
 	libeggpixbufthumbnail.la
diff --git a/libegg/smclient/Makefile.am b/libegg/smclient/Makefile.am
index 1e781f3..9d91268 100644
--- a/libegg/smclient/Makefile.am
+++ b/libegg/smclient/Makefile.am
@@ -23,12 +23,14 @@ endif
 endif
 endif
 
-INCLUDES =                               \
+AM_CPPFLAGS =                            \
 	-DG_LOG_DOMAIN=\""EggSMClient"\" \
 	$(platform_defines)              \
 	$(EGG_SMCLIENT_CFLAGS)           \
 	$(EGG_SMCLIENT_DBUS_CFLAGS)      \
-	$(EGG_LIBGNOMEUI_CFLAGS)
+	$(EGG_LIBGNOMEUI_CFLAGS)         \
+	$(WARN_CFLAGS)                   \
+	$(DISABLE_DEPRECATED)
 
 noinst_LTLIBRARIES =                     \
 	libeggsmclient.la                \
diff --git a/libegg/spreadtable/Makefile.am b/libegg/spreadtable/Makefile.am
index c720963..02fd8f4 100644
--- a/libegg/spreadtable/Makefile.am
+++ b/libegg/spreadtable/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
-  $(EGG_30_CFLAGS) $(EGG_WARNING_FLAGS) \
+AM_CPPFLAGS = \
+  $(EGG_30_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) \
   -DEGG_COMPILATION \
   -DGETTEXT_PACKAGE=\"libegg\"
 
diff --git a/libegg/thumbnailpreview/Makefile.am b/libegg/thumbnailpreview/Makefile.am
index bfdabbf..f767436 100644
--- a/libegg/thumbnailpreview/Makefile.am
+++ b/libegg/thumbnailpreview/Makefile.am
@@ -1,11 +1,8 @@
-# This file will be processed with automake-1.7 to create Makefile.in
-
-
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/libegg/util \
 	-I$(top_srcdir)/libegg/pixbufthumbnail \
 	-DG_LOG_DOMAIN=\""EggThumbnailPreview"\" \
-	$(EGG_30_CFLAGS) $(EGG_WARNING_FLAGS)
+	$(EGG_30_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
 
 noinst_LTLIBRARIES = \
 	libeggthumbnailpreview.la
diff --git a/libegg/toolbareditor/Makefile.am b/libegg/toolbareditor/Makefile.am
index 44be101..c9c4496 100644
--- a/libegg/toolbareditor/Makefile.am
+++ b/libegg/toolbareditor/Makefile.am
@@ -1,6 +1,6 @@
-INCLUDES = \
+AM_CPPFLAGS = \
   -DCURSOR_DIR=\".\" \
-  $(EGG_30_CFLAGS) $(EGG_WARNING_FLAGS) \
+  $(EGG_30_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) \
   $(EGG_XML_CFLAGS) \
   -DEGG_COMPILATION \
   -I$(top_builddir)/libegg/util \
diff --git a/libegg/treeviewutils/Makefile.am b/libegg/treeviewutils/Makefile.am
index 1484580..19ce2c4 100644
--- a/libegg/treeviewutils/Makefile.am
+++ b/libegg/treeviewutils/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
-  $(EGG_CFLAGS) $(EGG_WARNING_FLAGS) \
+AM_CPPFLAGS = \
+  $(EGG_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) \
   -DEGG_COMPILATION \
   -I$(top_builddir)/libegg/util
 
diff --git a/libegg/util/Makefile.am b/libegg/util/Makefile.am
index 1376e2a..157c23a 100644
--- a/libegg/util/Makefile.am
+++ b/libegg/util/Makefile.am
@@ -1,10 +1,6 @@
-INCLUDES = \
-	$(EGG_CFLAGS)
+AM_CPPFLAGS = \
+	$(EGG_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
 	
-# Note that we don't use EGG_WARNING_FLAGS here because
-# the marshalling code generally needs to ignore this warning:
-# "ISO C forbids conversion of object pointer to function pointer type"
-
 noinst_LTLIBRARIES=libeggutil.la
 
 eggmarshalers.h: eggmarshalers.list
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]