diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-04 10:41:31 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-04 10:41:31 +0200 |
| commit | b3daaeb1467f3d3d52bef2f76413f3a063fc4f33 (patch) | |
| tree | 4415e903a15dff8b36bba9fcce197d26a7790186 /xorg-server/hw/xfree86/xaa | |
| parent | e44d0067ca65d58f258e7f2ae1a240c9bfce5766 (diff) | |
| parent | fc8f37239f3af088819c18f5632b2608954af73a (diff) | |
| download | vcxsrv-b3daaeb1467f3d3d52bef2f76413f3a063fc4f33.tar.gz vcxsrv-b3daaeb1467f3d3d52bef2f76413f3a063fc4f33.tar.bz2 vcxsrv-b3daaeb1467f3d3d52bef2f76413f3a063fc4f33.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/include/misc.h
xorg-server/os/utils.c
Diffstat (limited to 'xorg-server/hw/xfree86/xaa')
| -rw-r--r-- | xorg-server/hw/xfree86/xaa/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/xaa/Makefile.am b/xorg-server/hw/xfree86/xaa/Makefile.am index f6480a713..5614d723a 100644 --- a/xorg-server/hw/xfree86/xaa/Makefile.am +++ b/xorg-server/hw/xfree86/xaa/Makefile.am @@ -11,8 +11,9 @@ POLYSEG = s-xaaLine.c s-xaaDashLine.c if XAA libxaa_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) +libxaa_la_LIBADD = $(PIXMAN_LIBS) if COMPOSITE -libxaa_la_LIBADD = $(top_builddir)/miext/cw/libcw.la +libxaa_la_LIBADD += $(top_builddir)/miext/cw/libcw.la endif module_LTLIBRARIES = libxaa.la |