diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-12 19:43:36 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-12 19:43:36 +0000 |
| commit | 821ad28aad2f8c3cf4bbef9c8ac053943603cc67 (patch) | |
| tree | 741a72dab536c86c7c3d815d93574d1404b42a51 /xorg-server/hw/xfree86/Makefile.am | |
| parent | f18b881b547c558dca584d68d45ace998fa49d18 (diff) | |
| parent | 0c5e1ab504b4e8c56974a234bd440e9fa2f1f941 (diff) | |
| download | vcxsrv-821ad28aad2f8c3cf4bbef9c8ac053943603cc67.tar.gz vcxsrv-821ad28aad2f8c3cf4bbef9c8ac053943603cc67.tar.bz2 vcxsrv-821ad28aad2f8c3cf4bbef9c8ac053943603cc67.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/Makefile.am')
| -rw-r--r-- | xorg-server/hw/xfree86/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/Makefile.am b/xorg-server/hw/xfree86/Makefile.am index 48db5a14c..159b935cf 100644 --- a/xorg-server/hw/xfree86/Makefile.am +++ b/xorg-server/hw/xfree86/Makefile.am @@ -80,7 +80,7 @@ BUILT_SOURCES = xorg.conf.example DISTCLEANFILES += xorg.conf.example xorg.conf.example.pre EXTRA_DIST = xorgconf.cpp -if XSERVER_DTRACE +if SPECIAL_DTRACE_OBJECTS # Re-add dtrace object code that gets lost when building static libraries Xorg_LDADD += $(XSERVER_LIBS) endif |