Merge remote branch 'jeremyhu/master'

2009-12-16 21:57:32 -08:00 · 2009-12-16 21:57:32 -08:00 · 6a6a041c2d
parent 8127465f44 d503195504
commit 6a6a041c2d
2 changed files with 2 additions and 2 deletions
--- a/dix/Makefile.am
+++ b/dix/Makefile.am
@ -70,4 +70,4 @@ endif
 dix.c:
 	touch $@

-CLEANFILES = dix.c
+CLEANFILES = dix.c Xserver-dtrace.h
--- a/hw/kdrive/fake/Makefile.am
+++ b/hw/kdrive/fake/Makefile.am
@ -20,7 +20,7 @@ Xfake_LDADD = 						\
 	libfake.la					\
 	@KDRIVE_LIBS@

-Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -Wl,-undefined=InitExtensions
+Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)

 Xfake_DEPENDENCIES =	\
 	libfake.la					\