diff options
| author | Keith Packard <keithp@keithp.com> | 2009-12-16 21:57:32 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-12-16 21:57:32 -0800 |
| commit | 6a6a041c2d8d32f6355db77cd59cff371038c683 (patch) | |
| tree | 865b8244978d493761a2c327a86033a667ed3833 | |
| parent | 8127465f44fee99181f37a5e55dafc90bfafe3d8 (diff) | |
| parent | d50319550458f8127298cf8672b47f914b74ab1f (diff) | |
Merge remote branch 'jeremyhu/master'
| -rw-r--r-- | dix/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/kdrive/fake/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dix/Makefile.am b/dix/Makefile.am index b29f2e189..42b5121fe 100644 --- 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 diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am index 71b24b7e6..be0fa42a2 100644 --- 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 \ |