diff options
author | marha <marha@users.sourceforge.net> | 2010-03-22 10:29:25 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-03-22 10:29:25 +0000 |
commit | ac80633ce275edddaa3e4fa2ae0c048ed00f7d74 (patch) | |
tree | 7d4ceffed59f2782533d3485c075f605ab1b9c61 /xorg-server/hw/xquartz/Makefile.am | |
parent | 6fc6cb8c935fab174e4582909c1cb4f12bd598bf (diff) | |
download | vcxsrv-ac80633ce275edddaa3e4fa2ae0c048ed00f7d74.tar.gz vcxsrv-ac80633ce275edddaa3e4fa2ae0c048ed00f7d74.tar.bz2 vcxsrv-ac80633ce275edddaa3e4fa2ae0c048ed00f7d74.zip |
svn merge -c505 ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz/Makefile.am')
-rw-r--r-- | xorg-server/hw/xquartz/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xquartz/Makefile.am b/xorg-server/hw/xquartz/Makefile.am index 65c70b076..96b139f97 100644 --- a/xorg-server/hw/xquartz/Makefile.am +++ b/xorg-server/hw/xquartz/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libXquartz.la -AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) -AM_OBJCFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) +AM_OBJCFLAGS = $(DIX_CFLAGS) AM_CPPFLAGS = \ -DBUILD_DATE=\"$(BUILD_DATE)\" \ -DXSERVER_VERSION=\"$(VERSION)\" \ |