On Tue, May 10, 2016 at 05:32:15PM +0300, Marius Vlad wrote:
> v2: Initially added Werror by default. Make it optional so it doesn't
> break android build and (potential) distros maintaing the package
> (Hinted by Damien Lespiau).
>
> --enable-werror will enable -Werror compiler flag.
>
> Signed-off-by: Marius Vlad <marius.c.v...@intel.com>
Looks like some people might want to use this:
Acked-by: Damien Lespiau <damien.lesp...@intel.com>
--
Damien
> ---
> benchmarks/Makefile.am | 3 ++-
> configure.ac | 10 ++++++++++
> demos/Makefile.am | 3 ++-
> overlay/Makefile.am | 3 ++-
> tests/Makefile.am | 2 +-
> tools/Makefile.am | 4 +++-
> 6 files changed, 20 insertions(+), 5 deletions(-)
>
> diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
> index 2c2d100..49d2f64 100644
> --- a/benchmarks/Makefile.am
> +++ b/benchmarks/Makefile.am
> @@ -2,7 +2,8 @@
> include Makefile.sources
>
> AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib
> -AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(CAIRO_CFLAGS) $(LIBUNWIND_CFLAGS)
> +AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(CAIRO_CFLAGS) $(LIBUNWIND_CFLAGS) \
> + $(WERROR_CFLAGS)
> LDADD = $(top_builddir)/lib/libintel_tools.la
>
> benchmarks_LTLIBRARIES = gem_exec_tracer.la
> diff --git a/configure.ac b/configure.ac
> index 0589782..11b1d46 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -229,6 +229,11 @@ AC_ARG_ENABLE(debug,
> [Build tests without debug symbols]),
> [], [enable_debug=yes])
>
> +AC_ARG_ENABLE(werror,
> + AS_HELP_STRING([--enable-werror],
> + [Fail on warnings]),
> + [], [enable_werror=no])
> +
> if test "x$enable_debug" = xyes; then
> AS_COMPILER_FLAG([-g3], [DEBUG_CFLAGS="-g3"], [DEBUG_CFLAGS="-g"])
> AS_COMPILER_FLAG([-Og], [DEBUG_CFLAGS+=" -Og
> -Wno-maybe-uninitialized"], # disable maybe-uninitialized due to false
> positives
> @@ -236,6 +241,10 @@ if test "x$enable_debug" = xyes; then
> AC_SUBST([DEBUG_CFLAGS])
> fi
>
> +if test "x$enable_werror" = xyes; then
> + AS_COMPILER_FLAG([-Werror], [WERROR_CFLAGS="-Werror"])
> +fi
> +
> # prevent relinking the world on every commit for developers
> AC_ARG_ENABLE(git-hash,
> AS_HELP_STRING([--disable-git-hash],
> @@ -313,6 +322,7 @@ echo " Overlay : X:
> ${enable_overlay_xlib}, Xv: ${enable_overla
> echo " x86-specific tools : ${build_x86}"
> echo ""
> echo " • API-Documentation : ${enable_gtk_doc}"
> +echo " • Fail on warnings: : ${enable_werror}"
> echo ""
>
> # vim: set ft=config ts=8 sw=8 tw=0 noet :
> diff --git a/demos/Makefile.am b/demos/Makefile.am
> index e6fbb3b..f5725f4 100644
> --- a/demos/Makefile.am
> +++ b/demos/Makefile.am
> @@ -3,5 +3,6 @@ bin_PROGRAMS = \
> $(NULL)
>
> AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib
> -AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) $(CAIRO_CFLAGS)
> $(LIBUNWIND_CFLAGS)
> +AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \
> + $(CAIRO_CFLAGS) $(LIBUNWIND_CFLAGS) $(WERROR_CFLAGS)
> LDADD = $(top_builddir)/lib/libintel_tools.la
> diff --git a/overlay/Makefile.am b/overlay/Makefile.am
> index c648875..c926557 100644
> --- a/overlay/Makefile.am
> +++ b/overlay/Makefile.am
> @@ -3,7 +3,8 @@ bin_PROGRAMS = intel-gpu-overlay
> endif
>
> AM_CPPFLAGS = -I.
> -AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) $(CAIRO_CFLAGS)
> $(OVERLAY_CFLAGS)
> +AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \
> + $(CAIRO_CFLAGS) $(OVERLAY_CFLAGS) $(WERROR_CLFAGS)
> LDADD = $(DRM_LIBS) $(PCIACCESS_LIBS) $(CAIRO_LIBS) $(OVERLAY_LIBS)
>
> intel_gpu_overlay_SOURCES = \
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index 45e3359..32b9115 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -59,7 +59,7 @@ AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(DEBUG_CFLAGS)\
> -include "$(srcdir)/../lib/check-ndebug.h" \
> -DIGT_SRCDIR=\""$(abs_srcdir)"\" \
> -DIGT_DATADIR=\""$(pkgdatadir)"\" \
> - $(LIBUNWIND_CFLAGS) \
> + $(LIBUNWIND_CFLAGS) $(WERROR_CFLAGS) \
> $(NULL)
>
> LDADD = ../lib/libintel_tools.la $(GLIB_LIBS)
> diff --git a/tools/Makefile.am b/tools/Makefile.am
> index df48d94..5f45144 100644
> --- a/tools/Makefile.am
> +++ b/tools/Makefile.am
> @@ -3,7 +3,9 @@ include Makefile.sources
> SUBDIRS = null_state_gen registers
>
> AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib
> -AM_CFLAGS = $(DEBUG_CFLAGS) $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS)
> $(CAIRO_CFLAGS) $(LIBUNWIND_CFLAGS) -DPKGDATADIR=\"$(pkgdatadir)\"
> +AM_CFLAGS = $(DEBUG_CFLAGS) $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \
> + $(CAIRO_CFLAGS) $(LIBUNWIND_CFLAGS) -DPKGDATADIR=\"$(pkgdatadir)\" \
> + $(WERROR_CFLAGS)
> LDADD = $(top_builddir)/lib/libintel_tools.la
> AM_LDFLAGS = -Wl,--as-needed
>
> --
> 2.8.0.rc3
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
