[PATCH] Fix main.c build by removing unneeded dtrace magic

[Alan Coopersmith]

Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
---
 configure.ac    |    3 +--
 dix/Makefile.am |    9 +--------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7aa7e1a..59ce986 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1147,15 +1147,14 @@ AC_DEFINE(XCMISC, 1, [Support XCMisc extension])
 AC_DEFINE(BIGREQS, 1, [Support BigRequests extension])

 if test "x$WDTRACE" != "xno" ; then
-  MAIN_LIB='$(top_builddir)/dix/main.O'
   DIX_LIB='$(top_builddir)/dix/dix.O'
   OS_LIB='$(top_builddir)/os/os.O'
 else
-  MAIN_LIB='$(top_builddir)/dix/libmain.la'
   DIX_LIB='$(top_builddir)/dix/libdix.la'
   OS_LIB='$(top_builddir)/os/libos.la'
 fi

+MAIN_LIB='$(top_builddir)/dix/libmain.la'
 AC_SUBST([MAIN_LIB])

 MI_LIB='$(top_builddir)/mi/libmi.la'
diff --git a/dix/Makefile.am b/dix/Makefile.am
index 28ffc7e..ab702f7 100644
--- a/dix/Makefile.am
+++ b/dix/Makefile.am
@@ -59,17 +59,10 @@ 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

-dtrace-main.o: $(top_srcdir)/dix/Xserver.d $(am_libmain_la_OBJECTS)
-	$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o
-
-noinst_PROGRAMS = dix.O libmain.O
+noinst_PROGRAMS = dix.O

 dix.O: dtrace-dix.o $(am_libdix_la_OBJECTS)
 	ld -r -o $@ .libs/*.o
-
-libmain.O: dtrace-main.o $(am_libmain_la_OBJECTS)
-	ld -r -o $@ .libs/*.o
-
 endif

 dix.c:
-- 
1.5.6.5