config: use project wide xorg warnings variable

Use CWARNFLAGS as in all of xorg. There seems to be no reason why this
module should be different. The warnings were updated recently
for those who install the latest util-macros.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Gaetan Nadon 2012-01-03 21:12:23 -05:00 committed by Daniel Vetter
parent 1722b78128
commit 665b86664a
6 changed files with 5 additions and 17 deletions

View File

@ -18,6 +18,6 @@ intel_upload_blit_large_gtt_LDADD = $(BENCHMARK_LIBS)
intel_upload_blit_large_map_LDADD = $(BENCHMARK_LIBS) intel_upload_blit_large_map_LDADD = $(BENCHMARK_LIBS)
intel_upload_blit_small_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)/.. \
-I$(srcdir)/../lib -I$(srcdir)/../lib

View File

@ -65,18 +65,6 @@ if test "x$HAVE_GLIB" = xyes; then
fi fi
AM_CONDITIONAL(HAVE_GLIB, [test "x$HAVE_GLIB" = xyes]) 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, AC_ARG_ENABLE(shader-debugger,
AS_HELP_STRING([--enable-shader-debugger], AS_HELP_STRING([--enable-shader-debugger],
[Enable shader debugging support [default=no]]), [Enable shader debugging support [default=no]]),

View File

@ -14,6 +14,6 @@ bin_PROGRAMS += \
endif endif
LDADD = ../lib/libintel_tools.la $(DRM_LIBS) $(PCIACCESS_LIBS) 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)/.. \
-I$(srcdir)/../lib -I$(srcdir)/../lib

View File

@ -1,6 +1,6 @@
NULL=# NULL=#
AM_CFLAGS = $(WARN_CFLAGS) -I$(srcdir)/.. AM_CFLAGS = $(CWARNFLAGS) -I$(srcdir)/..
libintel_tools_la_SOURCES = \ libintel_tools_la_SOURCES = \
intel_batchbuffer.h \ intel_batchbuffer.h \
intel_batchbuffer.c \ intel_batchbuffer.c \

View File

@ -88,7 +88,7 @@ EXTRA_PROGRAMS = $(TESTS_progs) $(HANG)
EXTRA_DIST = $(TESTS_scripts) check_drm_clients EXTRA_DIST = $(TESTS_scripts) check_drm_clients
CLEANFILES = $(EXTRA_PROGRAMS) CLEANFILES = $(EXTRA_PROGRAMS)
AM_CFLAGS = $(DRM_CFLAGS) $(WARN_CFLAGS) \ AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) \
-I$(srcdir)/.. \ -I$(srcdir)/.. \
-I$(srcdir)/../lib -I$(srcdir)/../lib
LDADD = ../lib/libintel_tools.la $(PCIACCESS_LIBS) $(DRM_LIBS) LDADD = ../lib/libintel_tools.la $(PCIACCESS_LIBS) $(DRM_LIBS)

View File

@ -43,6 +43,6 @@ EXTRA_DIST = $(bin_SCRIPTS)
LDADD = ../lib/libintel_tools.la $(DRM_LIBS) $(PCIACCESS_LIBS) 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)/.. \
-I$(srcdir)/../lib -I$(srcdir)/../lib