mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-08 23:12:27 +00:00
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.
This commit is contained in:
parent
236f04b638
commit
17d85387d1
3 changed files with 36 additions and 35 deletions
|
|
@ -1,4 +1,10 @@
|
|||
bin_PROGRAMS = Xnest
|
||||
noinst_LIBRARIES = libfbcmap.a
|
||||
|
||||
AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \
|
||||
-DNO_HW_ONLY_EXTS \
|
||||
$(DIX_CFLAGS) \
|
||||
$(XNESTMODULES_CFLAGS)
|
||||
|
||||
SRCS = Args.c \
|
||||
Args.h \
|
||||
|
|
@ -37,23 +43,17 @@ SRCS = Args.c \
|
|||
xnest-config.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_SOURCES = $(top_srcdir)/fb/fbcmap.c
|
||||
libfbcmap_a_CFLAGS = $(AM_CFLAGS) -DXFree86Server
|
||||
|
||||
Xnest_SOURCES = $(SRCS)
|
||||
|
||||
Xnest_LDADD = $(XORG_CORE_LIBS) \
|
||||
$(XNEST_LIBS) \
|
||||
$(XNESTMODULES_LIBS)
|
||||
|
||||
Xnest_LDFLAGS =
|
||||
|
||||
AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \
|
||||
-DNO_HW_ONLY_EXTS \
|
||||
-DXFree86Server \
|
||||
$(DIX_CFLAGS) \
|
||||
$(XNESTMODULES_CFLAGS)
|
||||
$(XNESTMODULES_LIBS) \
|
||||
libfbcmap.a
|
||||
|
||||
EXTRA_DIST = os2Stub.c \
|
||||
icon \
|
||||
|
|
|
|||
Loading…
Reference in a new issue