xserver: Branch 'master'

[Alan Coopersmith]

 dix/Makefile.am |    2 +-
 os/Makefile.am  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 8956f63a941bf0a5f157d47b33e6221601a75040 (from ee9bdd3f4a14a42fb0747acc420966f0f669129b)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Thu Nov 30 19:53:29 2006 -0800

    Tell automake to STFU about the *.O files
    
    automake will not stop whining about the *.O files not being in normal library
    name format, so just tell automake they are PROGRAMS so it builds them without
    bitching.

diff --git a/dix/Makefile.am b/dix/Makefile.am
index d0d6e87..a1f02c1 100644
--- a/dix/Makefile.am
+++ b/dix/Makefile.am
@@ -52,7 +52,7 @@ Xserver-dtrace.h: $(srcdir)/Xserver.d
 dtrace-dix.o: $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS)
 	$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o
 
-noinst_LIBRARIES = dix.O
+noinst_PROGRAMS = dix.O
 
 dix.O: dtrace-dix.o $(am_libdix_la_OBJECTS)
 	ld -r -o $@ .libs/*.o
diff --git a/os/Makefile.am b/os/Makefile.am
index 7381797..d8d1405 100644
--- a/os/Makefile.am
+++ b/os/Makefile.am
@@ -56,7 +56,7 @@ if XSERVER_DTRACE
 dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS)
 	$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o
 
-noinst_LIBRARIES = os.O
+noinst_PROGRAMS = os.O
 
 os.O: dtrace.o $(am_libos_la_OBJECTS)
 	ld -r -o $@ dtrace.o .libs/*.o