patch-2.4.8 linux/drivers/s390/char/Makefile

Next file: linux/drivers/s390/char/con3215.c
Previous file: linux/drivers/s390/ccwcache.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.7/linux/drivers/s390/char/Makefile linux/drivers/s390/char/Makefile
@@ -1,42 +1,33 @@
-# Makefile for the S/390 supported character devices
 #
-# 4 January 2001 Richard Hitt
-# Modeled after similar files of Michael Elizabeth Chastain
-# Rewritten to use lists instead of if-statements.
+# S/390 character devices
+#
 
-O_TARGET	:= s390-char.o
+O_TARGET := s390-char.o
 
-export-objs     :=
 list-multi	:= tub3270.o tape390.o
 
-obj-y		:=
-obj-m		:=
-obj-n		:=
-obj-		:=
-
-tub3270-objs			:= tuball.o tubfs.o tubtty.o \
-					tubttyaid.o tubttybld.o tubttyrcl.o \
-					tubttyscl.o tubttysiz.o
+tub3270-objs := tuball.o tubfs.o tubtty.o \
+                     tubttyaid.o tubttybld.o tubttyscl.o \
+                     tubttyrcl.o tubttysiz.o
+
+tape390-$(CONFIG_S390_TAPE_CHAR) += tapechar.o
+tape390-$(CONFIG_S390_TAPE_BLOCK) += tapeblock.o
+tape390-$(CONFIG_S390_TAPE_3480) += tape3480.o tape34xx.o
+tape390-$(CONFIG_S390_TAPE_3490) += tape3490.o tape34xx.o
+tape390-objs := tape.o $(sort $(tape390-y))
 
 obj-y += ctrlchar.o
-obj-$(CONFIG_3215_CONSOLE)	+= con3215.o
-obj-$(CONFIG_HWC)		+= hwc_con.o hwc_rw.o hwc_tty.o
-obj-$(CONFIG_3270)		+= tub3270.o
-
-tape-y				:= tape.o
-tape-$(CONFIG_S390_TAPE_CHAR)	+= tapechar.o
-tape-$(CONFIG_S390_TAPE_BLOCK)	+= tapeblock.o
-tape-$(CONFIG_S390_TAPE_3480)	+= tape3480.o tape34xx.o
-tape-$(CONFIG_S390_TAPE_3490)	+= tape3490.o tape34xx.o
-tape390-objs			:= $(sort $(tape-y))
-obj-$(CONFIG_S390_TAPE)		+= tape390.o
-
-# Hand off to Rules.make.
+obj-$(CONFIG_TN3215) += con3215.o
+obj-$(CONFIG_HWC) += hwc_con.o hwc_rw.o hwc_tty.o
+obj-$(CONFIG_HWC_CPI) += hwc_cpi.o
+obj-$(CONFIG_TN3270) += tub3270.o
+obj-$(CONFIG_S390_TAPE) += tape390.o
 
 include $(TOPDIR)/Rules.make
 
-tub3270.o:	$(tub3270-objs)
+tub3270.o: $(tub3270-objs)
 	$(LD) -r -o $@ $(tub3270-objs)
 
-tape390.o:	$(tape390-objs)
+tape390.o: $(tape390-objs)
 	$(LD) -r -o $@ $(tape390-objs)
+

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