Add record module building support Change module building to not use
-include Fix xnest, dmx and vfb builds to -DXFree86Server for fbcmap compilation
This commit is contained in:
parent
92b23ff426
commit
0635acab08
|
@ -49,4 +49,6 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \
|
||||||
config/libdmxconfig.a \
|
config/libdmxconfig.a \
|
||||||
@DMXMODULES_LIBS@
|
@DMXMODULES_LIBS@
|
||||||
|
|
||||||
Xdmx_CFLAGS = -DHAVE_DMX_CONFIG_H @DMXMODULES_CFLAGS@ -DXFree86Server
|
Xdmx_CFLAGS = -DHAVE_DMX_CONFIG_H \
|
||||||
|
-DXFree86Server \
|
||||||
|
@DMXMODULES_CFLAGS@
|
||||||
|
|
|
@ -20,4 +20,5 @@ Xvfb_LDFLAGS =
|
||||||
AM_CFLAGS = -DHAVE_DIX_CONFIG_H \
|
AM_CFLAGS = -DHAVE_DIX_CONFIG_H \
|
||||||
-DNO_HW_ONLY_EXTS \
|
-DNO_HW_ONLY_EXTS \
|
||||||
-DNO_MODULE_EXTS \
|
-DNO_MODULE_EXTS \
|
||||||
|
-DXFree86Server \
|
||||||
$(XVFBMODULES_CFLAGS)
|
$(XVFBMODULES_CFLAGS)
|
||||||
|
|
|
@ -6,15 +6,29 @@ if GLX
|
||||||
GLXMODS = libglx.la # libGLcore.la
|
GLXMODS = libglx.la # libGLcore.la
|
||||||
endif
|
endif
|
||||||
|
|
||||||
module_LTLIBRARIES = \
|
module_LTLIBRARIES = libafb.la \
|
||||||
libafb.la libbitmap.la libcfb.la libcfb16.la libcfb24.la libcfb32.la \
|
libbitmap.la \
|
||||||
libdbe.la libfb.la liblayer.la libmfb.la libshadow.la $(GLXMODS)
|
libcfb.la \
|
||||||
|
libcfb16.la \
|
||||||
|
libcfb24.la \
|
||||||
|
libcfb32.la \
|
||||||
|
libdbe.la \
|
||||||
|
libfb.la \
|
||||||
|
liblayer.la \
|
||||||
|
libmfb.la \
|
||||||
|
librecord.la \
|
||||||
|
libshadow.la \
|
||||||
|
$(GLXMODS)
|
||||||
|
|
||||||
# yes, this is a cheesy hack.
|
AM_CFLAGS = @XORG_CFLAGS@
|
||||||
AM_CFLAGS = $(XORG_CFLAGS) -include xorg-config.h
|
INCLUDES = @XORG_INCS@ \
|
||||||
INCLUDES = $(XORG_INCS) -I$(top_srcdir)/afb -I$(top_srcdir)/mfb \
|
-I$(top_srcdir)/afb \
|
||||||
-I$(top_srcdir)/cfb -I$(top_srcdir)/dbe -I$(srcdir)/../loader \
|
-I$(top_srcdir)/cfb \
|
||||||
-I$(top_srcdir)/miext/layer -I$(top_srcdir)/miext/shadow
|
-I$(top_srcdir)/mfb \
|
||||||
|
-I$(top_srcdir)/dbe \
|
||||||
|
-I$(top_srcdir)/hw/xfree86/loader \
|
||||||
|
-I$(top_srcdir)/miext/layer \
|
||||||
|
-I$(top_srcdir)/miext/shadow
|
||||||
|
|
||||||
libGLcore_la_LDFLAGS = -avoid-version
|
libGLcore_la_LDFLAGS = -avoid-version
|
||||||
libGLcore_la_LIBADD = $(top_srcdir)/GL/mesa/libGLcore.a
|
libGLcore_la_LIBADD = $(top_srcdir)/GL/mesa/libGLcore.a
|
||||||
|
@ -49,6 +63,7 @@ libdbe_la_LDFLAGS = -avoid-version
|
||||||
libdbe_la_LIBADD = $(top_srcdir)/dbe/libdbe.la
|
libdbe_la_LIBADD = $(top_srcdir)/dbe/libdbe.la
|
||||||
libdbe_la_SOURCES = dbemodule.c
|
libdbe_la_SOURCES = dbemodule.c
|
||||||
|
|
||||||
|
libfb_la_CFLAGS = -DXFree86Server $(AM_CFLAGS)
|
||||||
libfb_la_LDFLAGS = -avoid-version
|
libfb_la_LDFLAGS = -avoid-version
|
||||||
libfb_la_LIBADD = $(top_srcdir)/fb/libfb.la
|
libfb_la_LIBADD = $(top_srcdir)/fb/libfb.la
|
||||||
libfb_la_SOURCES = $(top_srcdir)/fb/fbcmap.c fbmodule.c
|
libfb_la_SOURCES = $(top_srcdir)/fb/fbcmap.c fbmodule.c
|
||||||
|
@ -65,15 +80,18 @@ libmfb_la_LDFLAGS = -avoid-version
|
||||||
libmfb_la_LIBADD = $(top_srcdir)/mfb/libmfb.la
|
libmfb_la_LIBADD = $(top_srcdir)/mfb/libmfb.la
|
||||||
libmfb_la_SOURCES = mfbmodule.c
|
libmfb_la_SOURCES = mfbmodule.c
|
||||||
|
|
||||||
|
librecord_la_LDFLAGS = -avoid-version
|
||||||
|
librecord_la_LIBADD = $(top_srcdir)/record/librecord.la
|
||||||
|
librecord_la_SOURCES = recordmod.c
|
||||||
|
|
||||||
libshadow_la_LDFLAGS = -avoid-version
|
libshadow_la_LDFLAGS = -avoid-version
|
||||||
libshadow_la_LIBADD = $(top_srcdir)/miext/shadow/libshadow.la
|
libshadow_la_LIBADD = $(top_srcdir)/miext/shadow/libshadow.la
|
||||||
libshadow_la_SOURCES = shmodule.c
|
libshadow_la_SOURCES = shmodule.c
|
||||||
|
|
||||||
libdixmods_la_SOURCES = \
|
libdixmods_la_SOURCES = xkbKillSrv.c \
|
||||||
xkbKillSrv.c \
|
xkbPrivate.c \
|
||||||
xkbPrivate.c \
|
xkbVT.c \
|
||||||
xkbVT.c \
|
$(top_srcdir)/mi/miinitext.c
|
||||||
$(top_srcdir)/mi/miinitext.c
|
|
||||||
|
|
||||||
xkb%.c:
|
xkb%.c:
|
||||||
echo "#define XF86DDXACTIONS" > $@
|
echo "#define XF86DDXACTIONS" > $@
|
||||||
|
|
|
@ -7,17 +7,20 @@ if XV
|
||||||
XV_SRCS = xvmod.c
|
XV_SRCS = xvmod.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# yes, this is a cheesy hack.
|
AM_CFLAGS = @XORG_CFLAGS@
|
||||||
AM_CFLAGS = $(XORG_CFLAGS) -include xorg-config.h
|
INCLUDES = @XORG_INCS@ \
|
||||||
INCLUDES = $(XORG_INCS) -I$(top_srcdir)/afb -I$(top_srcdir)/mfb \
|
-I$(top_srcdir)/afb \
|
||||||
-I$(top_srcdir)/cfb -I$(top_srcdir)/dbe -I$(srcdir)/../loader \
|
-I$(top_srcdir)/mfb \
|
||||||
-I$(top_srcdir)/miext/layer -I$(top_srcdir)/miext/shadow
|
-I$(top_srcdir)/cfb \
|
||||||
|
-I$(top_srcdir)/dbe \
|
||||||
|
-I$(top_srcdir)/hw/xfree86/loader \
|
||||||
|
-I$(top_srcdir)/miext/layer \
|
||||||
|
-I$(top_srcdir)/miext/shadow
|
||||||
|
|
||||||
libextmod_la_LDFLAGS = -avoid-version
|
libextmod_la_LDFLAGS = -avoid-version
|
||||||
libextmod_la_LIBADD = $(top_srcdir)/Xext/libXext.la
|
libextmod_la_LIBADD = $(top_srcdir)/Xext/libXext.la
|
||||||
libextmod_la_SOURCES = \
|
libextmod_la_SOURCES = modinit.c \
|
||||||
modinit.c \
|
$(DGA_SRCS) \
|
||||||
$(DGA_SRCS) \
|
xf86misc.c \
|
||||||
xf86misc.c \
|
xf86vmode.c \
|
||||||
xf86vmode.c \
|
$(XV_SRCS)
|
||||||
$(XV_SRCS)
|
|
||||||
|
|
|
@ -52,6 +52,7 @@ Xnest_LDFLAGS =
|
||||||
|
|
||||||
AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \
|
AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \
|
||||||
-DNO_HW_ONLY_EXTS \
|
-DNO_HW_ONLY_EXTS \
|
||||||
|
-DXFree86Server \
|
||||||
$(XNESTMODULES_CFLAGS)
|
$(XNESTMODULES_CFLAGS)
|
||||||
|
|
||||||
EXTRA_DIST = os2Stub.c
|
EXTRA_DIST = os2Stub.c
|
||||||
|
|
Loading…
Reference in New Issue
Block a user