diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2007-01-18 15:23:57 +1100 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2007-02-05 03:43:10 +0200 |
| commit | 17d85387d1e6851d35474b65929e268ca64ef65b (patch) | |
| tree | fb946f657fc5b68abd6be1f83555a73607c2d6b0 /hw/vfb | |
| parent | 236f04b638e7d4d1656c6bedd8a6e8d7cec285ec (diff) | |
dmx, vfb, xnest: fix fbcmap compilation
Don't always define XFree86Server, but only for damn fbcmap.c.
Split fbcmap.c into its own library to achieve this.
Diffstat (limited to 'hw/vfb')
| -rw-r--r-- | hw/vfb/Makefile.am | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am index 4f711fde7..40c385434 100644 --- a/hw/vfb/Makefile.am +++ b/hw/vfb/Makefile.am @@ -1,12 +1,21 @@ bin_PROGRAMS = Xvfb +noinst_LIBRARIES = libfbcmap.a + +AM_CFLAGS = -DHAVE_DIX_CONFIG_H \ + -DNO_HW_ONLY_EXTS \ + -DNO_MODULE_EXTS \ + $(XVFBMODULES_CFLAGS) \ + $(DIX_CFLAGS) SRCS = InitInput.c \ InitOutput.c \ lk201kbd.h \ $(top_srcdir)/Xext/dpmsstubs.c \ $(top_srcdir)/Xi/stubs.c \ - $(top_srcdir)/mi/miinitext.c \ - $(top_srcdir)/fb/fbcmap.c + $(top_srcdir)/mi/miinitext.c + +libfbcmap_a_CFLAGS = $(AM_CFLAGS) -DXFree86Server +libfbcmap_a_SOURCES = $(top_srcdir)/fb/fbcmap.c Xvfb_SOURCES = $(SRCS) @@ -14,16 +23,8 @@ Xvfb_LDADD = $(XORG_CORE_LIBS) \ $(XVFB_LIBS) \ $(XSERVER_LIBS) \ $(EXTENSION_LIBS) \ - $(XVFBMODULES_LIBS) - -Xvfb_LDFLAGS = - -AM_CFLAGS = -DHAVE_DIX_CONFIG_H \ - -DNO_HW_ONLY_EXTS \ - -DNO_MODULE_EXTS \ - -DXFree86Server \ - $(XVFBMODULES_CFLAGS) \ - $(DIX_CFLAGS) + $(XVFBMODULES_LIBS) \ + libfbcmap.a # Man page include $(top_srcdir)/cpprules.in |