patch-2.4.0-test2 linux/drivers/char/joystick/Makefile

• Lines: 223
• Date: Wed Jun 21 08:22:21 2000
• Orig file: v2.4.0-test1/linux/drivers/char/joystick/Makefile
• Orig date: Wed Dec 8 14:11:26 1999

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/char/joystick/Makefile linux/drivers/char/joystick/Makefile
@@ -2,154 +2,73 @@
 # Makefile for the joystick drivers.
 #
 
-O_TARGET := js.o
-OX_OBJS  :=
-O_OBJS   :=
-MX_OBJS  :=
-M_OBJS   :=
-
-ifeq ($(CONFIG_JOYSTICK),y)
-OX_OBJS += joystick.o
-else
-  ifeq ($(CONFIG_JOYSTICK),m)
-  MX_OBJS += joystick.o
-  endif
-endif
-
-ifeq ($(CONFIG_JOY_AMIGA),y)
-O_OBJS += joy-amiga.o
-else
-  ifeq ($(CONFIG_JOY_AMIGA),m)
-  M_OBJS += joy-amiga.o
-  endif
-endif
-
-ifeq ($(CONFIG_JOY_ANALOG),y)
-O_OBJS += joy-analog.o
-else
-  ifeq ($(CONFIG_JOY_ANALOG),m)
-  M_OBJS += joy-analog.o
-  endif
-endif
-
-ifeq ($(CONFIG_JOY_ASSASSIN),y)
-O_OBJS += joy-assassin.o
-else
-  ifeq ($(CONFIG_JOY_ASSASSIN),m)
-  M_OBJS += joy-assassin.o
-  endif
-endif
-
-ifeq ($(CONFIG_JOY_CONSOLE),y)
-O_OBJS += joy-console.o
-else
-  ifeq ($(CONFIG_JOY_CONSOLE),m)
-  M_OBJS += joy-console.o
-  endif
-endif
-
-ifeq ($(CONFIG_JOY_CREATIVE),y)
-O_OBJS += joy-creative.o
-else
-  ifeq ($(CONFIG_JOY_CREATIVE),m)
-  M_OBJS += joy-creative.o
-  endif
-endif
-
-ifeq ($(CONFIG_JOY_DB9),y)
-O_OBJS += joy-db9.o
-else
-  ifeq ($(CONFIG_JOY_DB9),m)
-  M_OBJS += joy-db9.o
-  endif
-endif
-
-ifeq ($(CONFIG_JOY_GRAVIS),y)
-O_OBJS += joy-gravis.o
-else
-  ifeq ($(CONFIG_JOY_GRAVIS),m)
-  M_OBJS += joy-gravis.o
-  endif
-endif
-
-ifeq ($(CONFIG_JOY_LIGHTNING),y)
-O_OBJS += joy-lightning.o
-else
-  ifeq ($(CONFIG_JOY_LIGHTNING),m)
-  M_OBJS += joy-lightning.o
-  endif
-endif
-
-ifeq ($(CONFIG_JOY_LOGITECH),y)
-O_OBJS += joy-logitech.o
-else
-  ifeq ($(CONFIG_JOY_LOGITECH),m)
-  M_OBJS += joy-logitech.o
-  endif
-endif
-
-ifeq ($(CONFIG_JOY_MAGELLAN),y)
-O_OBJS += joy-magellan.o
-else
-  ifeq ($(CONFIG_JOY_MAGELLAN),m)
-  M_OBJS += joy-magellan.o
-  endif
-endif
-
-ifeq ($(CONFIG_JOY_PCI),y)
-O_OBJS += joy-pci.o
-else
-  ifeq ($(CONFIG_JOY_PCI),m)
-  M_OBJS += joy-pci.o
-  endif
-endif
-
-ifeq ($(CONFIG_JOY_SIDEWINDER),y)
-O_OBJS += joy-sidewinder.o
-else
-  ifeq ($(CONFIG_JOY_SIDEWINDER),m)
-  M_OBJS += joy-sidewinder.o
-  endif
-endif
-
-ifeq ($(CONFIG_JOY_SPACEORB),y)
-O_OBJS += joy-spaceorb.o
-else
-  ifeq ($(CONFIG_JOY_SPACEORB),m)
-  M_OBJS += joy-spaceorb.o
-  endif
-endif
-
-ifeq ($(CONFIG_JOY_SPACEBALL),y)
-O_OBJS += joy-spaceball.o
-else
-  ifeq ($(CONFIG_JOY_SPACEBALL),m)
-  M_OBJS += joy-spaceball.o
-  endif
-endif
-
-ifeq ($(CONFIG_JOY_THRUSTMASTER),y)
-O_OBJS += joy-thrustmaster.o
-else 
-  ifeq ($(CONFIG_JOY_THRUSTMASTER),m)
-  M_OBJS += joy-thrustmaster.o
-  endif
-endif
-
-ifeq ($(CONFIG_JOY_TURBOGRAFX),y)
-O_OBJS += joy-turbografx.o
-else 
-  ifeq ($(CONFIG_JOY_TURBOGRAFX),m)
-  M_OBJS += joy-turbografx.o
-  endif
-endif
-
-ifeq ($(CONFIG_JOY_WARRIOR),y)
-O_OBJS += joy-warrior.o
-else
-  ifeq ($(CONFIG_JOY_WARRIOR),m)
-  M_OBJS += joy-warrior.o
-  endif
-endif
+# 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	:= js.o
+M_OBJS		:=
+O_OBJS		:=
+#MOD_LIST_NAME	:= INPUT_MODULES
+
+# Objects that export symbols.
+
+export-objs	:= serio.o gameport.o
+
+# Object file lists.
+
+obj-y	:=
+obj-m	:=
+obj-n	:=
+obj-	:=
+
+# Each configuration option enables a list of files.
+
+obj-$(CONFIG_INPUT_SERPORT)	+= serport.o serio.o
+
+obj-$(CONFIG_INPUT_NS558)	+= ns558.o gameport.o
+obj-$(CONFIG_INPUT_LIGHTNING)	+= lightning.o gameport.o
+obj-$(CONFIG_INPUT_PCIGAME)	+= pcigame.o gameport.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_IFORCE_232)	+= 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_INTERACT)	+= interact.o gameport.o
+obj-$(CONFIG_INPUT_TMDC)	+= tmdc.o gameport.o
+obj-$(CONFIG_INPUT_SIDEWINDER)	+= sidewinder.o gameport.o
+
+obj-$(CONFIG_INPUT_DB9)		+= db9.o
+obj-$(CONFIG_INPUT_GAMECON)	+= gamecon.o
+obj-$(CONFIG_INPUT_TURBOGRAFX)	+= turbografx.o
+
+obj-$(CONFIG_INPUT_AMIJOY)	+= amijoy.o
+
+# Files that are both resident and modular: remove from modular.
+
+obj-m		:= $(filter-out $(obj-y), $(obj-m))
+int-m		:= $(filter-out $(int-y), $(int-m))
+
+# Translate to Rules.make lists.
+
+O_OBJS		:= $(sort $(filter-out $(export-objs), $(obj-y)))
+OX_OBJS		:= $(sort $(filter     $(export-objs), $(obj-y)))
+M_OBJS		:= $(sort $(filter-out $(export-objs), $(obj-m)))
+MX_OBJS		:= $(sort $(filter     $(export-objs), $(obj-m)))
+
+# The global Rules.make.
 
 include $(TOPDIR)/Rules.make