ia64: Minor Makefile cleanup. Mention CONFIG_NUMA option in defconfig.

arch/ia64/boot/Makefile

@@ -8,11 +8,9 @@
 # Copyright (C) 1998 by David Mosberger-Tang <davidm@hpl.hp.com>
 #
 
-THIS	= arch/$(ARCH)/boot
+LINKFLAGS = -static -T $(src)/bootloader.lds
 
-LINKFLAGS = -static -T $(THIS)/bootloader.lds
-
-OBJS	= $(THIS)/bootloader.o
+OBJS	= $(obj)/bootloader.o
 
 targets-$(CONFIG_IA64_HP_SIM)	+= bootloader
 targets-$(CONFIG_IA64_GENERIC)	+= bootloader

arch/ia64/defconfig

@@ -50,6 +50,7 @@ CONFIG_ACPI_KERNEL_CONFIG=y
 CONFIG_IA64_BRL_EMU=y
 # CONFIG_ITANIUM_BSTEP_SPECIFIC is not set
 CONFIG_IA64_L1_CACHE_SHIFT=6
+# CONFIG_NUMA is not set
 CONFIG_IA64_MCA=y
 CONFIG_PM=y
 CONFIG_IOSAPIC=y

arch/ia64/lib/Makefile

@@ -2,8 +2,6 @@
 # Makefile for ia64-specific library routines..
 #
 
-THIS = arch/$(ARCH)/lib
-
 L_TARGET = lib.a
 
 export-objs := swiotlb.o
@@ -34,26 +32,26 @@ AFLAGS___udivsi3.o	= -DUNSIGNED
 AFLAGS___modsi3.o	=	     -DMODULO
 AFLAGS___umodsi3.o	= -DUNSIGNED -DMODULO
 
-$(THIS)/__divdi3.o: $(THIS)/idiv64.S
+$(obj)/__divdi3.o: $(src)/idiv64.S
 	$(cmd_as_o_S)
 
-$(THIS)/__udivdi3.o: $(THIS)/idiv64.S
+$(obj)/__udivdi3.o: $(src)/idiv64.S
 	$(cmd_as_o_S)
 
-$(THIS)/__moddi3.o: $(THIS)/idiv64.S
+$(obj)/__moddi3.o: $(src)/idiv64.S
 	$(cmd_as_o_S)
 
-$(THIS)/__umoddi3.o: $(THIS)/idiv64.S
+$(obj)/__umoddi3.o: $(src)/idiv64.S
 	$(cmd_as_o_S)
 
-$(THIS)/__divsi3.o: $(THIS)/idiv32.S
+$(obj)/__divsi3.o: $(src)/idiv32.S
 	$(cmd_as_o_S)
 
-$(THIS)/__udivsi3.o: $(THIS)/idiv32.S
+$(obj)/__udivsi3.o: $(src)/idiv32.S
 	$(cmd_as_o_S)
 
-$(THIS)/__modsi3.o: $(THIS)/idiv32.S
+$(obj)/__modsi3.o: $(src)/idiv32.S
 	$(cmd_as_o_S)
 
-$(THIS)/__umodsi3.o: $(THIS)/idiv32.S
+$(obj)/__umodsi3.o: $(src)/idiv32.S
 	$(cmd_as_o_S)

arch/ia64/tools/Makefile

 CFLAGS	= -g -O2 -Wall $(CPPFLAGS)
 
-THIS	= arch/$(ARCH)/tools
 TARGET	= $(TOPDIR)/include/asm-ia64/offsets.h
 
+src = $(obj)
+
 all:
 
 fastdep:
@@ -10,13 +11,12 @@ fastdep:
 mrproper: clean
 
 clean:
-	rm -f $(THIS)/print_offsets.s $(THIS)/print_offsets $(THIS)/offsets.h
+	rm -f $(obj)/print_offsets.s $(obj)/print_offsets $(obj)/offsets.h
 
-$(TARGET): $(THIS)/offsets.h
-	echo here we go
-	if ! cmp -s $(THIS)/offsets.h ${TARGET}; then	\
+$(TARGET): $(obj)/offsets.h
+	@if ! cmp -s $(obj)/offsets.h ${TARGET}; then	\
 		echo -e "*** Updating ${TARGET}...";	\
-		cp $(THIS)/offsets.h ${TARGET};		\
+		cp $(obj)/offsets.h ${TARGET};		\
 	else						\
 		echo "*** ${TARGET} is up to date";	\
 	fi
@@ -32,23 +32,23 @@ $(TARGET): $(THIS)/offsets.h
 
 ifeq ($(CROSS_COMPILE),)
 
-$(THIS)/offsets.h: $(THIS)/print_offsets
-	$(THIS)/print_offsets > $(THIS)/offsets.h
+$(obj)/offsets.h: $(obj)/print_offsets
+	$(obj)/print_offsets > $(obj)/offsets.h
 
 comma	:= ,
 
-$(THIS)/print_offsets: $(THIS)/print_offsets.c FORCE
+$(obj)/print_offsets: $(src)/print_offsets.c FORCE
 	$(CC) $(CFLAGS) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) \
-		$(THIS)/print_offsets.c -o $@
+		$(src)/print_offsets.c -o $@
 
 FORCE:
 
 else
 
-$(THIS)/offsets.h: $(THIS)/print_offsets.s
-	$(AWK) -f $(THIS)/print_offsets.awk $^ > $@
+$(obj)/offsets.h: $(obj)/print_offsets.s
+	$(AWK) -f $(src)/print_offsets.awk $^ > $@
 
-$(THIS)/print_offsets.s: $(THIS)/print_offsets.c
+$(obj)/print_offsets.s: $(src)/print_offsets.c
 	$(CC) $(CFLAGS) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -S $^ -o $@
 
 endif