patch-2.4.0-test2 linux/drivers/i2o/Makefile

Next file: linux/drivers/i2o/README
Previous file: linux/drivers/i2c/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/i2o/Makefile linux/drivers/i2o/Makefile
@@ -1,75 +1,25 @@
 #
 # Makefile for the kernel I2O OSM.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definition is now inherited from the
-# parent makefile.
-#
-
-#
 # Note : at this point, these files are compiled on all systems.
 # In the future, some of these should be built conditionally.
 #
 
-SUB_DIRS     := 
-MOD_SUB_DIRS := $(SUB_DIRS)
-ALL_SUB_DIRS := $(SUB_DIRS)
-
-
-L_TARGET := i2o.a
-L_OBJS   := 
-M_OBJS   :=
-
-ifeq ($(CONFIG_I2O_PCI),y)
-L_OBJS += i2o_pci.o
-else
-  ifeq ($(CONFIG_I2O_PCI),m)
-  MX_OBJS += i2o_pci.o
-  endif
-endif
-
-ifeq ($(CONFIG_I2O),y)
-LX_OBJS += i2o_core.o i2o_config.o
-else
-  ifeq ($(CONFIG_I2O),m)
-  MX_OBJS += i2o_core.o i2o_config.o
-  endif
-endif
-
-ifeq ($(CONFIG_I2O_BLOCK),y)
-LX_OBJS += i2o_block.o
-else
-  ifeq ($(CONFIG_I2O_BLOCK),m)
-  MX_OBJS += i2o_block.o
-  endif
-endif
-
-ifeq ($(CONFIG_I2O_LAN),y)
-LX_OBJS += i2o_lan.o
-else
-  ifeq ($(CONFIG_I2O_LAN),m)
-  MX_OBJS += i2o_lan.o
-  endif
-endif
+O_TARGET := i2o.o
 
-ifeq ($(CONFIG_I2O_SCSI),y)
-LX_OBJS += i2o_scsi.o
-else
-  ifeq ($(CONFIG_I2O_SCSI),m)
-  MX_OBJS += i2o_scsi.o
-  endif
-endif
+export-objs	:= i2o_pci.o i2o_core.o i2o_config.o i2o_block.o i2o_lan.o i2o_scsi.o i2o_proc.o
 
-ifeq ($(CONFIG_I2O_PROC),y)
-LX_OBJS += i2o_proc.o
-else
-  ifeq ($(CONFIG_I2O_PROC),m)
-  MX_OBJS += i2o_proc.o
-  endif
-endif
+obj-$(CONFIG_I2O_PCI)	+= i2o_pci.o
+obj-$(CONFIG_I2O)	+= i2o_core.o i2o_config.o
+obj-$(CONFIG_I2O_BLOCK)	+= i2o_block.o
+obj-$(CONFIG_I2O_LAN)	+= i2o_lan.o
+obj-$(CONFIG_I2O_SCSI)	+= i2o_scsi.o
+obj-$(CONFIG_I2O_PROC)	+= i2o_proc.o
+
+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)))
 
 include $(TOPDIR)/Rules.make
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)