configure: use CWARNFLAGS from xorg-macros.m4
Signed-off-by: Rémi Cardona <remi@gentoo.org> Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
parent
a851139c21
commit
3c0a43b24c
11
configure.ac
11
configure.ac
|
|
@ -111,16 +111,6 @@ AM_CONDITIONAL(DRI, test x$DRI = xyes)
|
|||
AC_MSG_CHECKING([whether to include DRI support])
|
||||
AC_MSG_RESULT([$DRI])
|
||||
|
||||
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
|
||||
|
||||
AM_CONDITIONAL(VIDEO_DEBUG, test x$VIDEO_DEBUG = xyes)
|
||||
if test "$VIDEO_DEBUG" = yes; then
|
||||
AC_DEFINE(VIDEO_DEBUG,1,[Enable debug support])
|
||||
|
|
@ -145,7 +135,6 @@ if test "$KMS_ONLY" = yes; then
|
|||
fi
|
||||
|
||||
AC_SUBST([XORG_CFLAGS])
|
||||
AC_SUBST([WARN_CFLAGS])
|
||||
AC_SUBST([moduledir])
|
||||
|
||||
DRIVER_NAME=intel
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ SUBDIRS = xvmc bios_reader reg_dumper render_program
|
|||
# _ladir passes a dummy rpath to libtool so the thing will actually link
|
||||
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
|
||||
|
||||
AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ \
|
||||
AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ \
|
||||
@PCIACCESS_CFLAGS@ -I$(top_srcdir)/uxa -I$(top_srcdir)/src/render_program
|
||||
|
||||
intel_drv_la_LTLIBRARIES = intel_drv.la
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @PCIACCESS_CFLAGS@ \
|
||||
AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @PCIACCESS_CFLAGS@ \
|
||||
-DREG_DUMPER
|
||||
|
||||
noinst_PROGRAMS = bios_reader $(BIOS_DUMPER) $(SWF_DUMPER)
|
||||
|
|
|
|||
|
|
@ -36,6 +36,6 @@ intel_statuspage_LDADD = $(PCIACCESS_LIBS)
|
|||
intel_lid_LDADD = $(PCIACCESS_LIBS)
|
||||
intel_audio_LDADD = $(PCIACCESS_LIBS)
|
||||
|
||||
AM_CFLAGS = $(PCIACCESS_CFLAGS) $(WARN_CFLAGS) \
|
||||
AM_CFLAGS = $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \
|
||||
-I$(srcdir)/.. -DREG_DUMPER
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ SUBDIRS = shader
|
|||
libI810XvMC_la_SOURCES = I810XvMC.c \
|
||||
I810XvMC.h
|
||||
|
||||
libI810XvMC_la_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
|
||||
libI810XvMC_la_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
|
||||
-I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
|
||||
libI810XvMC_la_LDFLAGS = -version-number 1:0:0
|
||||
libI810XvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ SOLARIS_ASM_CFLAGS=""
|
|||
INCLUDES = \
|
||||
$(XORG_INCS)
|
||||
|
||||
AM_CFLAGS = $(WARN_CFLAGS) $(XORG_CFLAGS) $(DIX_CFLAGS)
|
||||
AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(DIX_CFLAGS)
|
||||
|
||||
libuxa_la_SOURCES = \
|
||||
uxa.c \
|
||||
|
|
|
|||
Loading…
Reference in New Issue