diff options
| author | Kevin E Martin <kem@kem.org> | 2005-07-27 08:11:26 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-07-27 08:11:26 +0000 |
| commit | b9ccd89918e1c79d6013fe563c7fa933c1274837 (patch) | |
| tree | a2c473f05ebd455015dbd2f7feb2f95a6298034b /hw | |
| parent | 8f6664fcff319ee155e7864ce25fa11c1fa5594b (diff) | |
Fix dmx/glxProxy build
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/dmx/Makefile.am | 48 | ||||
| -rw-r--r-- | hw/dmx/glxProxy/Makefile.am | 25 |
2 files changed, 45 insertions, 28 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@ diff --git a/hw/dmx/glxProxy/Makefile.am b/hw/dmx/glxProxy/Makefile.am index 65735ea3a..9b40f5377 100644 --- a/hw/dmx/glxProxy/Makefile.am +++ b/hw/dmx/glxProxy/Makefile.am @@ -1,7 +1,22 @@ noinst_LIBRARIES = libglxproxy.a -libglxproxy_a_SOURCES = g_disptab.c glxcmds.c glxext.c glxutil.c g_renderswap.c \ - render2swap.c renderpixswap.c global.c glxcmdsswap.c \ - compsize.c glxscreens.c glxvisuals.c \ - glxsingle.c glxvendor.c glxfbconfig.c glxswap.c -AM_CFLAGS = -I.. -I$(top_srcdir)/include @GL_CFLAGS@ -UXFree86LOADER
\ No newline at end of file +libglxproxy_a_SOURCES = g_disptab.c \ + glxcmds.c \ + glxext.c \ + glxutil.c \ + g_renderswap.c \ + render2swap.c \ + renderpixswap.c \ + global.c \ + glxcmdsswap.c \ + compsize.c \ + glxscreens.c \ + glxvisuals.c \ + glxsingle.c \ + glxvendor.c \ + glxfbconfig.c \ + glxswap.c + +AM_CFLAGS = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/GL/include \ + -DHAVE_DMX_CONFIG_H \ + @DMXMODULES_CFLAGS@ |