From patchwork Wed Oct 28 12:46:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UsODwqltaSBDYXJkb25h?= X-Patchwork-Id: 56281 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9SClfLe006046 for ; Wed, 28 Oct 2009 12:47:41 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1B5DF9F4E2; Wed, 28 Oct 2009 05:47:41 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from smtp2-g21.free.fr (smtp2-g21.free.fr [212.27.42.2]) by gabe.freedesktop.org (Postfix) with ESMTP id D47E49F4C1 for ; Wed, 28 Oct 2009 05:47:34 -0700 (PDT) Received: from smtp2-g21.free.fr (localhost [127.0.0.1]) by smtp2-g21.free.fr (Postfix) with ESMTP id A06304B01E5 for ; Wed, 28 Oct 2009 13:47:26 +0100 (CET) Received: from localhost.localdomain (bne75-10-88-178-16-229.fbx.proxad.net [88.178.16.229]) by smtp2-g21.free.fr (Postfix) with ESMTP id 483F94B018F for ; Wed, 28 Oct 2009 13:47:23 +0100 (CET) From: =?UTF-8?q?R=C3=A9mi=20Cardona?= To: intel-gfx@lists.freedesktop.org Date: Wed, 28 Oct 2009 13:46:41 +0100 Message-Id: <136a76cc4621f5d8508233cd62020bd4e2b7fd49.1256733444.git.remi@gentoo.org> X-Mailer: git-send-email 1.6.5.1 In-Reply-To: <46decbbd49a73e45e7457c2feae0fd916b25f9be.1256733444.git.remi@gentoo.org> References: <38038bcbf1aea0c4f25fa5bd3187ee1d98c41be7.1256733443.git.remi@gentoo.org> <9d0cc6c09f29f4e322158ddb4a8f2acf82eb34b3.1256733443.git.remi@gentoo.org> <46decbbd49a73e45e7457c2feae0fd916b25f9be.1256733444.git.remi@gentoo.org> In-Reply-To: References: MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 4/5] configure: use CWARNFLAGS from xorg-macros.m4 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org diff --git a/configure.ac b/configure.ac index 4b97abb..6da3ee1 100644 --- a/configure.ac +++ b/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 diff --git a/src/Makefile.am b/src/Makefile.am index 5ffb522..d8e02ff 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 diff --git a/src/bios_reader/Makefile.am b/src/bios_reader/Makefile.am index cff9e1a..f2f9dc0 100644 --- a/src/bios_reader/Makefile.am +++ b/src/bios_reader/Makefile.am @@ -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) diff --git a/src/reg_dumper/Makefile.am b/src/reg_dumper/Makefile.am index e6adce4..8f00abe 100644 --- a/src/reg_dumper/Makefile.am +++ b/src/reg_dumper/Makefile.am @@ -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 diff --git a/src/xvmc/Makefile.am b/src/xvmc/Makefile.am index 5921244..be8824b 100644 --- a/src/xvmc/Makefile.am +++ b/src/xvmc/Makefile.am @@ -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@ diff --git a/uxa/Makefile.am b/uxa/Makefile.am index 641b414..0dfad48 100644 --- a/uxa/Makefile.am +++ b/uxa/Makefile.am @@ -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 \