[giggle] Use AX_COMPILER_FLAGS macros instead gnulib



commit 9ecc0d9c3f7c612408bb68f60cc31ff273f065b0
Author: Javier Jardón <jjardon gnome org>
Date:   Thu May 28 13:11:13 2015 +0100

    Use AX_COMPILER_FLAGS macros instead gnulib

 Makefile.am                     |    2 +-
 build-aux/snippet/.gitignore    |    3 -
 build-aux/snippet/arg-nonnull.h |   26 --
 build-aux/snippet/c++defs.h     |  271 --------------
 build-aux/snippet/warn-on-use.h |  109 ------
 configure.ac                    |   40 +--
 lib/.gitignore                  |    7 -
 lib/Makefile.am                 |  223 ------------
 lib/dummy.c                     |   42 ---
 lib/mktime-internal.h           |    4 -
 lib/mktime.c                    |  741 ---------------------------------------
 lib/stddef.in.h                 |   86 -----
 lib/time.in.h                   |  248 -------------
 lib/time_r.c                    |   44 ---
 m4/.gitignore                   |   18 -
 m4/00gnulib.m4                  |   30 --
 m4/extensions.m4                |  138 --------
 m4/gnulib-cache.m4              |   48 ---
 m4/gnulib-common.m4             |  377 --------------------
 m4/gnulib-comp.m4               |  249 -------------
 m4/gnulib-tool.m4               |   57 ---
 m4/include_next.m4              |  270 --------------
 m4/manywarnings.m4              |  222 ------------
 m4/mktime.m4                    |  253 -------------
 m4/multiarch.m4                 |   62 ----
 m4/stddef_h.m4                  |   47 ---
 m4/time_h.m4                    |  109 ------
 m4/time_r.m4                    |   58 ---
 m4/warn-on-use.m4               |   47 ---
 m4/warnings.m4                  |   70 ----
 m4/wchar_t.m4                   |   24 --
 31 files changed, 2 insertions(+), 3923 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 103c3cf..6b78d1b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = data lib libgiggle libgiggle-git plugins src po pixmaps help test
+SUBDIRS = data libgiggle libgiggle-git plugins src po pixmaps help test
 
 EXTRA_DIST = \
        m4/gnulib-cache.m4 \
diff --git a/configure.ac b/configure.ac
index 9a25fae..40df78e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,10 +22,6 @@ AC_PROG_CC
 AC_PROG_CC_C_O
 AC_PROG_CC_C99
 AC_USE_SYSTEM_EXTENSIONS
-gl_EARLY
-
-# For gnulib.
-gl_INIT
 
 # Initialize libtool
 LT_PREREQ([2.2.6])
@@ -167,46 +163,12 @@ else
   AC_DEFINE_UNQUOTED(GIT_COMMAND,"$GIT_COMMAND",[GIT command path])
 fi
 
-dnl ---------------------------------------------------------------------------
-dnl - Enable strict warnings (-Werror) (disabled by default)
-dnl ---------------------------------------------------------------------------
-AC_ARG_ENABLE([strict],
-              [AS_HELP_STRING([--enable-strict],
-                              [Enable strict compilation warnings '-Werror'])])
-AS_IF([test "x$enable_strict" = "xyes"],
-      [CPPFLAGS="$CPPFLAGS -Werror"])
-
-dnl ---------------------------------------------------------------------------
-dnl - Extra verbose warning switches
-dnl ---------------------------------------------------------------------------
-
-gl_MANYWARN_ALL_GCC([warnings])
-# Set up the list of the pointless, undesired warnings.
-nw=
-nw="$nw -Wsystem-headers"       # Don't let system headers trigger warnings
-nw="$nw -Wunused-macros"        # Unused macros are ok
-# g_clear_object & G_ATOMIC_OP_USE_GCC_BUILTINS causes
-# violations with this. XXX Fix glib ?
-nw="$nw -Wunused-local-typedefs"
-nw="$nw -Wbad-function-cast"
-
-
-# Enable all GCC warnings not in this list.
-gl_MANYWARN_COMPLEMENT([warnings], [$warnings], [$nw])
-for w in $warnings; do
-  gl_WARN_ADD([$w])
-done
-
-gl_WARN_ADD([-Wno-unused-parameter]) # Too many warnings for now
-
-dnl -----------------------------------------------------------
-
+AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
 
 AC_CONFIG_FILES([
         Makefile
         data/Makefile
         help/Makefile
-        lib/Makefile
         libgiggle/Makefile
         libgiggle-git/Makefile
         pixmaps/Makefile


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]