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

Next file: linux/arch/arm/lib/extractconstants.pl
Previous file: linux/arch/arm/kernel/traps.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.95/linux/arch/arm/lib/Makefile linux/arch/arm/lib/Makefile
@@ -5,17 +5,13 @@
 #
 
 L_TARGET := lib.a
-L_OBJS   := backtrace.o bitops.o delay.o fp_support.o \
+L_OBJS   := backtrace.o bitops.o checksum.o delay.o fp_support.o \
 	    loaders.o memcpy.o memfastset.o system.o string.o uaccess.o
 
 ifeq ($(PROCESSOR),armo)
   L_OBJS += uaccess-armo.o
 endif
 
-ifdef CONFIG_INET
-  L_OBJS += checksum.o
-endif
-
 ifdef CONFIG_ARCH_ACORN
   L_OBJS += ll_char_wr.o io-acorn.o
   ifdef CONFIG_ARCH_A5K
@@ -26,30 +22,27 @@
   endif
 endif
 
-ifdef CONFIG_ARCH_EBSA110
+ifeq ($(MACHINE),ebsa110)
   L_OBJS += io-ebsa110.o
 endif
 
-include $(TOPDIR)/Rules.make
+ifeq ($(MACHINE),ebsa285)
+  L_OBJS += io-ebsa285.o
+endif
 
-constants.h: getconstants
-	./getconstants > constants.h
+include $(TOPDIR)/Rules.make
 
-getconstants: getconstants.c getconstants.h
-	$(HOSTCC) -D__KERNEL__ -o getconstants getconstants.c
+constants.h: getconsdata.o extractconstants.pl
+	$(PERL) extractconstants.pl $(OBJDUMP) > $@
 
-getconstants.h: getconsdata.c
+getconsdata.o: getconsdata.c
 	$(CC) $(CFLAGS) -c getconsdata.c
-	$(PERL) extractinfo.perl $(OBJDUMP) > $@
 
 %.o: %.S
-ifndef $(CONFIG_BINUTILS_NEW)
+ifneq ($(CONFIG_BINUTILS_NEW),y)
 	$(CC) $(CFLAGS) -D__ASSEMBLY__ -E $< | tr ';$$' '\n#' > ..tmp.$<.s
 	$(CC) $(CFLAGS:-pipe=) -c -o $@ ..tmp.$<.s
 	$(RM) ..tmp.$<.s
 else
 	$(CC) $(CFLAGS) -D__ASSEMBLY__ -c -o $@ $<
 endif
-
-clean:
-	$(RM) getconstants constants.h getconstants.h

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov