diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2006-12-19 16:29:26 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2006-12-19 16:29:26 +0100 |
| commit | 4334860e69e7d5b156082bd05c7a86708e5bad4c (patch) | |
| tree | 380e4abcbfc8950b000ff72b0347e78fee3bc74a /hw/xfree86/dummylib/Makefile.am | |
| parent | 7e4717683d6c08d1e490a60b7493a94bbc57bf8d (diff) | |
| parent | fdcc22ca1704d3519156c66804528c21b04fea65 (diff) | |
Merge branch 'master' into exa-damagetrack
Conflicts:
exa/exa_accel.c
exa/exa_migration.c
Diffstat (limited to 'hw/xfree86/dummylib/Makefile.am')
| -rw-r--r-- | hw/xfree86/dummylib/Makefile.am | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/hw/xfree86/dummylib/Makefile.am b/hw/xfree86/dummylib/Makefile.am index ab62a6b54..6299a1ff7 100644 --- a/hw/xfree86/dummylib/Makefile.am +++ b/hw/xfree86/dummylib/Makefile.am @@ -2,25 +2,16 @@ # 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) -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) 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 \ |