[gnome-software] build: Use GNOME_COMPILE_WARNINGS

From: Kalev Lember <klember src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-software] build: Use GNOME_COMPILE_WARNINGS
Date: Fri, 21 Mar 2014 11:29:13 +0000 (UTC)
commit 0627647c0fdb1e00b65ad50d7030d1ad13144545
Author: Kalev Lember <kalevlember gmail com>
Date:   Fri Feb 28 13:57:05 2014 +0100

    build: Use GNOME_COMPILE_WARNINGS

 configure.ac            |   53 ++++++++++++++++++----------------------------
 src/Makefile.am         |    6 ++--
 src/plugins/Makefile.am |   52 +++++++++++++++++++++++-----------------------
 3 files changed, 50 insertions(+), 61 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 86a7c36..d6b2901 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,44 +19,33 @@ AM_PROG_CC_C_O
 IT_PROG_INTLTOOL([0.35.0])
 #YELP_HELP_INIT
 
-#GNOME_COMPILE_WARNINGS(error)
 #GNOME_DOC_INIT
 
 dnl ---------------------------------------------------------------------------
 dnl - Extra verbose warning switches
 dnl ---------------------------------------------------------------------------
 
-if test "$GCC" = "yes"; then
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wall"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wcast-align -Wno-uninitialized"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wmissing-declarations"
-#      WARNINGFLAGS_C="$WARNINGFLAGS_C -Wredundant-decls"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wpointer-arith"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wcast-align"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wwrite-strings"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Winit-self"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wreturn-type"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wformat-nonliteral"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wformat-security"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wmissing-include-dirs"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wmissing-format-attribute"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wclobbered"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wempty-body"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wignored-qualifiers"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wsign-compare"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wtype-limits"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wuninitialized"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Waggregate-return"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wdeclaration-after-statement"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wshadow"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wno-strict-aliasing"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Winline"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wmissing-parameter-type"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Woverride-init"
-else
-       WARNINGFLAGS_C=""
-fi
-AC_SUBST(WARNINGFLAGS_C)
+GNOME_COMPILE_WARNINGS([maximum],[
+       -Wmissing-declarations
+       -Wcast-align
+       -Wwrite-strings
+       -Wreturn-type
+       -Wformat-nonliteral
+       -Wmissing-format-attribute
+       -Wclobbered
+       -Wempty-body
+       -Wignored-qualifiers
+       -Wsign-compare
+       -Wtype-limits
+       -Wuninitialized
+       -Waggregate-return
+       -Wdeclaration-after-statement
+       -Wshadow
+       -Wno-strict-aliasing
+       -Winline
+       -Wmissing-parameter-type
+       -Woverride-init
+])
 
 dnl ---------------------------------------------------------------------------
 dnl - gettext stuff
diff --git a/src/Makefile.am b/src/Makefile.am
index ed7f738..977686f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -75,7 +75,7 @@ gnome_software_cmd_LDADD =                            \
        $(NOTIFY_LIBS)
 
 gnome_software_cmd_CFLAGS =                            \
-       $(WARNINGFLAGS_C)
+       $(WARN_CFLAGS)
 
 bin_PROGRAMS =                                         \
        gnome-software
@@ -167,7 +167,7 @@ gnome_software_LDADD =                                      \
 
 gnome_software_CFLAGS =                                        \
        -DLIBEXECDIR=\"$(libexecdir)\"                  \
-       $(WARNINGFLAGS_C)
+       $(WARN_CFLAGS)
 
 gs-shell-search-provider-generated.h gs-shell-search-provider-generated.c: Makefile.am 
$(srcdir)/shell-search-provider-dbus-interfaces.xml
        $(AM_V_GEN) gdbus-codegen \
@@ -214,7 +214,7 @@ gs_self_test_LDADD =                                                \
        $(GLIB_LIBS)                                            \
        $(GTK_LIBS)
 
-gs_self_test_CFLAGS = $(WARNINGFLAGS_C)
+gs_self_test_CFLAGS = $(WARN_CFLAGS)
 
 TESTS = gs-self-test
 
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 12e5cf7..18de85b 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -52,27 +52,27 @@ plugin_LTLIBRARIES =                                        \
 libgs_plugin_dummy_la_SOURCES = gs-plugin-dummy.c
 libgs_plugin_dummy_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_dummy_la_LDFLAGS = -module -avoid-version
-libgs_plugin_dummy_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_dummy_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_fedora_tagger_ratings_la_SOURCES = gs-plugin-fedora-tagger-ratings.c
 libgs_plugin_fedora_tagger_ratings_la_LIBADD = $(GS_PLUGIN_LIBS) $(SOUP_LIBS) $(SQLITE_LIBS)
 libgs_plugin_fedora_tagger_ratings_la_LDFLAGS = -module -avoid-version
