diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-18 12:10:10 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-18 12:10:10 +0000 |
| commit | 4787c5a8db870b0cff2326bd750c4d96c7d84e51 (patch) | |
| tree | d80c8bdc25dd157be487d94b0a66c809af67f4b8 /xorg-server/hw/xfree86/common | |
| parent | ec97eb93862ded9d95eb73feba6bef1c04cd13d2 (diff) | |
| download | vcxsrv-4787c5a8db870b0cff2326bd750c4d96c7d84e51.tar.gz vcxsrv-4787c5a8db870b0cff2326bd750c4d96c7d84e51.tar.bz2 vcxsrv-4787c5a8db870b0cff2326bd750c4d96c7d84e51.zip | |
svn merge -r603:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/hw/xfree86/common')
| -rw-r--r-- | xorg-server/hw/xfree86/common/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xorg-server/hw/xfree86/common/Makefile.am b/xorg-server/hw/xfree86/common/Makefile.am index ad27210cd..821a2b500 100644 --- a/xorg-server/hw/xfree86/common/Makefile.am +++ b/xorg-server/hw/xfree86/common/Makefile.am @@ -41,6 +41,7 @@ libcommon_la_SOURCES = xf86Configure.c xf86ShowOpts.c xf86Bus.c xf86Config.c \ xf86Mode.c xorgHelper.c \ $(XVSOURCES) $(BUSSOURCES) $(RANDRSOURCES) nodist_libcommon_la_SOURCES = xf86DefModeSet.c xf86Build.h +libcommon_la_LIBADD = $(top_builddir)/config/libconfig.la INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \ -I$(srcdir)/../loader -I$(srcdir)/../parser \ |