diff options
| -rw-r--r-- | benchmarks/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | debugger/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 2 |
6 files changed, 5 insertions, 17 deletions
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am index 654946ae..bc0a533a 100644 --- a/benchmarks/Makefile.am +++ b/benchmarks/Makefile.am @@ -18,6 +18,6 @@ intel_upload_blit_large_gtt_LDADD = $(BENCHMARK_LIBS) intel_upload_blit_large_map_LDADD = $(BENCHMARK_LIBS) intel_upload_blit_small_LDADD = $(BENCHMARK_LIBS) -AM_CFLAGS = $(DRM_CFLAGS) $(WARN_CFLAGS) \ +AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) \ -I$(srcdir)/.. \ -I$(srcdir)/../lib diff --git a/configure.ac b/configure.ac index 3e3e7d46..8515dcad 100644 --- a/configure.ac +++ b/configure.ac @@ -65,18 +65,6 @@ if test "x$HAVE_GLIB" = xyes; then fi AM_CONDITIONAL(HAVE_GLIB, [test "x$HAVE_GLIB" = xyes]) -dnl Use lots of warning flags with GCC - -WARN_CFLAGS="" - -if test "x$GCC" = "xyes"; then - WARN_CFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes \ - -Wmissing-prototypes -Wmissing-declarations \ - -Wnested-externs -fno-strict-aliasing" -fi - -AC_SUBST([WARN_CFLAGS]) - AC_ARG_ENABLE(shader-debugger, AS_HELP_STRING([--enable-shader-debugger], [Enable shader debugging support [default=no]]), diff --git a/debugger/Makefile.am b/debugger/Makefile.am index 9c89a55b..7d914ecb 100644 --- a/debugger/Makefile.am +++ b/debugger/Makefile.am @@ -14,6 +14,6 @@ bin_PROGRAMS += \ endif LDADD = ../lib/libintel_tools.la $(DRM_LIBS) $(PCIACCESS_LIBS) -AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(WARN_CFLAGS) \ +AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \ -I$(srcdir)/.. \ -I$(srcdir)/../lib diff --git a/lib/Makefile.am b/lib/Makefile.am index 12a2727d..ca934106 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,6 +1,6 @@ NULL=# -AM_CFLAGS = $(WARN_CFLAGS) -I$(srcdir)/.. +AM_CFLAGS = $(CWARNFLAGS) -I$(srcdir)/.. libintel_tools_la_SOURCES = \ intel_batchbuffer.h \ intel_batchbuffer.c \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 43d7db69..770243ab 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -88,7 +88,7 @@ EXTRA_PROGRAMS = $(TESTS_progs) $(HANG) EXTRA_DIST = $(TESTS_scripts) check_drm_clients CLEANFILES = $(EXTRA_PROGRAMS) -AM_CFLAGS = $(DRM_CFLAGS) $(WARN_CFLAGS) \ +AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) \ -I$(srcdir)/.. \ -I$(srcdir)/../lib LDADD = ../lib/libintel_tools.la $(PCIACCESS_LIBS) $(DRM_LIBS) diff --git a/tools/Makefile.am b/tools/Makefile.am index 0527aded..4969a110 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -43,6 +43,6 @@ EXTRA_DIST = $(bin_SCRIPTS) LDADD = ../lib/libintel_tools.la $(DRM_LIBS) $(PCIACCESS_LIBS) -AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(WARN_CFLAGS) \ +AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \ -I$(srcdir)/.. \ -I$(srcdir)/../lib |