patch-2.4.2 linux/arch/arm/lib/Makefile

• Lines: 96
• Date: Thu Feb 8 16:32:44 2001
• Orig file: v2.4.1/linux/arch/arm/lib/Makefile
• Orig date: Mon Nov 27 17:07:59 2000

diff -u --recursive --new-file v2.4.1/linux/arch/arm/lib/Makefile linux/arch/arm/lib/Makefile
@@ -1,57 +1,57 @@
 #
 # linux/arch/arm/lib/Makefile
 #
-# Copyright (C) 1995-1999 Russell King
+# Copyright (C) 1995-2000 Russell King
 #
 
 USE_STANDARD_AS_RULE := true
 
-L_TARGET := lib.a
-L_OBJS   := changebit.o csumipv6.o csumpartial.o csumpartialcopy.o \
-	    csumpartialcopyuser.o clearbit.o copy_page.o findbit.o \
-	    memchr.o memcpy.o memset.o memzero.o setbit.o          \
-	    strncpy_from_user.o strnlen_user.o strchr.o strrchr.o  \
-	    testchangebit.o testclearbit.o testsetbit.o uaccess.o
-
-l-obj-y	:=
-l-obj-n	:=
-
-O_TARGET := lib.o
-O_OBJS   := backtrace.o delay.o
-
-ifeq ($(CONFIG_ARCH_ACORN),y)
-  half := n
-  full := y
+L_TARGET	:= lib.a
+
+obj-y		:= backtrace.o changebit.o csumipv6.o csumpartial.o   \
+		   csumpartialcopy.o csumpartialcopyuser.o clearbit.o \
+		   copy_page.o delay.o findbit.o memchr.o memcpy.o    \
+		   memset.o memzero.o setbit.o strncpy_from_user.o    \
+		   strnlen_user.o strchr.o strrchr.o testchangebit.o  \
+		   testclearbit.o testsetbit.o uaccess.o
+obj-m		:=
+obj-n		:=
+
+export-objs	:= io.o
+
+obj-arc		:= ecard.o io-acorn.o floppydma.o
+obj-rpc		:= ecard.o io-acorn.o floppydma.o
+obj-clps7500	:= io-acorn.o
+obj-footbridge	:= io-pcio.o
+obj-l7200     	:= io-acorn.o
+obj-nexuspci	:= io-pcio.o
+obj-sa1100	:= io-pcio.o
+obj-shark	:= io-shark.o
+obj-integrator	:= io-pcio.o
+obj-clps711x	:= io-shark.o
+
+obj-y		+= $(obj-$(MACHINE))
+
+ifeq ($(CONFIG_CPU_32v4),y)
+  v3		:= n
+  v4		:= y
 else
-  half := y
-  full := n
+  v3		:= y
+  v4		:= n
 endif
 
-L_OBJS_arc		:= ecard.o io-acorn.o floppydma.o
-L_OBJS_rpc		:= ecard.o io-acorn.o floppydma.o
-L_OBJS_clps7500		:= io-acorn.o
-L_OBJS_footbridge	:= io-pcio.o
-L_OBJS_l7200     	:= io-acorn.o
-L_OBJS_nexuspci		:= io-pcio.o
-L_OBJS_sa1100		:= io-pcio.o
-L_OBJS_shark		:= io-shark.o
-L_OBJS_integrator	:= io-pcio.o
-L_OBJS_clps711x		:= io-shark.o
-
-l-obj-y			+= io-readsb.o io-writesb.o
-l-obj-$(full)		+= io-readsw-armv3.o io-writesw-armv3.o
-l-obj-$(half)		+= io-readsw-armv4.o io-writesw-armv4.o
-l-obj-y			+= io-readsl.o io-writesl.o
+obj-y		+= io-readsb.o io-writesb.o
+obj-$(v3)	+= io-readsw-armv3.o io-writesw-armv3.o io-readsl-armv3.o
+obj-$(v4)	+= io-readsw-armv4.o io-writesw-armv4.o io-readsl-armv4.o
+obj-y		+= io-writesl.o
 
 ifeq ($(PROCESSOR),armo)
-  L_OBJS += uaccess-armo.o
+  obj-y		+= uaccess-armo.o
 endif
 
 ifneq ($(MACHINE),ebsa110)
-  OX_OBJS += io.o
+  obj-y		+= io.o
 endif
-
-L_OBJS	+= $(L_OBJS_$(MACHINE)) $(l-obj-y)
 
 include $(TOPDIR)/Rules.make