frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Since 84e8de1271 we don't have fbcmap.c

This is a sort of revert of 17d85387d1

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:
Jon TURNEY 2014-02-24 20:45:51 +00:00
parent f23dd02b96
commit 432fc37e2c
9 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -2408,8 +2408,7 @@ if test "$KDRIVE" = yes; then
fi fi
;; ;;
esac esac
KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.la' KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB"
KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB"
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS" KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB" KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB"
KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS $TSLIB_LIBS" KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS $TSLIB_LIBS"

3
fb/Makefile.am
View File

@ -22,6 +22,7 @@ libfb_la_SOURCES = \
fbbits.h \ fbbits.h \
fbblt.c \ fbblt.c \
fbbltone.c \ fbbltone.c \
fbcmap_mi.c \
fbcopy.c \ fbcopy.c \
fbfill.c \ fbfill.c \
fbfillrect.c \ fbfillrect.c \
@ -50,5 +51,3 @@ libfb_la_SOURCES = \
fbwindow.c fbwindow.c
libwfb_la_SOURCES = $(libfb_la_SOURCES) libwfb_la_SOURCES = $(libfb_la_SOURCES)
EXTRA_DIST = fbcmap_mi.c

1
hw/dmx/Makefile.am
View File

@ -65,7 +65,6 @@ Xdmx_SOURCES = dmx.c \
dmxwindow.c \ dmxwindow.c \
dmxwindow.h \ dmxwindow.h \
$(top_srcdir)/mi/miinitext.c \ $(top_srcdir)/mi/miinitext.c \
$(top_srcdir)/fb/fbcmap_mi.c \
$(GLX_SRCS) $(GLX_SRCS)

5
hw/kdrive/src/Makefile.am
View File

@ -4,7 +4,7 @@ AM_CPPFLAGS = \
AM_CFLAGS = -DHAVE_DIX_CONFIG_H AM_CFLAGS = -DHAVE_DIX_CONFIG_H
noinst_LTLIBRARIES = libkdrive.la libkdrivestubs.la noinst_LTLIBRARIES = libkdrive.la
if XV if XV
KDRIVE_XV_SOURCES = \ KDRIVE_XV_SOURCES = \
@ -23,6 +23,3 @@ libkdrive_la_SOURCES = \
kshadow.c \ kshadow.c \
$(KDRIVE_XV_SOURCES) \ $(KDRIVE_XV_SOURCES) \
$(top_srcdir)/mi/miinitext.c $(top_srcdir)/mi/miinitext.c
libkdrivestubs_la_SOURCES = \
$(top_srcdir)/fb/fbcmap_mi.c

5
hw/vfb/Makefile.am
View File

@ -1,7 +1,6 @@
SUBDIRS = man SUBDIRS = man
bin_PROGRAMS = Xvfb bin_PROGRAMS = Xvfb
noinst_LIBRARIES = libfbcmap.a
AM_CFLAGS = -DHAVE_DIX_CONFIG_H \ AM_CFLAGS = -DHAVE_DIX_CONFIG_H \
$(XVFBMODULES_CFLAGS) \ $(XVFBMODULES_CFLAGS) \
@ -11,14 +10,10 @@ SRCS = InitInput.c \
InitOutput.c \ InitOutput.c \
$(top_srcdir)/mi/miinitext.c $(top_srcdir)/mi/miinitext.c
libfbcmap_a_CFLAGS = $(AM_CFLAGS)
libfbcmap_a_SOURCES = $(top_srcdir)/fb/fbcmap_mi.c
Xvfb_SOURCES = $(SRCS) Xvfb_SOURCES = $(SRCS)
XVFB_LIBS = \ XVFB_LIBS = \
@XVFB_LIBS@ \ @XVFB_LIBS@ \
libfbcmap.a \
$(MAIN_LIB) \ $(MAIN_LIB) \
$(XSERVER_LIBS) \ $(XSERVER_LIBS) \
$(top_builddir)/Xext/libXextdpmsstubs.la \ $(top_builddir)/Xext/libXextdpmsstubs.la \

4
hw/xfree86/dixmods/Makefile.am
View File

@ -19,12 +19,12 @@ AM_CPPFLAGS = @XORG_INCS@ \
libfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) libfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
libfb_la_LIBADD = $(top_builddir)/fb/libfb.la 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) libfb_la_CFLAGS = $(AM_CFLAGS)
libwfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) libwfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)
libwfb_la_LIBADD = $(top_builddir)/fb/libwfb.la 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 libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
libglx_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) libglx_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG)

5
hw/xnest/Makefile.am
View File

@ -1,7 +1,6 @@
SUBDIRS = man SUBDIRS = man
bin_PROGRAMS = Xnest bin_PROGRAMS = Xnest
noinst_LIBRARIES = libfbcmap.a
AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \ AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \
$(DIX_CFLAGS) \ $(DIX_CFLAGS) \
@ -44,12 +43,8 @@ SRCS = Args.c \
xnest-config.h \ xnest-config.h \
$(top_srcdir)/mi/miinitext.c $(top_srcdir)/mi/miinitext.c
libfbcmap_a_SOURCES = $(top_srcdir)/fb/fbcmap_mi.c
libfbcmap_a_CFLAGS = $(AM_CFLAGS)
XNEST_LIBS = \ XNEST_LIBS = \
@XNEST_LIBS@ \ @XNEST_LIBS@ \
libfbcmap.a \
$(top_builddir)/Xext/libXextdpmsstubs.la \ $(top_builddir)/Xext/libXextdpmsstubs.la \
$(top_builddir)/Xi/libXistubs.la $(top_builddir)/Xi/libXistubs.la

1
hw/xquartz/Makefile.am
View File

@ -20,7 +20,6 @@ SUBDIRS = bundle . $(GL_DIR) xpr pbproxy mach-startup man
DIST_SUBDIRS = bundle . GL xpr pbproxy mach-startup man DIST_SUBDIRS = bundle . GL xpr pbproxy mach-startup man
libXquartz_la_SOURCES = \ libXquartz_la_SOURCES = \
$(top_srcdir)/fb/fbcmap_mi.c \
$(top_srcdir)/mi/miinitext.c \ $(top_srcdir)/mi/miinitext.c \
X11Application.m \ X11Application.m \
X11Controller.m \ X11Controller.m \

1
hw/xwin/Makefile.am
View File

@ -128,7 +128,6 @@ SRCS = InitInput.c \
winwindow.h \ winwindow.h \
XWin.rc \ XWin.rc \
$(top_srcdir)/mi/miinitext.c \ $(top_srcdir)/mi/miinitext.c \
$(top_srcdir)/fb/fbcmap_mi.c \
$(SRCS_CLIPBOARD) \ $(SRCS_CLIPBOARD) \
$(SRCS_MULTIWINDOW) \ $(SRCS_MULTIWINDOW) \
$(SRCS_MULTIWINDOWEXTWM) \ $(SRCS_MULTIWINDOWEXTWM) \