summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Aaltonen <tjaalton@cc.hut.fi>2007-04-16 14:14:19 -0700
committerEric Anholt <eric@anholt.net>2007-04-17 12:28:47 -0700
commit2dbe8d678b02b724c4f06255383f49bb4c2708b0 (patch)
treea8d6cbfb84a99033fa033fca4cfa3b157bd4910b
parenta089ac11beb4c801928c17780401e913bc0d5257 (diff)
Fix build against xserver 1.2.
-rw-r--r--src/ch7017/Makefile.am5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ch7017/Makefile.am b/src/ch7017/Makefile.am
index d757b3ca..9858941b 100644
--- a/src/ch7017/Makefile.am
+++ b/src/ch7017/Makefile.am
@@ -3,9 +3,8 @@
# -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 = @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(srcdir)/.. -I$(srcdir)/../modes
-
-AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@
+AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+ -I$(srcdir)/.. -I$(srcdir)/../modes
ch7017_la_LTLIBRARIES = ch7017.la
ch7017_la_LDFLAGS = -module -avoid-version