Messages in this thread Patch in this message | | | Date | Thu, 12 Aug 1999 20:53:19 +0200 | From | Thomas Sailer <> | Subject | Re: PATCH: please backout this set of broken changes |
| |
How about this one?
Change from L_TARGET to O_TARGET (from .a to .o) in drivers/net/hamradio and drivers/sound to make the module_init stuff work in these two directories. Also kill a couple $(sort xx)'s in the sound makefile in an attempt to preserve module link order.
Any objections?
Tom--- Makefile 1999/08/12 15:13:50 1.1 +++ Makefile 1999/08/12 18:33:58 @@ -134,7 +134,7 @@ endif ifeq ($(CONFIG_SOUND),y) -DRIVERS := $(DRIVERS) drivers/sound/sound.a +DRIVERS := $(DRIVERS) drivers/sound/sounddrivers.o endif ifdef CONFIG_PCI @@ -178,7 +178,7 @@ endif ifdef CONFIG_HAMRADIO -DRIVERS := $(DRIVERS) drivers/net/hamradio/hamradio.a +DRIVERS := $(DRIVERS) drivers/net/hamradio/hamradio.o endif ifeq ($(CONFIG_TC),y) --- drivers/sound/Makefile 1999/08/12 15:02:54 1.2 +++ drivers/sound/Makefile 1999/08/12 15:12:51 @@ -141,19 +141,19 @@ # Translate to Rules.make lists. -L_TARGET := sound.a +O_TARGET := sounddrivers.o # This is a nice idea but needs depmod altering #MOD_LIST_NAME := SOUND_MODULES -L_OBJS := $(sort $(filter-out $(export-objs), $(obj-y))) -LX_OBJS := $(sort $(filter $(export-objs), $(obj-y))) +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))) MI_OBJS := $(sort $(filter-out $(export-objs), $(int-m))) MIX_OBJS := $(sort $(filter $(export-objs), $(int-m))) ifeq ($(CONFIG_LOWLEVEL_SOUND),y) - L_OBJS += lowlevel/lowlevel.o + O_OBJS += lowlevel/lowlevel.o endif include $(TOPDIR)/Rules.make --- drivers/net/hamradio/Makefile 1999/08/12 18:30:37 3.14 +++ drivers/net/hamradio/Makefile 1999/08/12 18:32:59 @@ -11,8 +11,8 @@ MOD_SUB_DIRS := $(SUB_DIRS) ALL_SUB_DIRS := $(SUB_DIRS) -L_TARGET := hamradio.a -L_OBJS := +O_TARGET := hamradio.o +O_OBJS := M_OBJS := MOD_LIST_NAME := HAM_MODULES @@ -22,7 +22,7 @@ CONFIG_HDLCDRV_MODULE := ifeq ($(CONFIG_DMASCC),y) -L_OBJS += dmascc.o +O_OBJS += dmascc.o else ifeq ($(CONFIG_DMASCC),m) M_OBJS += dmascc.o @@ -30,7 +30,7 @@ endif ifeq ($(CONFIG_SCC),y) -L_OBJS += scc.o +O_OBJS += scc.o else ifeq ($(CONFIG_SCC),m) M_OBJS += scc.o @@ -38,7 +38,7 @@ endif ifeq ($(CONFIG_MKISS),y) -L_OBJS += mkiss.o +O_OBJS += mkiss.o else ifeq ($(CONFIG_MKISS),m) M_OBJS += mkiss.o @@ -46,7 +46,7 @@ endif ifeq ($(CONFIG_6PACK),y) -L_OBJS += 6pack.o +O_OBJS += 6pack.o else ifeq ($(CONFIG_6PACK),m) M_OBJS += 6pack.o @@ -54,7 +54,7 @@ endif ifeq ($(CONFIG_YAM),y) -L_OBJS += yam.o +O_OBJS += yam.o else ifeq ($(CONFIG_YAM),m) M_OBJS += yam.o @@ -62,7 +62,7 @@ endif ifeq ($(CONFIG_PI),y) -L_OBJS += pi2.o +O_OBJS += pi2.o else ifeq ($(CONFIG_PI),m) M_OBJS += pi2.o @@ -70,7 +70,7 @@ endif ifeq ($(CONFIG_PT),y) -L_OBJS += pt.o +O_OBJS += pt.o else ifeq ($(CONFIG_PT),m) M_OBJS += pt.o @@ -78,7 +78,7 @@ endif ifeq ($(CONFIG_BPQETHER),y) -L_OBJS += bpqether.o +O_OBJS += bpqether.o else ifeq ($(CONFIG_BPQETHER),m) M_OBJS += bpqether.o @@ -86,7 +86,7 @@ endif ifeq ($(CONFIG_BAYCOM_SER_FDX),y) -L_OBJS += baycom_ser_fdx.o +O_OBJS += baycom_ser_fdx.o CONFIG_HDLCDRV_BUILTIN = y else ifeq ($(CONFIG_BAYCOM_SER_FDX),m) @@ -96,7 +96,7 @@ endif ifeq ($(CONFIG_BAYCOM_SER_HDX),y) -L_OBJS += baycom_ser_hdx.o +O_OBJS += baycom_ser_hdx.o CONFIG_HDLCDRV_BUILTIN = y else ifeq ($(CONFIG_BAYCOM_SER_HDX),m) @@ -106,7 +106,7 @@ endif ifeq ($(CONFIG_BAYCOM_PAR),y) -L_OBJS += baycom_par.o +O_OBJS += baycom_par.o CONFIG_HDLCDRV_BUILTIN = y else ifeq ($(CONFIG_BAYCOM_PAR),m) @@ -116,7 +116,7 @@ endif ifeq ($(CONFIG_BAYCOM_EPP),y) -L_OBJS += baycom_epp.o +O_OBJS += baycom_epp.o else ifeq ($(CONFIG_BAYCOM_EPP),m) M_OBJS += baycom_epp.o @@ -124,7 +124,7 @@ endif ifeq ($(CONFIG_BAYCOM_EPPFLEX),y) -L_OBJS += baycom_eppflex.o +O_OBJS += baycom_eppflex.o else ifeq ($(CONFIG_BAYCOM_EPPFLEX),m) M_OBJS += baycom_eppflex.o @@ -134,7 +134,7 @@ ifeq ($(CONFIG_SOUNDMODEM),y) ALL_SUB_DIRS += soundmodem SUB_DIRS += soundmodem -L_OBJS += soundmodem/soundmodem.o +O_OBJS += soundmodem/soundmodem.o CONFIG_HDLCDRV_BUILTIN = y else ifeq ($(CONFIG_SOUNDMODEM),m) @@ -147,7 +147,7 @@ # If anything built-in uses the hdlcdrv, then build it into the kernel also. # If not, but a module uses it, build as a module. ifdef CONFIG_HDLCDRV_BUILTIN -LX_OBJS += hdlcdrv.o +OX_OBJS += hdlcdrv.o else ifdef CONFIG_HDLCDRV_MODULE MX_OBJS += hdlcdrv.o --- drivers/net/hamradio/Config.in 1999/08/10 11:07:57 3.13 +++ drivers/net/hamradio/Config.in 1999/08/12 18:41:52 @@ -11,12 +11,13 @@ bool ' support for TRX that feedback the tx signal to rx' CONFIG_SCC_TRXECHO fi -tristate 'BAYCOM ser12 fullduplex driver for AX.25' CONFIG_BAYCOM_SER_FDX -tristate 'BAYCOM ser12 halfduplex driver for AX.25' CONFIG_BAYCOM_SER_HDX -dep_tristate 'BAYCOM picpar and par96 driver for AX.25' CONFIG_BAYCOM_PAR $CONFIG_PARPORT -dep_tristate 'BAYCOM epp driver for AX.25' CONFIG_BAYCOM_EPP $CONFIG_PARPORT +dep_tristate 'BAYCOM ser12 fullduplex driver for AX.25' CONFIG_BAYCOM_SER_FDX $CONFIG_AX25 +dep_tristate 'BAYCOM ser12 halfduplex driver for AX.25' CONFIG_BAYCOM_SER_HDX $CONFIG_AX25 +dep_tristate 'BAYCOM picpar and par96 driver for AX.25' CONFIG_BAYCOM_PAR $CONFIG_PARPORT $CONFIG_AX25 +dep_tristate 'BAYCOM epp driver for AX.25' CONFIG_BAYCOM_EPP $CONFIG_PARPORT $CONFIG_AX25 +dep_tristate 'BAYCOM eppflex driver for AX.25' CONFIG_BAYCOM_EPPFLEX $CONFIG_PARPORT $CONFIG_AX25 -dep_tristate 'Soundcard modem driver' CONFIG_SOUNDMODEM $CONFIG_PARPORT +dep_tristate 'Soundcard modem driver' CONFIG_SOUNDMODEM $CONFIG_PARPORT $CONFIG_AX25 if [ "$CONFIG_SOUNDMODEM" != "n" ]; then bool ' soundmodem support for Soundblaster and compatible cards' CONFIG_SOUNDMODEM_SBC bool ' soundmodem support for WSS and Crystal cards' CONFIG_SOUNDMODEM_WSS | |