Menu
▾
▴
[Linuxconsole-commit]CVS: ruby/linux/drivers/input Makefile,1.46,1.47 adi.c,1.22,NONE amijoy.c,1.12,NONE amimouse.c,1.9,NONE atkbd.c,1.29,NONE cobra.c,1.18,NONE cs461x.c,1.6,NONE ct82c710.c,1.11,NONE db9.c,1.11,NONE emu10k1-gp.c,1.7,NONE fm801-gp.c,1.2,NONE gamecon.c,1.20,NONE gameport.c,1.17,NONE gf2k.c,1.18,NONE grip.c,1.20,NONE guillemot.c,1.9,NONE gunze.c,1.12,NONE iforce-ff.c,1.6,NONE iforce-main.c,1.5,NONE iforce-packets.c,1.5,NONE iforce-serio.c,1.2,NONE iforce-usb.c,1.4,NONE iforce.h,1.4,NONE inport.c,1.11,NONE interact.c,1.15,NONE jazzkbd.c,1.1,NONE lightning.c,1.19,NONE logibm.c,1.11,NONE magellan.c,1.15,NONE maple_keyb.c,1.1,NONE maplemouse.c,1.1,NONE mipskbd.c,1.1,NONE newtonkbd.c,1.3,NONE parkbd.c,1.8,NONE pc110pad.c,1.12,NONE ps2serkbd.c,1.5,NONE psmouse.c,1.14,NONE q40kbd.c,1.8,NONE rpckbd.c,1.7,NONE rpcmouse.c,1.11,NONE serio.c,1.14,NONE sermouse.c,1.15,NONE serport.c,1.13,NONE serport_old.c,1.8,NONE sidewinder.c,1.28,NONE spaceball.c,1.16,NONE spaceorb.c,1.14,NONE stinger.c,1.9,NONE sun8042.c,1.9,NONE sunkbd.c,1.14,NONE tmdc.c,1.30,NONE turbografx.c,1.13,NONE twidjoy.c,1.4,NONE vortex.c,1.2,NONE warrior.c,1.13,NONE xtkbd.c,1.11,NONE
Update of /cvsroot/linuxconsole/ruby/linux/drivers/input In directory usw-pr-cvs1:/tmp/cvs-serv18782 Modified Files: Makefile Removed Files: adi.c amijoy.c amimouse.c atkbd.c cobra.c cs461x.c ct82c710.c db9.c emu10k1-gp.c fm801-gp.c gamecon.c gameport.c gf2k.c grip.c guillemot.c gunze.c iforce-ff.c iforce-main.c iforce-packets.c iforce-serio.c iforce-usb.c iforce.h inport.c interact.c jazzkbd.c lightning.c logibm.c magellan.c maple_keyb.c maplemouse.c mipskbd.c newtonkbd.c parkbd.c pc110pad.c ps2serkbd.c psmouse.c q40kbd.c rpckbd.c rpcmouse.c serio.c sermouse.c serport.c serport_old.c sidewinder.c spaceball.c spaceorb.c stinger.c sun8042.c sunkbd.c tmdc.c turbografx.c twidjoy.c vortex.c warrior.c xtkbd.c Log Message: Cleanup. Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/Makefile,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- Makefile 2002/01/03 15:33:39 1.46 +++ Makefile 2002/01/23 06:35:30 1.47 @@ -1,173 +1,48 @@ # -# Makefile for the kernel Input device drivers. +# Makefile for the input core drivers. # -# Subdirs. - -SUB_DIRS := -MOD_SUB_DIRS := $(SUB_DIRS) -MOD_IN_SUB_DIRS := $(SUB_DIRS) -ALL_SUB_DIRS := $(SUB_DIRS) - # The target object and module list name. O_TARGET := inputdrv.o -M_OBJS := -O_OBJS := # Objects that export symbols. - -export-objs := input.o serio.o gameport.o -common-objs := input.o serio.o gameport.o - -# Multipart objects. - -hid-objs := hid-core.o hid-input.o - -ifeq ($(CONFIG_USB_HIDDEV),y) - hid-objs += hiddev.o -endif -iforce-objs := iforce-packets.o iforce-ff.o iforce-main.o -ifeq ($(CONFIG_INPUT_IFORCE_232), y) - iforce-objs += iforce-serio.o -else -ifeq ($(CONFIG_INPUT_IFORCE_232), m) - iforce-objs += iforce-serio.o -endif -endif - -ifeq ($(CONFIG_INPUT_IFORCE_USB), y) - iforce-objs += iforce-usb.o -else -ifeq ($(CONFIG_INPUT_IFORCE_USB), m) - iforce-objs += iforce-usb.o -endif -endif - -# Object file lists. - -obj-y := -obj-m := -obj-n := -obj- := +mod-subdirs := joystick keyboard mouse touchscreen +export-objs := input.o # Each configuration option enables a list of files. obj-$(CONFIG_INPUT) += input.o - -obj-$(CONFIG_INPUT_I8042) += i8042.o serio.o -obj-$(CONFIG_INPUT_CT82C710) += ct82c710.o serio.o -obj-$(CONFIG_INPUT_Q40KBD) += q40kbd.o serio.o -#obj-$(CONFIG_INPUT_SUN8042) += sun8042.o serio.o -obj-$(CONFIG_INPUT_RPCKBD) += rpckbd.o serio.o -#obj-$(CONFIG_INPUT_JAZZKBD) += jazzkbd.o serio.o -#obj-$(CONFIG_INPUT_MIPSKBD) += mipskbd.o serio.o -obj-$(CONFIG_INPUT_PARKBD) += parkbd.o serio.o - -obj-$(CONFIG_INPUT_SERPORT_OLD) += serport_old.o serio.o - -obj-$(CONFIG_INPUT_NS558) += ns558.o gameport.o -obj-$(CONFIG_INPUT_LIGHTNING) += lightning.o gameport.o -obj-$(CONFIG_INPUT_VORTEX) += vortex.o gameport.o -obj-$(CONFIG_INPUT_CS461X) += cs461x.o gameport.o -obj-$(CONFIG_INPUT_FM801) += fm801-gp.o gameport.o -obj-$(CONFIG_INPUT_EMU10K1) += emu10k1-gp.o gameport.o - -obj-$(CONFIG_INPUT_ATKBD) += atkbd.o serio.o -obj-$(CONFIG_INPUT_XTKBD) += xtkbd.o serio.o -obj-$(CONFIG_INPUT_PSMOUSE) += psmouse.o serio.o -obj-$(CONFIG_INPUT_NEWTON) += newtonkbd.o serio.o - -obj-$(CONFIG_INPUT_SERMOUSE) += sermouse.o serio.o -obj-$(CONFIG_INPUT_PS2SERIAL) += ps2serkbd.o serio.o -obj-$(CONFIG_INPUT_TWIDSERIAL) += twidjoy.o serio.o -obj-$(CONFIG_INPUT_SUNKBD) += sunkbd.o serio.o -obj-$(CONFIG_INPUT_WARRIOR) += warrior.o serio.o -obj-$(CONFIG_INPUT_MAGELLAN) += magellan.o serio.o -obj-$(CONFIG_INPUT_SPACEORB) += spaceorb.o serio.o -obj-$(CONFIG_INPUT_SPACEBALL) += spaceball.o serio.o -obj-$(CONFIG_INPUT_STINGER) += stinger.o serio.o -obj-$(CONFIG_INPUT_IFORCE_232) += iforce.o serio.o -obj-$(CONFIG_INPUT_GUNZE) += gunze.o serio.o -obj-$(CONFIG_TOUCHSCREEN_INPUT_BITSY) += h3600_ts_input.o serio.o - -obj-$(CONFIG_INPUT_ANALOG) += analog.o gameport.o -obj-$(CONFIG_INPUT_A3D) += a3d.o gameport.o -obj-$(CONFIG_INPUT_ADI) += adi.o gameport.o -obj-$(CONFIG_INPUT_COBRA) += cobra.o gameport.o -obj-$(CONFIG_INPUT_GF2K) += gf2k.o gameport.o -obj-$(CONFIG_INPUT_GRIP) += grip.o gameport.o -obj-$(CONFIG_INPUT_GUILLEMOT) += guillemot.o gameport.o -obj-$(CONFIG_INPUT_INTERACT) += interact.o gameport.o -obj-$(CONFIG_INPUT_TMDC) += tmdc.o gameport.o -obj-$(CONFIG_INPUT_SIDEWINDER) += sidewinder.o gameport.o -obj-$(CONFIG_INPUT_JOYDUMP) += joydump.o gameport.o - -obj-$(CONFIG_INPUT_DB9) += db9.o -obj-$(CONFIG_INPUT_GAMECON) += gamecon.o -obj-$(CONFIG_INPUT_TURBOGRAFX) += turbografx.o - -obj-$(CONFIG_INPUT_HID) += hid.o -obj-$(CONFIG_INPUT_USBMOUSE) += usbmouse.o -obj-$(CONFIG_INPUT_USBKBD) += usbkbd.o -obj-$(CONFIG_INPUT_WACOMUSB) += wacom.o -obj-$(CONFIG_INPUT_IFORCE_USB) += iforce.o - -obj-$(CONFIG_INPUT_ADBHID) += adbhid.o -obj-$(CONFIG_MAC_EMUMOUSEBTN) += mac_hid.o - -obj-$(CONFIG_MAPLE_KEYBOARD) += maple_keyb.o -obj-$(CONFIG_MAPLE_MOUSE) += maplemouse.o - obj-$(CONFIG_INPUT_KEYBDEV) += keybdev.o obj-$(CONFIG_INPUT_MOUSEDEV) += mousedev.o obj-$(CONFIG_INPUT_JOYDEV) += joydev.o -obj-$(CONFIG_INPUT_TOUCHSCREEN) += tsdev.o -obj-$(CONFIG_PM) += power.o obj-$(CONFIG_INPUT_EVDEV) += evdev.o +obj-$(CONFIG_INPUT_TSDEV) += tsdev.o +obj-$(CONFIG_INPUT_POWER) += power.o obj-$(CONFIG_INPUT_EVBUG) += evbug.o -obj-$(CONFIG_INPUT_INPORT) += inport.o -obj-$(CONFIG_INPUT_LOGIBM) += logibm.o -obj-$(CONFIG_INPUT_PC110PAD) += pc110pad.o -#obj-$(CONIG_INPUT_BTTV) += bttv.o -obj-$(CONFIG_INPUT_AMIKEYB) += amikeyb.o -obj-$(CONFIG_INPUT_AMIMOUSE) += amimouse.o -obj-$(CONFIG_INPUT_AMIJOY) += amijoy.o -#obj-$(CONFIG_INPUT_ATARIKBD) += atarikbd.o -#obj-$(CONFIG_INPUT_ATARIMOUSE) += atarimouse.o -#obj-$(CONFIG_INPUT_ATARIJOY) += atarijoy.o -obj-$(CONFIG_INPUT_RPCMOUSE) += rpcmouse.o -#obj-$(CONFIG_INPUT_ARCKBD) += arckbd.o -#obj-$(CONFIG_INPUT_APOLLOKBD) += apollokbd.o -#obj-$(CONFIG_INPUT_HPHIL) += hphil.o - -# Remove duplicates. - -common-y := $(filter $(obj-y),$(common-obj)) -obj-y := $(filter-out $(common-y), $(obj-y)) $(common-y) +subdir-$(CONFIG_INPUT_JOYSTICK) += joystick +subdir-$(CONFIG_INPUT_KEYBOARD) += keyboard +subdir-$(CONFIG_INPUT_MOUSE) += mouse +subdir-$(CONFIG_INPUT_TS) += touchscreen -# Files that are both resident and modular: remove from modular. +ifeq ($(CONFIG_INPUT_KEYBOARD),y) + obj-y += keyboard/keybdrv.o +endif -obj-m := $(filter-out $(obj-y), $(obj-m)) -int-m := $(filter-out $(int-y), $(int-m)) +ifeq ($(CONFIG_INPUT_MOUSE),y) + obj-y += mouse/mousedrv.o +endif -# Translate to Rules.make lists. +ifeq ($(CONFIG_INPUT_JOYSTICK),y) + obj-y += joystick/joydrv.o +endif -O_OBJS := $(filter-out $(export-objs), $(obj-y)) -OX_OBJS := $(filter $(export-objs), $(obj-y)) -M_OBJS := $(sort $(filter-out $(export-objs), $(obj-m))) -MX_OBJS := $(sort $(filter $(export-objs), $(obj-m))) +ifeq ($(CONFIG_INPUT_TS),y) + obj-y += touchscreen/tsdrv.o +endif # The global Rules.make. include $(TOPDIR)/Rules.make - -# Link rules for multi-part drivers. - -hid.o: $(hid-objs) - $(LD) -r -o $@ $(hid-objs) - -iforce.o: $(iforce-objs) - $(LD) -r -o $@ $(iforce-objs) --- adi.c DELETED --- --- amijoy.c DELETED --- --- amimouse.c DELETED --- --- atkbd.c DELETED --- --- cobra.c DELETED --- --- cs461x.c DELETED --- --- ct82c710.c DELETED --- --- db9.c DELETED --- --- emu10k1-gp.c DELETED --- --- fm801-gp.c DELETED --- --- gamecon.c DELETED --- --- gameport.c DELETED --- --- gf2k.c DELETED --- --- grip.c DELETED --- --- guillemot.c DELETED --- --- gunze.c DELETED --- --- iforce-ff.c DELETED --- --- iforce-main.c DELETED --- --- iforce-packets.c DELETED --- --- iforce-serio.c DELETED --- --- iforce-usb.c DELETED --- --- iforce.h DELETED --- --- inport.c DELETED --- --- interact.c DELETED --- --- jazzkbd.c DELETED --- --- lightning.c DELETED --- --- logibm.c DELETED --- --- magellan.c DELETED --- --- maple_keyb.c DELETED --- --- maplemouse.c DELETED --- --- mipskbd.c DELETED --- --- newtonkbd.c DELETED --- --- parkbd.c DELETED --- --- pc110pad.c DELETED --- --- ps2serkbd.c DELETED --- --- psmouse.c DELETED --- --- q40kbd.c DELETED --- --- rpckbd.c DELETED --- --- rpcmouse.c DELETED --- --- serio.c DELETED --- --- sermouse.c DELETED --- --- serport.c DELETED --- --- serport_old.c DELETED --- --- sidewinder.c DELETED --- --- spaceball.c DELETED --- --- spaceorb.c DELETED --- --- stinger.c DELETED --- --- sun8042.c DELETED --- --- sunkbd.c DELETED --- --- tmdc.c DELETED --- --- turbografx.c DELETED --- --- twidjoy.c DELETED --- --- vortex.c DELETED --- --- warrior.c DELETED --- --- xtkbd.c DELETED --- |
