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

xfree86: re-enable chipset-specific drivers for Linux/ia64 

Re-enable chipset-specific support for Linux/ia64, by linking in
lnx_ia64.c.
This commit is contained in:
Myron Stowe 2006-10-26 20:38:58 +03:00 committed by Daniel Stone
parent 004d00e668
commit 794f2e7291
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/xfree86/os-support/linux/Makefile.am
View File

@ -1,7 +1,9 @@
noinst_LTLIBRARIES = liblinux.la noinst_LTLIBRARIES = liblinux.la
if LINUX_IA64 if LINUX_IA64
PLATFORM_PCI_SUPPORT = $(srcdir)/../shared/ia64Pci.c PLATFORM_PCI_SUPPORT = $(srcdir)/lnx_ia64.c $(srcdir)/../shared/ia64Pci.c
PLATFORM_DEFINES = -DOS_PROBE_PCI_CHIPSET=lnxProbePciChipset
PLATFORM_INCLUDES = -I$(srcdir)/../shared
endif endif
if LINUX_ALPHA if LINUX_ALPHA
PLATFORM_PCI_SUPPORT = lnx_ev56.c \ PLATFORM_PCI_SUPPORT = lnx_ev56.c \
@ -34,14 +36,13 @@ liblinux_la_SOURCES = lnx_init.c lnx_video.c lnx_io.c lnx_kbd.c lnx_mouse.c \
$(APM_SOURCES) \ $(APM_SOURCES) \
$(PLATFORM_PCI_SUPPORT) $(PLATFORM_PCI_SUPPORT)
AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(PLATFORM_DEFINES)
INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
# FIXME: These need to be added to the build # FIXME: These need to be added to the build
LNX_EXTRA_SOURCES = \ LNX_EXTRA_SOURCES = \
lnx_font.c \ lnx_font.c \
lnx_ia64.c \
lnx_jstk.c \ lnx_jstk.c \
lnxResource.c lnxResource.c
@ -49,5 +50,4 @@ EXTRA_DIST = \
$(LNX_EXTRA_SOURCES) \ $(LNX_EXTRA_SOURCES) \
lnx.h \ lnx.h \
lnx_kbd.h \ lnx_kbd.h \
$(srcdir)/../shared/ia64Pci.h \
$(srcdir)/../shared/xf86Axp.h $(srcdir)/../shared/xf86Axp.h