summaryrefslogtreecommitdiff
path: root/xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile
diff options
context:
space:
mode:
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile')
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile14
1 files changed, 9 insertions, 5 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile
index 919d13f90..0af1e3fb1 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile
@@ -1,5 +1,5 @@
XCOMM $XConsortium: Imakefile /main/10 1996/10/19 18:06:19 kaleb $
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile,v 3.43 2000/11/16 19:45:03 eich Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile,v 3.47 2003/06/12 14:12:36 eich Exp $
#include <Server.tmpl>
@@ -26,7 +26,10 @@ DRI_OBJ = sigio.o
MOUSESRC = lnx_mouse.c
MOUSEOBJ = lnx_mouse.o
-#if defined(i386Architecture) || defined(ia64Architecture)
+KBDSRC = lnx_kbd.c lnx_KbdMap.c at_scancode.c
+KBDOBJ = lnx_kbd.o lnx_KbdMap.o at_scancode.o
+
+#if defined(i386Architecture) || defined(ia64Architecture) || defined(AMD64Architecture)
RES_SRCS=stdResource.c
RES_OBJS=stdResource.o
#else
@@ -42,12 +45,12 @@ AXP_OBJ=lnx_ev56.o xf86Axp.o lnx_axp.o
SRCS = lnx_init.c lnx_video.c lnx_io.c libc_wrapper.c bios_mmap.c \
VTsw_usl.c std_kbdEv.c posix_tty.c $(MOUSESRC) \
lnx_pci.c vidmem.c lnx_apm.c $(JOYSTICK_SRC) $(DRI_SRC) $(RES_SRCS) \
- $(AXP_SRC) lnx_kmod.c lnx_agp.c
+ $(AXP_SRC) lnx_kmod.c lnx_agp.c $(KBDSRC) /*wcHelper.c*/
OBJS = lnx_init.o lnx_video.o lnx_io.o libc_wrapper.o bios_mmap.o \
VTsw_usl.o std_kbdEv.o posix_tty.o $(MOUSEOBJ) \
lnx_pci.o vidmem.o lnx_apm.o $(JOYSTICK_OBJ) $(DRI_OBJ) $(RES_OBJS) \
- $(AXP_OBJ) lnx_kmod.o lnx_agp.o
+ $(AXP_OBJ) lnx_kmod.o lnx_agp.o $(KBDOBJ) /*wcHelper.o*/
INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
-I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(XF86OSSRC)/shared
@@ -95,6 +98,7 @@ InstallDynamicModule(lnx_jstk.o,$(MODULEDIR),input)
LinkSourceFile(bios_mmap.c,../shared)
LinkSourceFile(std_kbdEv.c,../shared)
+LinkSourceFile(at_scancode.c,../shared)
LinkSourceFile(posix_tty.c,../shared)
LinkSourceFile(libc_wrapper.c,../shared)
LinkSourceFile(vidmem.c,../shared)
@@ -103,7 +107,7 @@ LinkSourceFile(kmod_noop.c,../shared)
LinkSourceFile($(DRI_SRC),../shared)
-#if defined(i386Architecture) || defined(ia64Architecture)
+#if defined(i386Architecture) || defined(ia64Architecture) || defined (AMD64Architecture)
LinkSourceFile(stdResource.c,../shared)
#endif
#if defined(AlphaArchitecture)