Madeorsk/xorg-xf86-video-remoteorsk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

config: move compiler flags from configure.ac to Makefile.am

Browse Source 
CFLAGS is an automake defined variable that should not be set
by the module. It should not be AC_SUBST either, it already is.

Use AM_CFLAGS in Makefile.am. This will allow the user to override
the flags as they will be in the right order.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
This commit is contained in:
Gaetan Nadon 2010-02-08 20:08:52 -05:00
parent 3370539eea
commit c4134a6cb6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -62,9 +62,6 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES)
CFLAGS="$CFLAGS $XORG_CFLAGS "
AC_SUBST([CFLAGS])
# Checks for libraries.
# Checks for header files.

3
src/Makefile.am
View File

@ -24,6 +24,9 @@
# -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) $(PCIACCESS_CFLAGS)
dummy_drv_la_LTLIBRARIES = dummy_drv.la
dummy_drv_la_LDFLAGS = -module -avoid-version
dummy_drv_ladir = @moduledir@/drivers