summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2010-02-08 20:08:52 -0500
committerGaetan Nadon <memsize@videotron.ca>2010-02-08 20:08:52 -0500
commit05d0d0fcee0ecf596f489554ac4688dda0cd815d (patch)
treeaa9ce3bdd6f5a89895d128a9edbcfceaa20f46ba /src
parentec2d3b6055d5f4eda11f924e3f52e80a093307e8 (diff)
config: move compiler flags from configure.ac to Makefile.am
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>
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 8a6779e..1fc336a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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) $(XF86RUSH_CFLAGS)
+
apm_drv_la_LTLIBRARIES = apm_drv.la
apm_drv_la_LDFLAGS = -module -avoid-version
apm_drv_ladir = @moduledir@/drivers