The helper library was used because fbcmap.c needed to be compiled with special CFLAGS, see 17d8538 (dmx, vfb, xnest: fix fbcmap compilation, 2007-01-18). Some time later parts of the commit were either reverted or made unnecessary. Now we can add fbcmap_mi.c to the SOURCES directly.
Some whitespace cleanup is included as well (tabs vs spaces). Signed-off-by: Tomas Carnecky <[email protected]> --- hw/vfb/Makefile.am | 12 ++++-------- hw/xnest/Makefile.am | 10 +++------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am index ed46dbb..da94b91 100644 --- a/hw/vfb/Makefile.am +++ b/hw/vfb/Makefile.am @@ -1,28 +1,24 @@ SUBDIRS = man bin_PROGRAMS = Xvfb -noinst_LIBRARIES = libfbcmap.a AM_CFLAGS = -DHAVE_DIX_CONFIG_H \ -DNO_HW_ONLY_EXTS \ -DNO_MODULE_EXTS \ $(XVFBMODULES_CFLAGS) \ - $(DIX_CFLAGS) + $(DIX_CFLAGS) SRCS = InitInput.c \ InitOutput.c \ $(top_srcdir)/Xext/dpmsstubs.c \ $(top_srcdir)/Xi/stubs.c \ - $(top_srcdir)/mi/miinitext.c - -libfbcmap_a_CFLAGS = $(AM_CFLAGS) -libfbcmap_a_SOURCES = $(top_srcdir)/fb/fbcmap_mi.c + $(top_srcdir)/mi/miinitext.c \ + $(top_srcdir)/fb/fbcmap_mi.c Xvfb_SOURCES = $(SRCS) XVFB_LIBS = \ - @XVFB_LIBS@ \ - libfbcmap.a \ + @XVFB_LIBS@ \ $(MAIN_LIB) \ $(XSERVER_LIBS) diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am index c395b4d..4adf938 100644 --- a/hw/xnest/Makefile.am +++ b/hw/xnest/Makefile.am @@ -1,7 +1,6 @@ SUBDIRS = man bin_PROGRAMS = Xnest -noinst_LIBRARIES = libfbcmap.a AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \ -DNO_HW_ONLY_EXTS \ @@ -45,14 +44,11 @@ SRCS = Args.c \ xnest-config.h \ $(top_srcdir)/Xext/dpmsstubs.c \ $(top_srcdir)/Xi/stubs.c \ - $(top_srcdir)/mi/miinitext.c - -libfbcmap_a_SOURCES = $(top_srcdir)/fb/fbcmap_mi.c -libfbcmap_a_CFLAGS = $(AM_CFLAGS) + $(top_srcdir)/mi/miinitext.c \ + $(top_srcdir)/fb/fbcmap_mi.c XNEST_LIBS = \ - @XNEST_LIBS@ \ - libfbcmap.a + @XNEST_LIBS@ Xnest_SOURCES = $(SRCS) -- 1.7.10.2 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
