Commit 62bfdbe8 authored by Linus Torvalds's avatar Linus Torvalds

Merge http://linux-isdn.bkbits.net/linux-2.5.make

into home.transmeta.com:/home/torvalds/v2.5/linux
parents a706af33 8af78f3f
...@@ -37,14 +37,21 @@ OBJDUMP = $(CROSS_COMPILE)objdump ...@@ -37,14 +37,21 @@ OBJDUMP = $(CROSS_COMPILE)objdump
MAKEFILES = $(TOPDIR)/.config MAKEFILES = $(TOPDIR)/.config
GENKSYMS = /sbin/genksyms GENKSYMS = /sbin/genksyms
DEPMOD = /sbin/depmod DEPMOD = /sbin/depmod
PERL = perl
MODFLAGS = -DMODULE MODFLAGS = -DMODULE
CFLAGS_MODULE = $(MODFLAGS)
AFLAGS_MODULE =
CFLAGS_KERNEL = CFLAGS_KERNEL =
AFLAGS_KERNEL = AFLAGS_KERNEL =
PERL = perl EXPORT_FLAGS =
export VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION KERNELRELEASE ARCH \ export VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION KERNELRELEASE ARCH \
CONFIG_SHELL TOPDIR HPATH HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \ CONFIG_SHELL TOPDIR HPATH HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
CPP AR NM STRIP OBJCOPY OBJDUMP MAKE MAKEFILES GENKSYMS MODFLAGS PERL CPP AR NM STRIP OBJCOPY OBJDUMP MAKE MAKEFILES GENKSYMS PERL
export CPPFLAGS EXPORT_FLAGS
export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
export AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
all: do-it-all all: do-it-all
...@@ -92,6 +99,10 @@ CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \ ...@@ -92,6 +99,10 @@ CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
-fomit-frame-pointer -fno-strict-aliasing -fno-common -fomit-frame-pointer -fno-strict-aliasing -fno-common
AFLAGS := -D__ASSEMBLY__ $(CPPFLAGS) AFLAGS := -D__ASSEMBLY__ $(CPPFLAGS)
ifdef CONFIG_MODULES
EXPORT_FLAGS := -DEXPORT_SYMTAB
endif
INIT =init/init.o INIT =init/init.o
CORE_FILES =kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o CORE_FILES =kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o
NETWORKS =net/network.o NETWORKS =net/network.o
...@@ -155,8 +166,6 @@ DRIVERS := $(DRIVERS-y) ...@@ -155,8 +166,6 @@ DRIVERS := $(DRIVERS-y)
include arch/$(ARCH)/Makefile include arch/$(ARCH)/Makefile
export CPPFLAGS CFLAGS CFLAGS_KERNEL AFLAGS AFLAGS_KERNEL
export NETWORKS DRIVERS LIBS HEAD LDFLAGS LINKFLAGS MAKEBOOT ASFLAGS export NETWORKS DRIVERS LIBS HEAD LDFLAGS LINKFLAGS MAKEBOOT ASFLAGS
# boot target # boot target
...@@ -287,7 +296,7 @@ modules: $(patsubst %, _mod_%, $(SUBDIRS)) ...@@ -287,7 +296,7 @@ modules: $(patsubst %, _mod_%, $(SUBDIRS))
.PHONY: $(patsubst %, _mod_%, $(SUBDIRS)) .PHONY: $(patsubst %, _mod_%, $(SUBDIRS))
$(patsubst %, _mod_%, $(SUBDIRS)) : include/linux/version.h include/config/MARKER $(patsubst %, _mod_%, $(SUBDIRS)) : include/linux/version.h include/config/MARKER
@$(MAKE) -C $(patsubst _mod_%, %, $@) CFLAGS="$(CFLAGS) $(MODFLAGS)" MAKING_MODULES=1 modules @$(MAKE) -C $(patsubst _mod_%, %, $@) CFLAGS="$(CFLAGS) $(CFLAGS_MODULE)" AFLAGS="$(AFLAGS) $(AFLAGS_MODULE)" modules
# Install modules # Install modules
......
...@@ -29,19 +29,17 @@ unexport subdir-y ...@@ -29,19 +29,17 @@ unexport subdir-y
unexport subdir-m unexport subdir-m
unexport subdir-n unexport subdir-n
unexport subdir- unexport subdir-
unexport mod-subdirs
comma := , comma := ,
# # Figure out what we need to build from the various variables
# ===========================================================================
# When an object is listed to be built compiled-in and modular, # When an object is listed to be built compiled-in and modular,
# only build the compiled-in version # only build the compiled-in version
#
obj-m := $(filter-out $(obj-y),$(obj-m))
# obj-m := $(filter-out $(obj-y),$(obj-m))
# Get things started.
#
first_rule: all_targets
# Handle objects in subdirs # Handle objects in subdirs
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
...@@ -69,6 +67,42 @@ SUB_DIRS := $(subdir-y) ...@@ -69,6 +67,42 @@ SUB_DIRS := $(subdir-y)
MOD_SUB_DIRS := $(sort $(subdir-m) $(both-m)) MOD_SUB_DIRS := $(sort $(subdir-m) $(both-m))
ALL_SUB_DIRS := $(sort $(subdir-y) $(subdir-m) $(subdir-n) $(subdir-)) ALL_SUB_DIRS := $(sort $(subdir-y) $(subdir-m) $(subdir-n) $(subdir-))
# export.o is never a composite object, since $(export-objs) has a
# fixed meaning (== objects which EXPORT_SYMBOL())
__obj-y = $(filter-out export.o,$(obj-y))
__obj-m = $(filter-out export.o,$(obj-m))
# if $(foo-objs) exists, foo.o is a composite object
__multi-used-y := $(sort $(foreach m,$(__obj-y), $(if $($(m:.o=-objs)), $(m))))
__multi-used-m := $(sort $(foreach m,$(__obj-m), $(if $($(m:.o=-objs)), $(m))))
# FIXME: Rip this out later
# Backwards compatibility: if a composite object is listed in
# $(list-multi), skip it here, since the Makefile will have an explicit
# link rule for it
multi-used-y := $(filter-out $(list-multi),$(__multi-used-y))
multi-used-m := $(filter-out $(list-multi),$(__multi-used-m))
# Build list of the parts of our composite objects, our composite
# objects depend on those (obviously)
multi-objs-y := $(foreach m, $(multi-used-y), $($(m:.o=-objs)))
multi-objs-m := $(foreach m, $(multi-used-m), $($(m:.o=-objs)))
# $(subdir-obj-y) is the list of objects in $(obj-y) which do not live
# in the local directory
subdir-obj-y := $(foreach o,$(obj-y),$(if $(filter-out $(o),$(notdir $(o))),$(o)))
# Replace multi-part objects by their individual parts, look at local dir only
real-objs-y := $(foreach m, $(filter-out $(subdir-obj-y), $(obj-y)), $(if $($(m:.o=-objs)),$($(m:.o=-objs)),$(m)))
real-objs-m := $(foreach m, $(obj-m), $(if $($(m:.o=-objs)),$($(m:.o=-objs)),$(m)))
# ==========================================================================
#
# Get things started.
#
first_rule: all_targets
# #
# Common rules # Common rules
# #
...@@ -76,7 +110,7 @@ ALL_SUB_DIRS := $(sort $(subdir-y) $(subdir-m) $(subdir-n) $(subdir-)) ...@@ -76,7 +110,7 @@ ALL_SUB_DIRS := $(sort $(subdir-y) $(subdir-m) $(subdir-n) $(subdir-))
# Compile C sources (.c) # Compile C sources (.c)
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# export_flags will be set to -DEXPORT_SYMBOL for objects in $(export-objs) $(export-objs): export_flags := $(EXPORT_FLAGS)
c_flags = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(*F).o) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) $(export_flags) c_flags = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(*F).o) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) $(export_flags)
...@@ -95,7 +129,6 @@ cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $< ...@@ -95,7 +129,6 @@ cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
%.o: %.c dummy %.o: %.c dummy
$(call if_changed,cmd_cc_o_c) $(call if_changed,cmd_cc_o_c)
# Compile assembler sources (.S) # Compile assembler sources (.S)
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
...@@ -121,10 +154,7 @@ cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $< ...@@ -121,10 +154,7 @@ cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $<
# #
all_targets: $(O_TARGET) $(L_TARGET) sub_dirs all_targets: $(O_TARGET) $(L_TARGET) sub_dirs
# $(subdir-obj-y) is the list of objects in $(obj-y) which do not live # To build objects in subdirs, we need to descend into the directories
# in the local directory
subdir-obj-y := $(foreach o,$(obj-y),$(if $(filter-out $(o),$(notdir $(o))),$(o)))
# Do build these objects, we need to descend into the directories
$(subdir-obj-y): sub_dirs $(subdir-obj-y): sub_dirs
# #
...@@ -154,26 +184,6 @@ endif ...@@ -154,26 +184,6 @@ endif
# Rule to link composite objects # Rule to link composite objects
# #
# export.o is never a composite object, since $(export-objs) has a
# fixed meaning (== objects which EXPORT_SYMBOL())
__obj-y = $(filter-out export.o,$(obj-y))
__obj-m = $(filter-out export.o,$(obj-m))
# if $(foo-objs) exists, foo.o is a composite object
__multi-used-y := $(sort $(foreach m,$(__obj-y), $(if $($(basename $(m))-objs), $(m))))
__multi-used-m := $(sort $(foreach m,$(__obj-m), $(if $($(basename $(m))-objs), $(m))))
# Backwards compatibility: if a composite object is listed in
# $(list-multi), skip it here, since the Makefile will have an explicit
# link rule for it
multi-used-y := $(filter-out $(list-multi),$(__multi-used-y))
multi-used-m := $(filter-out $(list-multi),$(__multi-used-m))
# Build list of the parts of our composite objects, our composite
# objects depend on those (obviously)
multi-objs-y := $(foreach m, $(multi-used-y), $($(basename $(m))-objs))
multi-objs-m := $(foreach m, $(multi-used-m), $($(basename $(m))-objs))
cmd_link_multi = $(LD) $(EXTRA_LDFLAGS) -r -o $@ $(filter $($(basename $@)-objs),$^) cmd_link_multi = $(LD) $(EXTRA_LDFLAGS) -r -o $@ $(filter $($(basename $@)-objs),$^)
...@@ -337,7 +347,6 @@ endif # CONFIG_MODVERSIONS ...@@ -337,7 +347,6 @@ endif # CONFIG_MODVERSIONS
ifneq "$(strip $(export-objs))" "" ifneq "$(strip $(export-objs))" ""
$(export-objs): $(TOPDIR)/include/linux/modversions.h $(export-objs): $(TOPDIR)/include/linux/modversions.h
$(export-objs): export_flags := -DEXPORT_SYMTAB
endif endif
......
...@@ -96,7 +96,7 @@ SUBDIRS := $(SUBDIRS) arch/alpha/kernel arch/alpha/mm arch/alpha/lib \ ...@@ -96,7 +96,7 @@ SUBDIRS := $(SUBDIRS) arch/alpha/kernel arch/alpha/mm arch/alpha/lib \
CORE_FILES := arch/alpha/kernel/kernel.o arch/alpha/mm/mm.o $(CORE_FILES) CORE_FILES := arch/alpha/kernel/kernel.o arch/alpha/mm/mm.o $(CORE_FILES)
ifeq ($(CONFIG_MATHEMU),y) ifeq ($(CONFIG_MATHEMU),y)
CORE_FILES := $(CORE_FILES) arch/alpha/math-emu/math-emu.o CORE_FILES := $(CORE_FILES) arch/alpha/math-emu/built-in.o
endif endif
LIBS := $(TOPDIR)/arch/alpha/lib/lib.a $(LIBS) $(TOPDIR)/arch/alpha/lib/lib.a LIBS := $(TOPDIR)/arch/alpha/lib/lib.a $(LIBS) $(TOPDIR)/arch/alpha/lib/lib.a
......
...@@ -2,18 +2,12 @@ ...@@ -2,18 +2,12 @@
# Makefile for the FPU instruction emulation. # Makefile for the FPU instruction emulation.
# #
CFLAGS += -I. -I$(TOPDIR)/include/math-emu -w O_TARGET := built-in.o
ifeq ($(CONFIG_MATHEMU),y)
O_TARGET := math-emu.o obj-$(CONFIG_MATHEMU) += math-emu.o
obj-y := math.o qrnnd.o
else
math-emu-objs := math.o qrnnd.o math-emu-objs := math.o qrnnd.o
obj-m := math-emu.o
endif CFLAGS += -I. -I$(TOPDIR)/include/math-emu -w
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -9,15 +9,9 @@ ...@@ -9,15 +9,9 @@
all: kernel.o init_task.o pdc_cons.o process.o head.o all: kernel.o init_task.o pdc_cons.o process.o head.o
O_TARGET = kernel.o O_TARGET = kernel.o
O_OBJS =
# Object file lists. # Object file lists.
obj-y :=
obj-m :=
obj-n :=
obj- :=
obj-y += cache.o setup.o traps.o time.o irq.o \ obj-y += cache.o setup.o traps.o time.o irq.o \
syscall.o entry.o sys_parisc.o pdc.o ptrace.o hardware.o \ syscall.o entry.o sys_parisc.o pdc.o ptrace.o hardware.o \
inventory.o drivers.o semaphore.o pa7300lc.o pci-dma.o \ inventory.o drivers.o semaphore.o pa7300lc.o pci-dma.o \
...@@ -38,15 +32,6 @@ obj-$(CONFIG_IOMMU_SBA) += sba_iommu.o ...@@ -38,15 +32,6 @@ obj-$(CONFIG_IOMMU_SBA) += sba_iommu.o
# obj-$(CONFIG_IOMMU_CCIO) += ccio-rm-dma.o # obj-$(CONFIG_IOMMU_CCIO) += ccio-rm-dma.o
obj-$(CONFIG_IOMMU_CCIO) += ccio-dma.o obj-$(CONFIG_IOMMU_CCIO) += ccio-dma.o
.o.S: $(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c $*.S -o $*.o EXTRA_AFLAGS := -traditional
# Translate to Rules.make lists.
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)))
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
EXTRA_AFLAGS := -ansi EXTRA_AFLAGS := -ansi
ifeq ($(CONFIG_SOLARIS_EMUL),m) ifeq ($(CONFIG_SOLARIS_EMUL),m)
EXTRA_AFLAGS += $(MODFLAGS) EXTRA_AFLAGS += $(CFLAGS_MODULE) # FIXME
endif endif
solaris-objs := entry64.o fs.o misc.o signal.o systbl.o socket.o \ solaris-objs := entry64.o fs.o misc.o signal.o systbl.o socket.o \
......
...@@ -150,13 +150,7 @@ obj-$(CONFIG_SPECIALIX) += specialix.o ...@@ -150,13 +150,7 @@ obj-$(CONFIG_SPECIALIX) += specialix.o
obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o
obj-$(CONFIG_SX) += sx.o generic_serial.o obj-$(CONFIG_SX) += sx.o generic_serial.o
obj-$(CONFIG_RIO) += rio/ generic_serial.o
obj-$(CONFIG_RIO) += generic_serial.o
subdir-$(CONFIG_RIO) += rio
ifeq ($(CONFIG_RIO),y)
obj-y += rio/rio.o
endif
obj-$(CONFIG_SH_SCI) += sh-sci.o generic_serial.o obj-$(CONFIG_SH_SCI) += sh-sci.o generic_serial.o
obj-$(CONFIG_SERIAL167) += serial167.o obj-$(CONFIG_SERIAL167) += serial167.o
obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o
...@@ -223,10 +217,7 @@ obj-$(CONFIG_SH_WDT) += shwdt.o ...@@ -223,10 +217,7 @@ obj-$(CONFIG_SH_WDT) += shwdt.o
obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
subdir-$(CONFIG_MWAVE) += mwave obj-$(CONFIG_MWAVE) += mwave/
ifeq ($(CONFIG_MWAVE),y)
obj-y += mwave/mwave.o
endif
subdir-$(CONFIG_AGP) += agp subdir-$(CONFIG_AGP) += agp
ifeq ($(CONFIG_AGP),y) ifeq ($(CONFIG_AGP),y)
......
...@@ -25,20 +25,8 @@ ...@@ -25,20 +25,8 @@
O_TARGET := ftape.o O_TARGET := ftape.o
subdir-$(CONFIG_FTAPE) += lowlevel obj-$(CONFIG_FTAPE) += lowlevel/
subdir-$(CONFIG_ZFTAPE) += zftape obj-$(CONFIG_ZFTAPE) += zftape/
subdir-$(CONFIG_ZFT_COMPRESSOR) += compressor obj-$(CONFIG_ZFT_COMPRESSOR) += compressor/
ifeq ($(CONFIG_FTAPE),y)
obj-y += lowlevel/ftape.o
endif
ifeq ($(CONFIG_ZFTAPE),y)
obj-y += zftape/zftape.o
endif
ifeq ($(CONFIG_ZFT_COMPRESSOR),y)
obj-y += compressor/zft-compressor.o
endif
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
# Linux. # Linux.
# #
O_TARGET := zft-compressor.o O_TARGET := built-in.o
obj-y = zftape-compress.o lzrw3.o obj-$(CONFIG_ZFT_COMPRESSOR) += zft-compressor.o
obj-m = $(O_TARGET) zft-compressor-objs := zftape-compress.o lzrw3.o
CFLAGS_lzrw3.o := -O6 -funroll-all-loops CFLAGS_lzrw3.o := -O6 -funroll-all-loops
......
...@@ -23,28 +23,28 @@ ...@@ -23,28 +23,28 @@
# driver for Linux. # driver for Linux.
# #
O_TARGET := ftape.o O_TARGET := built-in.o
export-objs := ftape_syms.o export-objs := ftape_syms.o
obj-y = ftape-init.o fdc-io.o fdc-isr.o \ obj-$(CONFIG_FTAPE) += ftape.o
ftape-objs := ftape-init.o fdc-io.o fdc-isr.o \
ftape-bsm.o ftape-ctl.o ftape-read.o ftape-rw.o \ ftape-bsm.o ftape-ctl.o ftape-read.o ftape-rw.o \
ftape-write.o ftape-io.o ftape-calibr.o ftape-ecc.o fc-10.o \ ftape-write.o ftape-io.o ftape-calibr.o ftape-ecc.o fc-10.o \
ftape-buffer.o ftape-format.o ftape_syms.o ftape-buffer.o ftape-format.o ftape_syms.o
obj-$(CONFIG_FTAPE) += ftape-setup.o ifeq ($(CONFIG_FTAPE),y)
ftape-objs += ftape-setup.o
endif
ifndef CONFIG_FT_NO_TRACE_AT_ALL ifndef CONFIG_FT_NO_TRACE_AT_ALL
obj-y += ftape-tracing.o ftape-objs += ftape-tracing.o
endif endif
ifeq ($(CONFIG_PROC_FS),y)
ifeq ($(CONFIG_FT_PROC_FS),y) ifeq ($(CONFIG_FT_PROC_FS),y)
obj-y += ftape-proc.o ftape-objs += ftape-proc.o
endif endif
endif
obj-m = $(O_TARGET)
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -27,17 +27,17 @@ ...@@ -27,17 +27,17 @@
# ZFT_OBSOLETE - enable the MTIOC_ZFTAPE_GETBLKSZ ioctl. You should # ZFT_OBSOLETE - enable the MTIOC_ZFTAPE_GETBLKSZ ioctl. You should
# leave this enabled for compatibility with taper. # leave this enabled for compatibility with taper.
EXTRA_CFLAGS := -DZFT_OBSOLETE O_TARGET := built-in.o
O_TARGET := zftape.o
export-objs := zftape_syms.o export-objs := zftape_syms.o
obj-y := zftape-rw.o zftape-ctl.o zftape-read.o \ obj-$(CONFIG_ZFTAPE) += zftape.o
zftape-objs := zftape-rw.o zftape-ctl.o zftape-read.o \
zftape-write.o zftape-vtbl.o zftape-eof.o \ zftape-write.o zftape-vtbl.o zftape-eof.o \
zftape-init.o zftape-buffers.o zftape_syms.o zftape-init.o zftape-buffers.o zftape_syms.o
obj-m := $(O_TARGET) EXTRA_CFLAGS := -DZFT_OBSOLETE
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -3,23 +3,17 @@ ...@@ -3,23 +3,17 @@
# #
# See the README file in this directory for more info. <paulsch@us.ibm.com> # See the README file in this directory for more info. <paulsch@us.ibm.com>
# #
# 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 definitions are now inherited from the
# parent makes..
#
# To compile in lots (~20 KiB) of run-time enablable printk()s for debugging: O_TARGET := built-in.o
EXTRA_CFLAGS += -DMW_TRACE
obj-$(CONFIG_MWAVE) += mwave.o
mwave-objs := mwavedd.o smapi.o tp3780i.o 3780i.o
# To have the mwave driver disable other uarts if necessary # To have the mwave driver disable other uarts if necessary
# EXTRA_CFLAGS += -DMWAVE_FUTZ_WITH_OTHER_DEVICES # EXTRA_CFLAGS += -DMWAVE_FUTZ_WITH_OTHER_DEVICES
O_TARGET := mwave.o # To compile in lots (~20 KiB) of run-time enablable printk()s for debugging:
EXTRA_CFLAGS += -DMW_TRACE
obj-y := mwavedd.o smapi.o tp3780i.o 3780i.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -5,17 +5,12 @@ ...@@ -5,17 +5,12 @@
# #
# This file is GPL. See other files for the full Blurb. I'm lazy today. # This file is GPL. See other files for the full Blurb. I'm lazy today.
# #
#
# 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 definitions are now in the main makefile...
O_TARGET := rio.o O_TARGET := built-in.o
obj-$(CONFIG_RIO) += rio.o
obj-y := rio_linux.o rioinit.o rioboot.o riocmd.o rioctrl.o riointr.o \ rio-objs := rio_linux.o rioinit.o rioboot.o riocmd.o rioctrl.o riointr.o \
rioparam.o riopcicopy.o rioroute.o riotable.o riotty.o rioparam.o riopcicopy.o rioroute.o riotable.o riotty.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -688,7 +688,6 @@ u8 ide_dump_status(struct ata_device *drive, struct request * rq, const char *ms ...@@ -688,7 +688,6 @@ u8 ide_dump_status(struct ata_device *drive, struct request * rq, const char *ms
{ {
unsigned long flags; unsigned long flags;
byte err = 0; byte err = 0;
int i;
__save_flags (flags); /* local CPU only */ __save_flags (flags); /* local CPU only */
ide__sti(); /* local CPU only */ ide__sti(); /* local CPU only */
......
# #
# Makefile for the linux kernel. # Makefile for the linux kernel.
# #
# 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 definitions are now in the main makefile...
# All of the (potential) objects that export symbols. # All of the (potential) objects that export symbols.
# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'. # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
...@@ -14,28 +9,10 @@ export-objs := tc.o ...@@ -14,28 +9,10 @@ export-objs := tc.o
# Object file lists. # Object file lists.
obj-y :=
obj-m :=
obj-n :=
obj- :=
obj-$(CONFIG_TC) += tc.o obj-$(CONFIG_TC) += tc.o
obj-$(CONFIG_ZS) += zs.o obj-$(CONFIG_ZS) += zs.o
obj-$(CONFIG_VT) += lk201.o lk201-map.o lk201-remap.o obj-$(CONFIG_VT) += lk201.o lk201-map.o lk201-remap.o
# Files that are both resident and modular: remove from modular.
obj-m := $(filter-out $(obj-y), $(obj-m))
# Translate to Rules.make lists.
L_TARGET := tc.a
L_OBJS := $(sort $(filter-out $(export-objs), $(obj-y)))
LX_OBJS := $(sort $(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 include $(TOPDIR)/Rules.make
lk201-map.c: lk201-map.map lk201-map.c: lk201-map.map
......
...@@ -88,26 +88,10 @@ obj-$(CONFIG_FB_PMAGB_B) += pmagb-b-fb.o ...@@ -88,26 +88,10 @@ obj-$(CONFIG_FB_PMAGB_B) += pmagb-b-fb.o
obj-$(CONFIG_FB_MAXINE) += maxinefb.o obj-$(CONFIG_FB_MAXINE) += maxinefb.o
obj-$(CONFIG_FB_TX3912) += tx3912fb.o obj-$(CONFIG_FB_TX3912) += tx3912fb.o
obj-$(CONFIG_FB_MATROX) += matrox/
subdir-$(CONFIG_FB_MATROX) += matrox obj-$(CONFIG_FB_RIVA) += riva/
ifeq ($(CONFIG_FB_MATROX),y) obj-$(CONFIG_FB_SIS) += sis/
obj-y += matrox/matrox.o obj-$(CONFIG_FB_ATY) += aty/
endif
subdir-$(CONFIG_FB_RIVA) += riva
ifeq ($(CONFIG_FB_RIVA),y)
obj-y += riva/rivafb.o
endif
subdir-$(CONFIG_FB_SIS) += sis
ifeq ($(CONFIG_FB_SIS),y)
obj-y += sis/sisfb.o
endif
subdir-$(CONFIG_FB_ATY) += aty
ifeq ($(CONFIG_FB_ATY),y)
obj-y += aty/atyfb.o
endif
obj-$(CONFIG_FB_SUN3) += sun3fb.o obj-$(CONFIG_FB_SUN3) += sun3fb.o
obj-$(CONFIG_FB_BWTWO) += bwtwofb.o obj-$(CONFIG_FB_BWTWO) += bwtwofb.o
......
O_TARGET := atyfb.o O_TARGET := built-in.o
export-objs := atyfb_base.o mach64_accel.o export-objs := atyfb_base.o mach64_accel.o
obj-y := atyfb_base.o mach64_accel.o obj-$(CONFIG_FB_ATY) += atyfb.o
obj-$(CONFIG_FB_ATY_GX) += mach64_gx.o
obj-$(CONFIG_FB_ATY_CT) += mach64_ct.o mach64_cursor.o atyfb-y := atyfb_base.o mach64_accel.o
obj-m := $(O_TARGET) atyfb-$(CONFIG_FB_ATY_GX) += mach64_gx.o
atyfb-$(CONFIG_FB_ATY_CT) += mach64_ct.o mach64_cursor.o
atyfb-objs := $(atyfb-y)
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# 5 Aug 1999, James Simmons, <mailto:jsimmons@edgeglobal.com> # 5 Aug 1999, James Simmons, <mailto:jsimmons@edgeglobal.com>
# Rewritten to use lists instead of if-statements. # Rewritten to use lists instead of if-statements.
O_TARGET := matrox.o O_TARGET := built-in.o
# All of the (potential) objects that export symbols. # All of the (potential) objects that export symbols.
# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'. # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
......
# #
# Makefile for the Riva framebuffer driver # Makefile for the Riva framebuffer driver
# #
# 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 definitions are now in the main makefile...
O_TARGET := rivafb.o O_TARGET := built-in.o
obj-$(CONFIG_FB_RIVA) += rivafb.o
obj-y := fbdev.o riva_hw.o accel.o rivafb-objs := fbdev.o riva_hw.o accel.o
obj-m := $(O_TARGET)
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -2,12 +2,13 @@ ...@@ -2,12 +2,13 @@
# Makefile for the SiS framebuffer device driver # Makefile for the SiS framebuffer device driver
# #
O_TARGET := sisfb.o O_TARGET := built-in.o
export-objs := sis_main.o export-objs := sis_main.o
obj-y := sis_main.o init.o init301.o obj-$(CONFIG_FB_SIS) += sisfb.o
obj-m := $(O_TARGET)
sisfb-objs := sis_main.o init.o init301.o
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
......
...@@ -3,13 +3,20 @@ ARCH=$2 ...@@ -3,13 +3,20 @@ ARCH=$2
SMP=$3 SMP=$3
CC=$4 CC=$4
if [ -r ../.version ]; then
VERSION=`cat ../.version`
else
VERSION=0
echo 0 > ../.version
fi
# Generate a temporary compile.h # Generate a temporary compile.h
( echo /\* This file is auto generated, version `cat ../.version` \*/ ( echo /\* This file is auto generated, version $VERSION \*/
echo \#define UTS_MACHINE \"$ARCH\" echo \#define UTS_MACHINE \"$ARCH\"
echo -n \#define UTS_VERSION \"\#`cat ../.version` echo -n \#define UTS_VERSION \"\#$VERSION
if [ -n "$SMP" ] ; then echo -n " SMP"; fi if [ -n "$SMP" ] ; then echo -n " SMP"; fi
echo ' '`date`'"' echo ' '`date`'"'
......
...@@ -112,6 +112,4 @@ ifeq ($(CONFIG_SND_SB16_CSP),y) ...@@ -112,6 +112,4 @@ ifeq ($(CONFIG_SND_SB16_CSP),y)
obj-$(CONFIG_SND_SBAWE) += snd-hwdep.o obj-$(CONFIG_SND_SBAWE) += snd-hwdep.o
endif endif
obj-m := $(sort $(obj-m))
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -81,6 +81,4 @@ obj-$(CONFIG_SND_EMU10K1) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-m ...@@ -81,6 +81,4 @@ obj-$(CONFIG_SND_EMU10K1) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-m
obj-$(CONFIG_SND_TRIDENT) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-midi-event.o snd-seq-midi-emul.o snd-seq-instr.o obj-$(CONFIG_SND_TRIDENT) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-midi-event.o snd-seq-midi-emul.o snd-seq-instr.o
obj-$(CONFIG_SND_YMFPCI) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-midi-event.o snd-seq-midi-emul.o snd-seq-instr.o obj-$(CONFIG_SND_YMFPCI) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-midi-event.o snd-seq-midi-emul.o snd-seq-instr.o
obj-m := $(sort $(obj-m))
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -43,6 +43,4 @@ obj-$(CONFIG_SND_SONICVIBES) += snd-ainstr-fm.o ...@@ -43,6 +43,4 @@ obj-$(CONFIG_SND_SONICVIBES) += snd-ainstr-fm.o
obj-$(CONFIG_SND_TRIDENT) += snd-ainstr-simple.o obj-$(CONFIG_SND_TRIDENT) += snd-ainstr-simple.o
obj-$(CONFIG_SND_YMFPCI) += snd-ainstr-fm.o obj-$(CONFIG_SND_YMFPCI) += snd-ainstr-fm.o
obj-m := $(sort $(obj-m))
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -42,6 +42,4 @@ obj-$(CONFIG_SND_ALI5451) += snd-mpu401-uart.o ...@@ -42,6 +42,4 @@ obj-$(CONFIG_SND_ALI5451) += snd-mpu401-uart.o
obj-$(CONFIG_SND_TRIDENT) += snd-mpu401-uart.o obj-$(CONFIG_SND_TRIDENT) += snd-mpu401-uart.o
obj-$(CONFIG_SND_YMFPCI) += snd-mpu401-uart.o obj-$(CONFIG_SND_YMFPCI) += snd-mpu401-uart.o
obj-m := $(sort $(obj-m))
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -65,6 +65,4 @@ ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y) ...@@ -65,6 +65,4 @@ ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y)
obj-$(CONFIG_SND_YMFPCI) += snd-opl3-synth.o obj-$(CONFIG_SND_YMFPCI) += snd-opl3-synth.o
endif endif
obj-m := $(sort $(obj-m))
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -16,6 +16,4 @@ obj-$(CONFIG_SND_SGALAXY) += snd-ad1848-lib.o ...@@ -16,6 +16,4 @@ obj-$(CONFIG_SND_SGALAXY) += snd-ad1848-lib.o
obj-$(CONFIG_SND_AD1848) += snd-ad1848.o snd-ad1848-lib.o obj-$(CONFIG_SND_AD1848) += snd-ad1848.o snd-ad1848-lib.o
obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-ad1848-lib.o obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-ad1848-lib.o
obj-m := $(sort $(obj-m))
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -25,6 +25,4 @@ obj-$(CONFIG_SND_INTERWAVE_STB) += snd-cs4231-lib.o ...@@ -25,6 +25,4 @@ obj-$(CONFIG_SND_INTERWAVE_STB) += snd-cs4231-lib.o
obj-$(CONFIG_SND_OPTI92X_CS4231) += snd-cs4231-lib.o obj-$(CONFIG_SND_OPTI92X_CS4231) += snd-cs4231-lib.o
obj-$(CONFIG_SND_WAVEFRONT) += snd-cs4231-lib.o obj-$(CONFIG_SND_WAVEFRONT) += snd-cs4231-lib.o
obj-m := $(sort $(obj-m))
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -35,6 +35,4 @@ ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y) ...@@ -35,6 +35,4 @@ ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y)
obj-$(CONFIG_SND_INTERWAVE_STB) += snd-gus-synth.o obj-$(CONFIG_SND_INTERWAVE_STB) += snd-gus-synth.o
endif endif
obj-m := $(sort $(obj-m))
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -34,6 +34,4 @@ ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y) ...@@ -34,6 +34,4 @@ ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y)
obj-$(CONFIG_SND_SBAWE) += snd-emu8000-synth.o obj-$(CONFIG_SND_SBAWE) += snd-emu8000-synth.o
endif endif
obj-m := $(sort $(obj-m))
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -28,6 +28,4 @@ obj-$(CONFIG_SND_NM256) += snd-ac97-codec.o ...@@ -28,6 +28,4 @@ obj-$(CONFIG_SND_NM256) += snd-ac97-codec.o
obj-$(CONFIG_SND_TRIDENT) += snd-ac97-codec.o obj-$(CONFIG_SND_TRIDENT) += snd-ac97-codec.o
obj-$(CONFIG_SND_YMFPCI) += snd-ac97-codec.o obj-$(CONFIG_SND_YMFPCI) += snd-ac97-codec.o
obj-m := $(sort $(obj-m))
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment