Using "vmware_drv_la_CFLAGS" triggers the per-target compilation flag feature which requires AM_PROG_CC_C_O automake macro. The implementation of this feature is changing in automake 1.14 such that the macro is obsolete.
Given that using this per-target feature is not needed, might as well remove it's usage from the driver configuration all together. The module will configure with no warnings on any version of automake. Note that none of he video drivers use this feature. Signed-off-by: Gaetan Nadon <[email protected]> --- configure.ac | 1 - saa/Makefile.am | 2 +- src/Makefile.am | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index dccfb27..b1f429b 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,6 @@ AC_DISABLE_STATIC AC_PROG_LIBTOOL # Checks for programs. -AM_PROG_CC_C_O AH_TOP([#include "xorg-server.h"]) diff --git a/saa/Makefile.am b/saa/Makefile.am index 48c9734..890a246 100644 --- a/saa/Makefile.am +++ b/saa/Makefile.am @@ -2,7 +2,7 @@ if BUILD_VMWGFX noinst_LTLIBRARIES = libsaa.la -libsaa_la_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) libsaa_la_LDFLAGS = -static libsaa_la_SOURCES = \ saa.c \ diff --git a/src/Makefile.am b/src/Makefile.am index b0dd147..1d12fda 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,9 +24,9 @@ # _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 = $(CWARNFLAGS) @XORG_CFLAGS@ vmware_drv_la_LTLIBRARIES = vmware_drv.la vmware_drv_la_LDFLAGS = -module -avoid-version -vmware_drv_la_CFLAGS = $(CWARNFLAGS) @XORG_CFLAGS@ vmware_drv_ladir = @moduledir@/drivers if BUILD_VMWGFX -- 1.7.9.5 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
