summaryrefslogtreecommitdiff
path: root/hw/xgl/glxext/module
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2006-01-18 07:15:55 +0000
committerDave Airlie <airlied@linux.ie>2006-01-18 07:15:55 +0000
commite70b64b93024d05519014fb1b76fe26bd9f3a496 (patch)
treeadde5d80999ebeed1bf361eafbae114a9d65dc93 /hw/xgl/glxext/module
parentb5356e0afaf2b660c8905f63d5fdcb03402b81c5 (diff)
Updated xgl code drop from Novell + xserver tree changes
Diffstat (limited to 'hw/xgl/glxext/module')
-rw-r--r--hw/xgl/glxext/module/Makefile.am15
1 files changed, 9 insertions, 6 deletions
diff --git a/hw/xgl/glxext/module/Makefile.am b/hw/xgl/glxext/module/Makefile.am
index 8272ae514..660838dd9 100644
--- a/hw/xgl/glxext/module/Makefile.am
+++ b/hw/xgl/glxext/module/Makefile.am
@@ -1,6 +1,9 @@
-INCLUDES = \
- @XGLX_INCS@ \
- @XSERVER_CFLAGS@
+AM_CFLAGS = \
+ @SERVER_DEFINES@ \
+ -DHAVE_XGL_CONFIG_H \
+ -DHAVE_DIX_CONFIG_H \
+ $(XGLMODULES_CFLAGS) \
+ -I$(top_srcdir)/hw/xgl
libglx_la_LDFLAGS = -avoid-version
libglx_la_SOURCES = glxmodule.c
@@ -9,11 +12,11 @@ libglx_modules = libglx.la
libglcore_la_LDFLAGS = -avoid-version
libglcore_la_SOURCES = glcoremodule.c
-libglcore_la_LIBADD = $(top_builddir)/GL/mesa/libglcore.la
+libglcore_la_LIBADD = $(top_builddir)/GL/mesa/libGLcore.la
libglcore_modules = libglcore.la
-moduledir = @MODULEPATH@/xgl
+moduledir = @XGL_MODULE_PATH@
module_LTLIBRARIES = \
$(libglcore_modules) \
- $(libglx_modules) \ No newline at end of file
+ $(libglx_modules)