diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-02 06:02:45 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-02 06:02:45 +0000 |
| commit | 7c00afd0ec94e491f1a9ef32d6543ed51ea3319d (patch) | |
| tree | ec85c667f59b7afcc9e263273552d4eba3e05632 /hw/dmx | |
| parent | 924518605b613eb66aa569877fa9f131e6f2a2fd (diff) | |
Define XFree86Server only where it is required.
Diffstat (limited to 'hw/dmx')
| -rw-r--r-- | hw/dmx/Makefile.am | 4 | ||||
| -rw-r--r-- | hw/dmx/config/Makefile.am | 1 | ||||
| -rw-r--r-- | hw/dmx/glxProxy/Makefile.am | 5 | ||||
| -rw-r--r-- | hw/dmx/input/Makefile.am | 3 |
4 files changed, 8 insertions, 5 deletions
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am index c9ac49363..23263f6fb 100644 --- a/hw/dmx/Makefile.am +++ b/hw/dmx/Makefile.am @@ -79,8 +79,8 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \ config/libdmxconfig.a \ @DMXMODULES_LIBS@ -Xdmx_CFLAGS = -DHAVE_DMX_CONFIG_H \ - -DXFree86Server \ +Xdmx_CFLAGS = @SERVER_DEFINES@ \ + -DHAVE_DMX_CONFIG_H \ $(GLX_INCS) \ @DMXMODULES_CFLAGS@ diff --git a/hw/dmx/config/Makefile.am b/hw/dmx/config/Makefile.am index 8ddd06a66..568a4f4ae 100644 --- a/hw/dmx/config/Makefile.am +++ b/hw/dmx/config/Makefile.am @@ -22,6 +22,7 @@ libdmxconfig_a_SOURCES = $(LIBSRCS) AM_YFLAGS = -d AM_CFLAGS = \ + @SERVER_DEFINES@ \ -I$(top_srcdir)/hw/dmx \ -DHAVE_DMX_CONFIG_H \ -DDMX_LOG_STANDALONE \ diff --git a/hw/dmx/glxProxy/Makefile.am b/hw/dmx/glxProxy/Makefile.am index e325b5c8a..a798647cc 100644 --- a/hw/dmx/glxProxy/Makefile.am +++ b/hw/dmx/glxProxy/Makefile.am @@ -31,12 +31,13 @@ libglxproxy_a_SOURCES = compsize.c \ renderpixswap.c \ unpack.h -AM_CFLAGS = -I$(top_srcdir)/hw/dmx \ +AM_CFLAGS = @SERVER_DEFINES@ \ + @MODULE_DEFINES@ \ + -I$(top_srcdir)/hw/dmx \ -I$(top_srcdir)/include \ -I$(top_srcdir)/GL/include \ -I$(top_builddir)/GL/include \ -I@MESA_SOURCE@/include \ -DHAVE_DMX_CONFIG_H \ @DMXMODULES_CFLAGS@ \ - @MODULE_DEFINES@ \ -I$(top_srcdir)/hw/xfree86/os-support diff --git a/hw/dmx/input/Makefile.am b/hw/dmx/input/Makefile.am index 5edf79dcc..197b8412e 100644 --- a/hw/dmx/input/Makefile.am +++ b/hw/dmx/input/Makefile.am @@ -55,7 +55,8 @@ libdmxinput_a_SOURCES = ChkNotMaskEv.c \ $(DMXSRCS) \ $(LIBSRCS) -AM_CFLAGS = -I$(top_srcdir)/hw/dmx \ +AM_CFLAGS = @SERVER_DEFINES@ \ + -I$(top_srcdir)/hw/dmx \ -I$(top_srcdir)/hw/xfree86/common \ -DHAVE_DMX_CONFIG_H \ @DMXMODULES_CFLAGS@ |