diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-02 09:01:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-02 09:01:55 +0200 |
| commit | 3d353f31ac1671d1b39c09b1f8d82c8811d3edd6 (patch) | |
| tree | ce19dbcec75ce7e87547f6f9b3495888aaea0966 /xorg-server/test/Makefile.am | |
| parent | b2a0f04a2984b290c1224fc1b1883d08b01a6231 (diff) | |
| parent | e67b35e7a899da5805fcce3d390cb10ebcaffe91 (diff) | |
| download | vcxsrv-3d353f31ac1671d1b39c09b1f8d82c8811d3edd6.tar.gz vcxsrv-3d353f31ac1671d1b39c09b1f8d82c8811d3edd6.tar.bz2 vcxsrv-3d353f31ac1671d1b39c09b1f8d82c8811d3edd6.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/os/connection.c
Diffstat (limited to 'xorg-server/test/Makefile.am')
| -rw-r--r-- | xorg-server/test/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/test/Makefile.am b/xorg-server/test/Makefile.am index 85823977b..b2a53aa64 100644 --- a/xorg-server/test/Makefile.am +++ b/xorg-server/test/Makefile.am @@ -36,7 +36,7 @@ misc_LDADD=$(TEST_LDADD) fixes_LDADD=$(TEST_LDADD) xfree86_LDADD=$(TEST_LDADD) touch_LDADD=$(TEST_LDADD) -hashtabletest_LDADD=$(TEST_LDADD) ../Xext/hashtable.c +hashtabletest_LDADD=$(TEST_LDADD) $(top_srcdir)/Xext/hashtable.c libxservertest_la_LIBADD = $(XSERVER_LIBS) if XORG |