summaryrefslogtreecommitdiff
path: root/GL/mesa/X
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-11-29 16:39:33 +0000
committerKevin E Martin <kem@kem.org>2005-11-29 16:39:33 +0000
commitda5d66f2ff27b21fe5c39a4abb4f627edd707f1d (patch)
treead479b2ead1b745fc1eb056456c2126f8e18f947 /GL/mesa/X
parent51a721a6dbb42702347aad3115147e4922fc1a25 (diff)
Fix usage of XFree86LOADER/XFree86Module/IN_MODULE and update loadable
module builds to reflect this change.
Diffstat (limited to 'GL/mesa/X')
-rw-r--r--GL/mesa/X/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am
index 80fa91530..56b62e765 100644
--- a/GL/mesa/X/Makefile.am
+++ b/GL/mesa/X/Makefile.am
@@ -12,10 +12,11 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I../tnl \
-I.. \
-I$(top_srcdir)/GL/glx \
- -I$(top_srcdir)/GL/include
+ -I$(top_srcdir)/GL/include \
+ -I$(top_srcdir)/hw/xfree86/os-support
# terribly gross hack. i need a shower now.
-AM_CFLAGS = $(DIX_CFLAGS) -DXFree86Server -include dix-config.h
+AM_CFLAGS = $(DIX_CFLAGS) -DXFree86Server @MODULE_DEFINES@ @LOADER_DEFINES@
libX_la_SOURCES = xf86glx.c \
xf86glx_util.c \