merge Makefile changes from KERNEL_2_4
This commit is contained in:
Kai Germaschewski
parent
217e453e65
commit
100bf42e08
|
|
@ -9,7 +9,7 @@ if [ "$CONFIG_INET" != "n" ]; then
|
|||
if [ "$CONFIG_ISDN_PPP" != "n" ]; then
|
||||
bool ' Use VJ-compression with synchronous PPP' CONFIG_ISDN_PPP_VJ
|
||||
bool ' Support generic MP (RFC 1717)' CONFIG_ISDN_MPP
|
||||
dep_tristate ' Support BSD compression (module only)' CONFIG_ISDN_PPP_BSDCOMP m
|
||||
dep_tristate ' Support BSD compression' CONFIG_ISDN_PPP_BSDCOMP $CONFIG_ISDN
|
||||
fi
|
||||
fi
|
||||
bool ' Support audio via ISDN' CONFIG_ISDN_AUDIO
|
||||
|
|
@ -58,7 +58,7 @@ endmenu
|
|||
mainmenu_option next_comment
|
||||
comment 'ISDN feature submodules'
|
||||
dep_tristate 'isdnloop support' CONFIG_ISDN_DRV_LOOP $CONFIG_ISDN
|
||||
bool 'Support isdn diversion services' CONFIG_ISDN_DIVERSION
|
||||
dep_tristate 'Support isdn diversion services' CONFIG_ISDN_DIVERSION $CONFIG_ISDN
|
||||
endmenu
|
||||
|
||||
comment 'low-level hardware drivers'
|
||||
|
|
@ -107,6 +107,7 @@ if [ "$CONFIG_ISDN_DRV_HISAX" != "n" ]; then
|
|||
if [ "$CONFIG_EXPERIMENTAL" != "n" ]; then
|
||||
bool ' HFC-S+, HFC-SP, HFC-PCMCIA cards' CONFIG_HISAX_HFC_SX
|
||||
# bool ' TESTEMULATOR (EXPERIMENTAL)' CONFIG_HISAX_TESTEMU
|
||||
bool ' Sedlbauer PCMCIA cards' CONFIG_HISAX_SEDLBAUER_CS
|
||||
if [ "$ARCH" = "sparc" -o "$ARCH" = "sparc64" ]; then
|
||||
bool ' Am7930' CONFIG_HISAX_AMD7930
|
||||
fi
|
||||
|
|
@ -127,7 +128,7 @@ dep_tristate 'IBM Active 2000 support' CONFIG_ISDN_DRV_ACT2000 $CONFIG_ISD
|
|||
bool 'Eicon active card support' CONFIG_ISDN_DRV_EICON
|
||||
if [ "$CONFIG_ISDN_DRV_EICON" != "n" ]; then
|
||||
if [ "$CONFIG_ISDN_DRV_EICON_OLD" != "y" ]; then
|
||||
dep_tristate ' Build Eicon driver type standalone' CONFIG_ISDN_DRV_EICON_DIVAS $CONFIG_ISDN
|
||||
dep_tristate ' Build Eicon driver type standalone' CONFIG_ISDN_DRV_EICON_DIVAS $CONFIG_ISDN $CONFIG_PCI
|
||||
fi
|
||||
if [ "$CONFIG_ISDN_DRV_EICON_DIVAS" != "y" ]; then
|
||||
dep_tristate ' Legacy Eicon driver' CONFIG_ISDN_DRV_EICON_OLD $CONFIG_ISDN
|
||||
|
|
|
|||
|
|
@ -23,13 +23,6 @@ isdn-objs-$(CONFIG_ISDN_WITH_ABC) += isdn_dwabc.o
|
|||
|
||||
isdn-objs += $(isdn-objs-y)
|
||||
|
||||
# Object file lists.
|
||||
|
||||
obj-y :=
|
||||
obj-m :=
|
||||
obj-n :=
|
||||
obj- :=
|
||||
|
||||
# Ordering constraints: isdn.o first, rest doesn't matter
|
||||
|
||||
# Each configuration option enables a list of files.
|
||||
|
|
@ -39,29 +32,19 @@ obj-$(CONFIG_ISDN_PPP_BSDCOMP) += isdn_bsdcomp.o
|
|||
|
||||
# Object files in subdirectories
|
||||
|
||||
mod-subdirs := avmb1 eicon
|
||||
subdir-$(CONFIG_ISDN_DIVERSION) += divert
|
||||
subdir-$(CONFIG_ISDN_DRV_HISAX) += hisax
|
||||
subobj-$(CONFIG_ISDN_DRV_HISAX) += hisax/hisax_drv.o
|
||||
subdir-$(CONFIG_ISDN_DRV_ICN) += icn
|
||||
subobj-$(CONFIG_ISDN_DRV_ICN) += icn/icn_drv.o
|
||||
subdir-$(CONFIG_ISDN_DRV_PCBIT) += pcbit
|
||||
subobj-$(CONFIG_ISDN_DRV_PCBIT) += pcbit/pcbit_drv.o
|
||||
subdir-$(CONFIG_ISDN_DRV_SC) += sc
|
||||
subobj-$(CONFIG_ISDN_DRV_SC) += sc/sc_drv.o
|
||||
subdir-$(CONFIG_ISDN_CAPI) += avmb1
|
||||
subobj-$(CONFIG_ISDN_CAPI) += avmb1/avmb1.o
|
||||
subdir-$(CONFIG_ISDN_DRV_LOOP) += isdnloop
|
||||
subobj-$(CONFIG_ISDN_DRV_LOOP) += isdnloop/isdnloop_drv.o
|
||||
subdir-$(CONFIG_ISDN_DRV_ACT2000) += act2000
|
||||
subobj-$(CONFIG_ISDN_DRV_ACT2000) += act2000/act2000_drv.o
|
||||
subdir-$(CONFIG_ISDN_DRV_EICON_OLD) += eicon
|
||||
subobj-$(CONFIG_ISDN_DRV_EICON_OLD) += eicon/eicon_drv.o
|
||||
subdir-$(CONFIG_ISDN_DRV_EICON_DIVAS) += eicon
|
||||
subobj-$(CONFIG_ISDN_DRV_EICON_DIVAS) += eicon/eicon_drv.o
|
||||
subdir-$(CONFIG_ISDN_DRV_EICON) += eicon
|
||||
subdir-$(CONFIG_HYSDN) += hysdn
|
||||
subobj-$(CONFIG_HYSDN) += hysdn/hysdn_drv.o
|
||||
|
||||
obj-y += $(subobj-y)
|
||||
obj-y += $(addsuffix /vmlinux-obj.o, $(subdir-y))
|
||||
|
||||
# The global Rules.make.
|
||||
|
||||
|
|
|
|||
|
|
@ -2,24 +2,13 @@
|
|||
|
||||
# The target object and module list name.
|
||||
|
||||
O_TARGET := act2000_drv.o
|
||||
|
||||
# Objects that export symbols.
|
||||
|
||||
export-objs :=
|
||||
O_TARGET := vmlinux-obj.o
|
||||
|
||||
# Multipart objects.
|
||||
|
||||
list-multi := act2000.o
|
||||
act2000-objs := module.o capi.o act2000_isa.o
|
||||
|
||||
# Object file lists.
|
||||
|
||||
obj-y :=
|
||||
obj-m :=
|
||||
obj-n :=
|
||||
obj- :=
|
||||
|
||||
# Each configuration option enables a list of files.
|
||||
|
||||
obj-$(CONFIG_ISDN_DRV_ACT2000) += act2000.o
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# The target object and module list name.
|
||||
|
||||
O_TARGET := avmb1.o
|
||||
O_TARGET := vmlinux-obj.o
|
||||
|
||||
# Objects that export symbols.
|
||||
|
||||
|
|
@ -13,17 +13,10 @@ export-objs := kcapi.o capiutil.o b1dma.o b1pcmcia.o b1.o capifs.o
|
|||
list-multi := kernelcapi.o
|
||||
kernelcapi-objs := kcapi.o
|
||||
|
||||
# Object file lists.
|
||||
|
||||
obj-y :=
|
||||
obj-m :=
|
||||
obj-n :=
|
||||
obj- :=
|
||||
# Ordering constraints: kernelcapi.o first
|
||||
|
||||
# Each configuration option enables a list of files.
|
||||
|
||||
# Ordering constraints: kernelcapi.o first
|
||||
|
||||
obj-$(CONFIG_ISDN_CAPI) += kernelcapi.o capiutil.o
|
||||
obj-$(CONFIG_ISDN_CAPI_CAPI20) += capi.o
|
||||
obj-$(CONFIG_ISDN_CAPI_CAPIDRV) += capidrv.o
|
||||
|
|
|
|||
|
|
@ -4,27 +4,16 @@
|
|||
|
||||
# The target object and module list name.
|
||||
|
||||
O_TARGET :=
|
||||
|
||||
# Objects that export symbols.
|
||||
|
||||
export-objs :=
|
||||
O_TARGET := vmlinux-obj.o
|
||||
|
||||
# Multipart objects.
|
||||
|
||||
list-multi := dss1_divert.o
|
||||
dss1_divert-objs := isdn_divert.o divert_procfs.o divert_init.o
|
||||
|
||||
# Object file lists.
|
||||
|
||||
obj-y :=
|
||||
obj-m :=
|
||||
obj-n :=
|
||||
obj- :=
|
||||
|
||||
# Each configuration option enables a list of files.
|
||||
|
||||
obj-m += dss1_divert.o
|
||||
obj-$(CONFIG_ISDN_DIVERSION) += dss1_divert.o
|
||||
|
||||
include $(TOPDIR)/drivers/isdn/Rules.make
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# The target object and module list name.
|
||||
|
||||
O_TARGET := eicon_drv.o
|
||||
O_TARGET := vmlinux-obj.o
|
||||
|
||||
# Objects that export symbols.
|
||||
|
||||
|
|
@ -14,8 +14,7 @@ list-multi := eicon.o divas.o
|
|||
eicon-objs := eicon_mod.o eicon_isa.o eicon_pci.o eicon_idi.o \
|
||||
eicon_io.o
|
||||
divas-objs := common.o idi.o bri.o pri.o log.o xlog.o kprintf.o fpga.o \
|
||||
fourbri.o lincfg.o linchr.o linsys.o linio.o \
|
||||
Divas_mod.o
|
||||
fourbri.o lincfg.o linchr.o linsys.o linio.o Divas_mod.o
|
||||
|
||||
# Optional parts of multipart objects.
|
||||
|
||||
|
|
@ -25,13 +24,6 @@ eicon-objs-$(CONFIG_ISDN_DRV_EICON_PCI) += common.o idi.o bri.o pri.o log.o \
|
|||
|
||||
eicon-objs += $(eicon-objs-y)
|
||||
|
||||
# Object file lists.
|
||||
|
||||
obj-y :=
|
||||
obj-m :=
|
||||
obj-n :=
|
||||
obj- :=
|
||||
|
||||
# Each configuration option enables a list of files.
|
||||
|
||||
obj-$(CONFIG_ISDN_DRV_EICON_OLD) += eicon.o
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# The target object and module list name.
|
||||
|
||||
O_TARGET := hisax_drv.o
|
||||
O_TARGET := vmlinux-obj.o
|
||||
|
||||
# Objects that export symbols.
|
||||
|
||||
|
|
@ -34,6 +34,7 @@ hisax-objs-$(CONFIG_HISAX_DIEHLDIVA) += diva.o isac.o arcofi.o hscx.o
|
|||
hisax-objs-$(CONFIG_HISAX_ASUSCOM) += asuscom.o isac.o arcofi.o hscx.o
|
||||
hisax-objs-$(CONFIG_HISAX_TELEINT) += teleint.o isac.o arcofi.o hfc_2bs0.o
|
||||
hisax-objs-$(CONFIG_HISAX_SEDLBAUER) += sedlbauer.o isac.o arcofi.o hscx.o isar.o
|
||||
hisax-objs-$(CONFIG_HISAX_SEDLBAUER_CS) += sedlbauer_cs.o
|
||||
hisax-objs-$(CONFIG_HISAX_SPORTSTER) += sportster.o isac.o arcofi.o hscx.o
|
||||
hisax-objs-$(CONFIG_HISAX_MIC) += mic.o isac.o arcofi.o hscx.o
|
||||
hisax-objs-$(CONFIG_HISAX_NETJET) += nj_s.o netjet.o isac.o arcofi.o
|
||||
|
|
@ -52,29 +53,19 @@ hisax-objs-$(CONFIG_HISAX_W6692) += w6692.o
|
|||
|
||||
hisax-objs += $(sort $(hisax-objs-y))
|
||||
|
||||
# Object file lists.
|
||||
|
||||
obj-y :=
|
||||
obj-m :=
|
||||
obj-n :=
|
||||
obj- :=
|
||||
|
||||
# Each configuration option enables a list of files.
|
||||
|
||||
obj-$(CONFIG_ISDN_DRV_HISAX) += hisax.o
|
||||
|
||||
MD5FILES := isac.c isdnl1.c isdnl2.c isdnl3.c \
|
||||
tei.c callc.c cert.c l3dss1.c l3_1tr6.c \
|
||||
elsa.c diva.c sedlbauer.c
|
||||
CERT := $(shell md5sum -c md5sums.asc >> /dev/null;echo $$?)
|
||||
CFLAGS_cert.o := -DCERTIFICATION=$(CERT)
|
||||
|
||||
include $(TOPDIR)/drivers/isdn/Rules.make
|
||||
|
||||
# Link rules for multi-part drivers.
|
||||
|
||||
hisax.o: $(hisax-objs)
|
||||
$(LD) -r -o $@ $(hisax-objs)
|
||||
|
||||
MD5FILES += isac.c isdnl1.c isdnl2.c isdnl3.c \
|
||||
tei.c callc.c cert.c l3dss1.c l3_1tr6.c \
|
||||
elsa.c diva.c sedlbauer.c
|
||||
|
||||
CERT = $(shell md5sum -c md5sums.asc >> /dev/null;echo $$?)
|
||||
|
||||
cert.o: $(MD5FILES) md5sums.asc
|
||||
$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -D CERTIFICATION=$(CERT) -c -o cert.o cert.c
|
||||
|
|
|
|||
|
|
@ -2,11 +2,7 @@
|
|||
|
||||
# The target object and module list name.
|
||||
|
||||
O_TARGET := hysdn_drv.o
|
||||
|
||||
# Objects that export symbols.
|
||||
|
||||
export-objs :=
|
||||
O_TARGET := vmlinux-obj.o
|
||||
|
||||
# Multipart objects.
|
||||
|
||||
|
|
@ -20,13 +16,6 @@ hysdn-objs-$(CONFIG_HYSDN_CAPI) += hycapi.o
|
|||
|
||||
hysdn-objs += $(hysdn-objs-y)
|
||||
|
||||
# Object file lists.
|
||||
|
||||
obj-y :=
|
||||
obj-m :=
|
||||
obj-n :=
|
||||
obj- :=
|
||||
|
||||
# Each configuration option enables a list of files.
|
||||
|
||||
obj-$(CONFIG_HYSDN) += hysdn.o
|
||||
|
|
|
|||
|
|
@ -2,18 +2,7 @@
|
|||
|
||||
# The target object and module list name.
|
||||
|
||||
O_TARGET := icn_drv.o
|
||||
|
||||
# Objects that export symbols.
|
||||
|
||||
export-objs :=
|
||||
|
||||
# Object file lists.
|
||||
|
||||
obj-y :=
|
||||
obj-m :=
|
||||
obj-n :=
|
||||
obj- :=
|
||||
O_TARGET := vmlinux-obj.o
|
||||
|
||||
# Each configuration option enables a list of files.
|
||||
|
||||
|
|
|
|||
|
|
@ -4,18 +4,7 @@
|
|||
|
||||
# The target object and module list name.
|
||||
|
||||
O_TARGET := isdnloop_drv.o
|
||||
|
||||
# Objects that export symbols.
|
||||
|
||||
export-objs :=
|
||||
|
||||
# Object file lists.
|
||||
|
||||
obj-y :=
|
||||
obj-m :=
|
||||
obj-n :=
|
||||
obj- :=
|
||||
O_TARGET := vmlinux-obj.o
|
||||
|
||||
# Each configuration option enables a list of files.
|
||||
|
||||
|
|
|
|||
|
|
@ -2,24 +2,13 @@
|
|||
|
||||
# The target object and module list name.
|
||||
|
||||
O_TARGET := pcbit_drv.o
|
||||
|
||||
# Objects that export symbols.
|
||||
|
||||
export-objs :=
|
||||
O_TARGET := vmlinux-obj.o
|
||||
|
||||
# Multipart objects.
|
||||
|
||||
list-multi := pcbit.o
|
||||
pcbit-objs := module.o edss1.o drv.o layer2.o capi.o callbacks.o
|
||||
|
||||
# Object file lists.
|
||||
|
||||
obj-y :=
|
||||
obj-m :=
|
||||
obj-n :=
|
||||
obj- :=
|
||||
|
||||
# Each configuration option enables a list of files.
|
||||
|
||||
obj-$(CONFIG_ISDN_DRV_PCBIT) += pcbit.o
|
||||
|
|
|
|||
|
|
@ -2,11 +2,7 @@
|
|||
|
||||
# The target object and module list name.
|
||||
|
||||
O_TARGET := sc_drv.o
|
||||
|
||||
# Objects that export symbols.
|
||||
|
||||
export-objs :=
|
||||
O_TARGET := vmlinux-obj.o
|
||||
|
||||
# Multipart objects.
|
||||
|
||||
|
|
@ -14,13 +10,6 @@ list-multi := sc.o
|
|||
sc-objs := shmem.o init.o debug.o packet.o command.o event.o \
|
||||
ioctl.o interrupt.o message.o timer.o
|
||||
|
||||
# Object file lists.
|
||||
|
||||
obj-y :=
|
||||
obj-m :=
|
||||
obj-n :=
|
||||
obj- :=
|
||||
|
||||
# Each configuration option enables a list of files.
|
||||
|
||||
obj-$(CONFIG_ISDN_DRV_SC) += sc.o
|
||||
|
|
|
|||
Loading…
Reference in New Issue