Merge remote branch 'jeremyhu/master'

This commit is contained in:
Keith Packard 2009-12-16 21:57:32 -08:00
commit 6a6a041c2d
2 changed files with 2 additions and 2 deletions

View File

@ -70,4 +70,4 @@ endif
dix.c: dix.c:
touch $@ touch $@
CLEANFILES = dix.c CLEANFILES = dix.c Xserver-dtrace.h

View File

@ -20,7 +20,7 @@ Xfake_LDADD = \
libfake.la \ libfake.la \
@KDRIVE_LIBS@ @KDRIVE_LIBS@
Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -Wl,-undefined=InitExtensions Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
Xfake_DEPENDENCIES = \ Xfake_DEPENDENCIES = \
libfake.la \ libfake.la \