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

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

arch/i386/oprofile/Makefile

@@ -5,8 +5,6 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
 		event_buffer.o oprofile_files.o \
 		oprofilefs.o oprofile_stats.o )
 
-oprofile-objs := $(DRIVER_OBJS) init.o timer_int.o
-
-oprofile-$(CONFIG_X86_LOCAL_APIC) += nmi_int.o op_model_athlon.o op_model_ppro.o
- 
-include $(TOPDIR)/Rules.make
+oprofile-y				:= $(DRIVER_OBJS) init.o timer_int.o
+oprofile-$(CONFIG_X86_LOCAL_APIC) 	+= nmi_int.o op_model_athlon.o \
+					   op_model_ppro.o

scripts/Makefile.lib

@@ -130,8 +130,8 @@ c_flags        = -Wp,-MD,$(depfile) $(CFLAGS) $(NOSTDINC_FLAGS) \
 	         $(basename_flags) $(modname_flags) $(export_flags) 
 
 # Finds the multi-part object the current object will be linked into
-modname-multi = $(subst $(space),_,$(strip $(foreach m,$(multi-used),\
-		$(if $(filter $(*F).o,$($(m:.o=-objs))),$(m:.o=)))))
+modname-multi = $(subst $(space),_,$(sort $(foreach m,$(multi-used),\
+		$(if $(filter $(subst $(obj)/,,$*.o), $($(m:.o=-objs)) $($(m:.o=-y))),$(m:.o=)))))
 
 # Shipped files
 # ===========================================================================