diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
| commit | 95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch) | |
| tree | 27a92a942821cde1edda9a1b088718d436b3efe4 /drivers/pnp/Makefile | |
| parent | 45b27b0a0652331d104c953a5b192d843fff88f8 (diff) | |
Merge with Linux 2.3.40.
Diffstat (limited to 'drivers/pnp/Makefile')
| -rw-r--r-- | drivers/pnp/Makefile | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/drivers/pnp/Makefile b/drivers/pnp/Makefile index 9a8ad136c..9c024342a 100644 --- a/drivers/pnp/Makefile +++ b/drivers/pnp/Makefile @@ -12,18 +12,26 @@ SUB_DIRS := MOD_SUB_DIRS := $(SUB_DIRS) ALL_SUB_DIRS := $(SUB_DIRS) -L_TARGET := pnp.a -MX_OBJS := -LX_OBJS := -MI_OBJS := -MIX_OBJS := +PROC_OBJS := + +ifdef CONFIG_PROC_FS +PROC_OBJS += isapnp_proc.o +endif + +ifeq ($(CONFIG_ISAPNP),m) + M_OBJS := isa-pnp.o + MIX_OBJS := isapnp.o + MI_OBJS := quirks.o $(PROC_OBJS) +endif ifeq ($(CONFIG_ISAPNP),y) - LX_OBJS += isapnp.o quirks.o -else - ifeq ($(CONFIG_ISAPNP),m) - MX_OBJS += isapnp.o quirks.o - endif + O_TARGET := isa-pnp.o + OX_OBJS := isapnp.o + O_OBJS := quirks.o $(PROC_OBJS) endif + include $(TOPDIR)/Rules.make + +isa-pnp.o: isapnp.o quirks.o $(PROC_OBJS) + $(LD) $(LD_RFLAG) -r -o $@ isapnp.o quirks.o $(PROC_OBJS) |