summaryrefslogtreecommitdiff
path: root/hw/dmx/Makefile.am
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-07-27 08:11:26 +0000
committerKevin E Martin <kem@kem.org>2005-07-27 08:11:26 +0000
commitb9ccd89918e1c79d6013fe563c7fa933c1274837 (patch)
treea2c473f05ebd455015dbd2f7feb2f95a6298034b /hw/dmx/Makefile.am
parent8f6664fcff319ee155e7864ce25fa11c1fa5594b (diff)
Fix dmx/glxProxy build
Diffstat (limited to 'hw/dmx/Makefile.am')
-rw-r--r--hw/dmx/Makefile.am48
1 files changed, 25 insertions, 23 deletions
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index ecd3383d3..f465b7a3d 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -9,32 +9,33 @@ if GLX
SUBDIRS += glxProxy
GLX_LIBS = glxProxy/libglxproxy.a
GLX_SRCS = $(PANORAMIX_SRCS) dmx_glxvisuals.c
+GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
endif
Xdmx_SOURCES = dmxinit.c \
- dmxscrinit.c \
- dmxshadow.c \
- dmxcursor.c \
- dmxinput.c \
- dmxdpms.c \
- dmxgc.c \
- dmxgcops.c \
- dmxwindow.c \
- dmxpixmap.c \
- dmxfont.c \
- dmxcmap.c \
- dmxvisual.c \
- dmxlog.c \
- dmxcb.c \
- dmxprop.c \
- dmxstat.c \
- dmxsync.c \
- dmxextension.c \
- dmxpict.c \
- dmx.c \
- $(top_srcdir)/fb/fbcmap.c \
- $(top_srcdir)/mi/miinitext.c \
- $(GLX_SRCS)
+ dmxscrinit.c \
+ dmxshadow.c \
+ dmxcursor.c \
+ dmxinput.c \
+ dmxdpms.c \
+ dmxgc.c \
+ dmxgcops.c \
+ dmxwindow.c \
+ dmxpixmap.c \
+ dmxfont.c \
+ dmxcmap.c \
+ dmxvisual.c \
+ dmxlog.c \
+ dmxcb.c \
+ dmxprop.c \
+ dmxstat.c \
+ dmxsync.c \
+ dmxextension.c \
+ dmxpict.c \
+ dmx.c \
+ $(top_srcdir)/fb/fbcmap.c \
+ $(top_srcdir)/mi/miinitext.c \
+ $(GLX_SRCS)
#if COMPOSITE
@@ -51,4 +52,5 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \
Xdmx_CFLAGS = -DHAVE_DMX_CONFIG_H \
-DXFree86Server \
+ $(GLX_INCS) \
@DMXMODULES_CFLAGS@