From 85ff67670c6216a8c4368a8bd70fd0434a4e0aca Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Tue, 16 Sep 2003 21:07:16 +0000 Subject: [PATCH] Add fbdev server to the build. --- hw/kdrive/Makefile.am | 3 ++- hw/kdrive/fbdev/Makefile.am | 42 +++++++++++++++++++++++++++++++++++++ hw/kdrive/vesa/Makefile.am | 2 +- 3 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 hw/kdrive/fbdev/Makefile.am diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am index de71762de..299beb40d 100644 --- a/hw/kdrive/Makefile.am +++ b/hw/kdrive/Makefile.am @@ -2,4 +2,5 @@ SUBDIRS = \ src \ linux \ vesa \ - mach64 + mach64 \ + fbdev diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am new file mode 100644 index 000000000..f4849dac5 --- /dev/null +++ b/hw/kdrive/fbdev/Makefile.am @@ -0,0 +1,42 @@ +INCLUDES = \ + -I$(top_srcdir)/fb \ + -I$(top_srcdir)/hw/kdrive/src \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/mi \ + -I$(top_srcdir)/miext/layer \ + -I$(top_srcdir)/miext/shadow \ + -I$(top_srcdir)/randr \ + -I$(top_srcdir)/render + + +bin_PROGRAMS = Xfbdev + +noinst_LTLIBRARIES = libfbdev.la + +libfbdev_la_SOURCES = \ + fbdev.c + +Xfbdev_SOURCES = \ + fbinit.c + +Xfbdev_LDADD = \ + $(top_builddir)/hw/kdrive/fbdev/libfbdev.la \ + $(top_builddir)/dix/libdix.la \ + $(top_builddir)/os/libos.la \ + $(top_builddir)/miext/layer/liblayer.la \ + $(top_builddir)/hw/kdrive/src/libkdrive.la \ + $(top_builddir)/hw/kdrive/linux/liblinux.la \ + $(top_builddir)/miext/shadow/libshadow.la \ + $(top_builddir)/randr/librandr.la \ + $(top_builddir)/render/librender.la \ + $(top_builddir)/fb/libfb.la \ + $(top_builddir)/mi/libmi.la \ + $(top_builddir)/Xext/libXext.la \ + $(top_builddir)/randr/librandr.la \ + $(top_builddir)/render/librender.la \ + $(top_builddir)/xtrans/libxtrans.la \ + @XFONT_LIBS@ \ + $(X_LIBS) -lXau -lXdmcp \ + $(top_builddir)/dix/libxpstubs.la \ + -lfreetype -lm -lz + diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am index d9494856c..bf9788b55 100644 --- a/hw/kdrive/vesa/Makefile.am +++ b/hw/kdrive/vesa/Makefile.am @@ -18,7 +18,7 @@ libvesa_la_SOURCES = \ vbe.c \ vga.c \ vm86.c - + Xvesa_SOURCES = \ vesainit.c