From 3112a6c4f26d5e9258b8def7ce4109b4bd408c67 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Mon, 31 Jul 2006 10:25:31 -0700 Subject: [PATCH] Noting uses libdummy.a, so don't build it. Only libdummy-nonserver.a is actually used. --- hw/xfree86/Makefile.am | 1 - hw/xfree86/dummylib/Makefile.am | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index 525c4e0a2..67bfd80d9 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -40,7 +40,6 @@ XORG_LIBS = \ libosandcommon.la \ rac/librac.a \ parser/libxf86config.a \ - dummylib/libdummy.a \ dixmods/libdixmods.la \ @XORG_LIBS@ diff --git a/hw/xfree86/dummylib/Makefile.am b/hw/xfree86/dummylib/Makefile.am index bd69b570a..d89ee59a8 100644 --- a/hw/xfree86/dummylib/Makefile.am +++ b/hw/xfree86/dummylib/Makefile.am @@ -2,7 +2,7 @@ # libdummy-nonserver.a contains additional routines normally found in the # server for use in building the utilities like scanpci & the config tools -noinst_LIBRARIES = libdummy.a libdummy-nonserver.a +noinst_LIBRARIES = libdummy-nonserver.a INCLUDES = $(XORG_INCS) @@ -12,15 +12,6 @@ if NEED_STRLCAT STRL_SRCS = $(top_srcdir)/os/strlcat.c $(top_srcdir)/os/strlcpy.c endif -libdummy_a_SOURCES = getvalidbios.c getemptypci.c \ - pcitestmulti.c xf86allocscripi.c \ - xf86addrestolist.c xf86drvmsg.c xf86drvmsgverb.c \ - xf86getverb.c \ - xf86opt.c xf86screens.c xf86servisinit.c xf86verbose.c \ - #xf86errorf.c xf86errorfverb.c xf86msg.c xf86msgverb.c \ - #logvwrite.c verrorf.c xf86info.c xalloc.c fatalerror.c \ - #$(srcdir)/../os-support/shared/sigiostubs.c - libdummy_nonserver_a_SOURCES = \ fatalerror.c \ getvalidbios.c \