diff options
author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/fb/Makefile.am | |
parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/fb/Makefile.am')
-rw-r--r-- | xorg-server/fb/Makefile.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xorg-server/fb/Makefile.am b/xorg-server/fb/Makefile.am index e34aaba10..399426933 100644 --- a/xorg-server/fb/Makefile.am +++ b/xorg-server/fb/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = \ AM_CFLAGS = $(DIX_CFLAGS) if XORG -sdk_HEADERS = fb.h fbrop.h fbpseudocolor.h fboverlay.h wfbrename.h +sdk_HEADERS = fb.h fbrop.h fboverlay.h wfbrename.h endif libfb_la_CFLAGS = $(AM_CFLAGS) @@ -49,9 +49,7 @@ libfb_la_SOURCES = \ fbtile.c \ fbtrap.c \ fbutil.c \ - fbwindow.c \ - fbpseudocolor.c \ - fbpseudocolor.h + fbwindow.c libwfb_la_SOURCES = $(libfb_la_SOURCES) |