-libgs_plugin_fedora_tagger_ratings_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_fedora_tagger_ratings_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_fedora_tagger_usage_la_SOURCES = gs-plugin-fedora-tagger-usage.c
 libgs_plugin_fedora_tagger_usage_la_LIBADD = $(GS_PLUGIN_LIBS) $(SOUP_LIBS) $(SQLITE_LIBS)
 libgs_plugin_fedora_tagger_usage_la_LDFLAGS = -module -avoid-version
-libgs_plugin_fedora_tagger_usage_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_fedora_tagger_usage_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_epiphany_la_SOURCES = gs-plugin-epiphany.c
 libgs_plugin_epiphany_la_LIBADD = $(GS_PLUGIN_LIBS) $(SOUP_LIBS)
 libgs_plugin_epiphany_la_LDFLAGS = -module -avoid-version
-libgs_plugin_epiphany_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_epiphany_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_self_test_la_SOURCES = gs-plugin-self-test.c
 libgs_plugin_self_test_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_self_test_la_LDFLAGS = -module -avoid-version
-libgs_plugin_self_test_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_self_test_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_appstream_la_SOURCES =                    \
        gs-plugin-appstream.c                           \
@@ -90,7 +90,7 @@ libgs_plugin_appstream_la_SOURCES =                   \
        appstream-cache.h
 libgs_plugin_appstream_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_appstream_la_LDFLAGS = -module -avoid-version
-libgs_plugin_appstream_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_appstream_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_appdata_la_SOURCES =                      \
        appstream-common.c                              \
@@ -100,7 +100,7 @@ libgs_plugin_appdata_la_SOURCES =                   \
        gs-plugin-appdata.c
 libgs_plugin_appdata_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_appdata_la_LDFLAGS = -module -avoid-version
-libgs_plugin_appdata_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_appdata_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_moduleset_la_SOURCES =                    \
        gs-moduleset.c                                  \
@@ -108,12 +108,12 @@ libgs_plugin_moduleset_la_SOURCES =                       \
        gs-plugin-moduleset.c
 libgs_plugin_moduleset_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_moduleset_la_LDFLAGS = -module -avoid-version
-libgs_plugin_moduleset_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_moduleset_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_hardcoded_categories_la_SOURCES = gs-plugin-hardcoded-categories.c
 libgs_plugin_hardcoded_categories_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_hardcoded_categories_la_LDFLAGS = -module -avoid-version
-libgs_plugin_hardcoded_categories_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_hardcoded_categories_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_menu_spec_categories_la_SOURCES =         \
        gs-plugin-menu-spec-categories.c                \
@@ -121,7 +121,7 @@ libgs_plugin_menu_spec_categories_la_SOURCES =              \
        menu-spec-common.h
 libgs_plugin_menu_spec_categories_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_menu_spec_categories_la_LDFLAGS = -module -avoid-version
-libgs_plugin_menu_spec_categories_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_menu_spec_categories_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_menu_spec_refine_la_SOURCES =             \
        gs-plugin-menu-spec-refine.c                    \
@@ -129,17 +129,17 @@ libgs_plugin_menu_spec_refine_la_SOURCES =                \
        menu-spec-common.h
 libgs_plugin_menu_spec_refine_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_menu_spec_refine_la_LDFLAGS = -module -avoid-version
-libgs_plugin_menu_spec_refine_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_menu_spec_refine_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_hardcoded_featured_la_SOURCES = gs-plugin-hardcoded-featured.c
 libgs_plugin_hardcoded_featured_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_hardcoded_featured_la_LDFLAGS = -module -avoid-version
-libgs_plugin_hardcoded_featured_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_hardcoded_featured_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_local_ratings_la_SOURCES = gs-plugin-local-ratings.c
 libgs_plugin_local_ratings_la_LIBADD = $(GS_PLUGIN_LIBS) $(SQLITE_LIBS)
 libgs_plugin_local_ratings_la_LDFLAGS = -module -avoid-version
-libgs_plugin_local_ratings_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_local_ratings_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_packagekit_la_SOURCES =                   \
        gs-plugin-packagekit.c                          \
@@ -147,7 +147,7 @@ libgs_plugin_packagekit_la_SOURCES =                        \
        packagekit-common.h
 libgs_plugin_packagekit_la_LIBADD = $(GS_PLUGIN_LIBS) $(PACKAGEKIT_LIBS)
 libgs_plugin_packagekit_la_LDFLAGS = -module -avoid-version
-libgs_plugin_packagekit_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_packagekit_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_packagekit_refine_la_SOURCES =            \
        gs-plugin-packagekit-refine.c                   \
@@ -155,7 +155,7 @@ libgs_plugin_packagekit_refine_la_SOURCES =         \
        packagekit-common.h
 libgs_plugin_packagekit_refine_la_LIBADD = $(GS_PLUGIN_LIBS) $(PACKAGEKIT_LIBS)
 libgs_plugin_packagekit_refine_la_LDFLAGS = -module -avoid-version
