summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2024-01-17 11:45:27 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2024-01-17 11:45:27 -0800
commit66300521464033e5a11d9b11f5983b83268a53e7 (patch)
treeed170457c749b50812f4d03429993b9c9679bcd2
parent1e97032b43ef5bf98fb568e284c35b806f253601 (diff)
Move X.Org's standard C warning flags to AM_CFLAGS
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am2
2 files changed, 1 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index b4300e2..c7faf08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,6 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10.0] xproto $REQUIRED_MODULES)
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
# Checks for libraries.
diff --git a/src/Makefile.am b/src/Makefile.am
index cfc8bb2..c263287 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _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 = $(XORG_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS)
@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version