Build fbcmap_mi.c once, rather than once for each DDX
Build fbcmap_mi.c once, rather than once for each DDX, and make it part of libfb or libwfb convenience library. Since84e8de1271
we don't have fbcmap.c This is a sort of revert of17d85387d1
v2: Remove libkdrivestubs.la from configure.ac Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
This commit is contained in:
parent
f23dd02b96
commit
432fc37e2c
|
@ -2408,8 +2408,7 @@ if test "$KDRIVE" = yes; then
|
|||
fi
|
||||
;;
|
||||
esac
|
||||
KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.la'
|
||||
KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB"
|
||||
KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB"
|
||||
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
|
||||
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB"
|
||||
KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS $TSLIB_LIBS"
|
||||
|
|
|
@ -22,6 +22,7 @@ libfb_la_SOURCES = \
|
|||
fbbits.h \
|
||||
fbblt.c \
|
||||
fbbltone.c \
|
||||
fbcmap_mi.c \
|
||||
fbcopy.c \
|
||||
fbfill.c \
|
||||
fbfillrect.c \
|
||||
|
@ -50,5 +51,3 @@ libfb_la_SOURCES = \
|
|||
fbwindow.c
|
||||
|
||||
libwfb_la_SOURCES = $(libfb_la_SOURCES)
|
||||
|
||||
EXTRA_DIST = fbcmap_mi.c
|
||||
|
|
|
@ -65,7 +65,6 @@ Xdmx_SOURCES = dmx.c \
|
|||
dmxwindow.c \
|
||||
dmxwindow.h \
|
||||
$(top_srcdir)/mi/miinitext.c \
|
||||
$(top_srcdir)/fb/fbcmap_mi.c \
|
||||
$(GLX_SRCS)
|
||||
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ AM_CPPFLAGS = \
|
|||
|
||||
AM_CFLAGS = -DHAVE_DIX_CONFIG_H
|
||||
|
||||
noinst_LTLIBRARIES = libkdrive.la libkdrivestubs.la
|
||||
noinst_LTLIBRARIES = libkdrive.la
|
||||
|
||||
if XV
|
||||
KDRIVE_XV_SOURCES = \
|
||||
|
@ -23,6 +23,3 @@ libkdrive_la_SOURCES = \
|
|||
kshadow.c \
|
||||
$(KDRIVE_XV_SOURCES) \
|
||||
$(top_srcdir)/mi/miinitext.c
|
||||
|
||||
libkdrivestubs_la_SOURCES = \
|
||||
$(top_srcdir)/fb/fbcmap_mi.c
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
SUBDIRS = man
|
||||
|
||||
bin_PROGRAMS = Xvfb
|
||||
noinst_LIBRARIES = libfbcmap.a
|
||||
|
||||
AM_CFLAGS = -DHAVE_DIX_CONFIG_H \
|
||||
$(XVFBMODULES_CFLAGS) \
|
||||
|
@ -11,14 +10,10 @@ SRCS = InitInput.c \
|
|||
InitOutput.c \
|
||||
$(top_srcdir)/mi/miinitext.c
|
||||
|
||||
libfbcmap_a_CFLAGS = $(AM_CFLAGS)
|
||||
libfbcmap_a_SOURCES = $(top_srcdir)/fb/fbcmap_mi.c
|
||||
|
||||
Xvfb_SOURCES = $(SRCS)
|
||||
|
||||
XVFB_LIBS = \
|
||||
@XVFB_LIBS@ \
|
||||
libfbcmap.a \
|
||||
$(MAIN_LIB) \
|
||||
$(XSERVER_LIBS) \
|
||||
$(top_builddir)/Xext/libXextdpmsstubs.la \
|
||||
|
|
|
@ -19,12 +19,12 @@ AM_CPPFLAGS = @XORG_INCS@ \
|
|||
|
||||
libfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
|
||||
libfb_la_LIBADD = $(top_builddir)/fb/libfb.la
|
||||
libfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c
|
||||
libfb_la_SOURCES = fbmodule.c
|
||||
libfb_la_CFLAGS = $(AM_CFLAGS)
|
||||
|
||||
libwfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
|
||||
libwfb_la_LIBADD = $(top_builddir)/fb/libwfb.la
|
||||
libwfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c
|
||||
libwfb_la_SOURCES = fbmodule.c
|
||||
libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
|
||||
|
||||
libglx_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
SUBDIRS = man
|
||||
|
||||
bin_PROGRAMS = Xnest
|
||||
noinst_LIBRARIES = libfbcmap.a
|
||||
|
||||
AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \
|
||||
$(DIX_CFLAGS) \
|
||||
|
@ -44,12 +43,8 @@ SRCS = Args.c \
|
|||
xnest-config.h \
|
||||
$(top_srcdir)/mi/miinitext.c
|
||||
|
||||
libfbcmap_a_SOURCES = $(top_srcdir)/fb/fbcmap_mi.c
|
||||
libfbcmap_a_CFLAGS = $(AM_CFLAGS)
|
||||
|
||||
XNEST_LIBS = \
|
||||
@XNEST_LIBS@ \
|
||||
libfbcmap.a \
|
||||
$(top_builddir)/Xext/libXextdpmsstubs.la \
|
||||
$(top_builddir)/Xi/libXistubs.la
|
||||
|
||||
|
|
|
@ -20,7 +20,6 @@ SUBDIRS = bundle . $(GL_DIR) xpr pbproxy mach-startup man
|
|||
DIST_SUBDIRS = bundle . GL xpr pbproxy mach-startup man
|
||||
|
||||
libXquartz_la_SOURCES = \
|
||||
$(top_srcdir)/fb/fbcmap_mi.c \
|
||||
$(top_srcdir)/mi/miinitext.c \
|
||||
X11Application.m \
|
||||
X11Controller.m \
|
||||
|
|
|
@ -128,7 +128,6 @@ SRCS = InitInput.c \
|
|||
winwindow.h \
|
||||
XWin.rc \
|
||||
$(top_srcdir)/mi/miinitext.c \
|
||||
$(top_srcdir)/fb/fbcmap_mi.c \
|
||||
$(SRCS_CLIPBOARD) \
|
||||
$(SRCS_MULTIWINDOW) \
|
||||
$(SRCS_MULTIWINDOWEXTWM) \
|
||||
|
|
Loading…
Reference in New Issue