-libgs_plugin_packagekit_refine_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_packagekit_refine_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_packagekit_refresh_la_SOURCES =           \
        gs-plugin-packagekit-refresh.c                  \
@@ -163,7 +163,7 @@ libgs_plugin_packagekit_refresh_la_SOURCES =                \
        packagekit-common.h
 libgs_plugin_packagekit_refresh_la_LIBADD = $(GS_PLUGIN_LIBS) $(PACKAGEKIT_LIBS)
 libgs_plugin_packagekit_refresh_la_LDFLAGS = -module -avoid-version
-libgs_plugin_packagekit_refresh_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_packagekit_refresh_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_packagekit_search_la_SOURCES =            \
        gs-plugin-packagekit-search.c                   \
@@ -171,7 +171,7 @@ libgs_plugin_packagekit_search_la_SOURCES =         \
        packagekit-common.h
 libgs_plugin_packagekit_search_la_LIBADD = $(GS_PLUGIN_LIBS) $(PACKAGEKIT_LIBS)
 libgs_plugin_packagekit_search_la_LDFLAGS = -module -avoid-version
-libgs_plugin_packagekit_search_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_packagekit_search_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_packagekit_updates_la_SOURCES =           \
        gs-plugin-packagekit-updates.c                  \
@@ -179,42 +179,42 @@ libgs_plugin_packagekit_updates_la_SOURCES =              \
        packagekit-common.h
 libgs_plugin_packagekit_updates_la_LIBADD = $(GS_PLUGIN_LIBS) $(PACKAGEKIT_LIBS)
 libgs_plugin_packagekit_updates_la_LDFLAGS = -module -avoid-version
-libgs_plugin_packagekit_updates_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_packagekit_updates_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_systemd_updates_la_SOURCES = gs-plugin-systemd-updates.c
 libgs_plugin_systemd_updates_la_LIBADD = $(GS_PLUGIN_LIBS) $(PACKAGEKIT_LIBS)
 libgs_plugin_systemd_updates_la_LDFLAGS = -module -avoid-version
-libgs_plugin_systemd_updates_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_systemd_updates_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_packagekit_history_la_SOURCES = gs-plugin-packagekit-history.c
 libgs_plugin_packagekit_history_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_packagekit_history_la_LDFLAGS = -module -avoid-version
-libgs_plugin_packagekit_history_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_packagekit_history_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_packagekit_offline_la_SOURCES = gs-plugin-packagekit-offline.c
 libgs_plugin_packagekit_offline_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_packagekit_offline_la_LDFLAGS = -module -avoid-version
-libgs_plugin_packagekit_offline_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_packagekit_offline_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_desktopdb_la_SOURCES = gs-plugin-desktopdb.c
 libgs_plugin_desktopdb_la_LIBADD = $(GS_PLUGIN_LIBS) $(PACKAGEKIT_LIBS)
 libgs_plugin_desktopdb_la_LDFLAGS = -module -avoid-version
-libgs_plugin_desktopdb_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_desktopdb_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_datadir_apps_la_SOURCES = gs-plugin-datadir-apps.c
 libgs_plugin_datadir_apps_la_LIBADD = $(GS_PLUGIN_LIBS) $(GTK_LIBS)
 libgs_plugin_datadir_apps_la_LDFLAGS = -module -avoid-version
-libgs_plugin_datadir_apps_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_datadir_apps_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_datadir_filename_la_SOURCES = gs-plugin-datadir-filename.c
 libgs_plugin_datadir_filename_la_LIBADD = $(GS_PLUGIN_LIBS) $(GTK_LIBS)
 libgs_plugin_datadir_filename_la_LDFLAGS = -module -avoid-version
-libgs_plugin_datadir_filename_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_datadir_filename_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 libgs_plugin_datadir_filename_local_la_SOURCES = gs-plugin-datadir-filename-local.c
 libgs_plugin_datadir_filename_local_la_LIBADD = $(GS_PLUGIN_LIBS) $(GTK_LIBS)
 libgs_plugin_datadir_filename_local_la_LDFLAGS = -module -avoid-version
-libgs_plugin_datadir_filename_local_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARNINGFLAGS_C)
+libgs_plugin_datadir_filename_local_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
 check_PROGRAMS =                                       \
        gs-self-test
@@ -229,7 +229,7 @@ gs_self_test_LDADD =                                        \
        $(GLIB_LIBS)                                    \
        $(GTK_LIBS)
 
-gs_self_test_CFLAGS = $(WARNINGFLAGS_C)
+gs_self_test_CFLAGS = $(WARN_CFLAGS)
 
 TESTS = gs-self-test
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]