[LV-k25-commit] CVS: kernel-2.5/arch/vax Makefile,1.15,1.16

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax
In directory sc8-pr-cvs1:/tmp/cvs-serv6196/arch/vax

Modified Files:
	Makefile 
Log Message:
Sync up with kbuild changes in 2.5.37.


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile	16 Feb 2003 23:49:08 -0000	1.15
+++ Makefile	17 Feb 2003 20:05:53 -0000	1.16
@@ -3,8 +3,7 @@
 #
 # This file is included by the global makefile so that you can add your own
 # architecture-specific flags and dependencies. Remember to do have actions
-# for "archclean" and "archdep" for cleaning up and making dependencies for
-# this architecture
+# for "archclean" and for cleaning up this architecture
 #
 # This file is subject to the terms and conditions of the GNU General Public
 # License.  See the file "COPYING" in the main directory of this archive
@@ -30,10 +29,11 @@
 
 # Tell the top-level makefile about the addition arch-specific
 # stuff that's needed
-HEAD = arch/vax/boot/head.o
+HEAD = arch/vax/boot/boot.o
 
-ARCHLIBS := $(TOPDIR)/arch/vax/lib/libio.a $(TOPDIR)/arch/vax/boot/libboot.a
-LIBS := $(ARCHLIBS) $(LIBS)
+SUBDIRS += arch/vax/boot
+core-y += arch/vax/kernel/ arch/vax/mm/
+libs-y += arch/vax/lib/
 
 TOOLSDIR := $(TOPDIR)/arch/vax/boot/tools
 MKBOOTBLK := $(TOOLSDIR)/mkbootblk
@@ -41,20 +41,16 @@
 SETCMDLINE := $(TOOLSDIR)/setcmdline
 SHOWCMDLINE := $(TOOLSDIR)/showcmdline
 
-# And these are some extra dependencies for vmlinux
-vmlinux: $(HEAD) $(ARCHLIBS)
-
-ARCHDIRS := arch/vax/kernel arch/vax/mm arch/vax/lib arch/vax/boot
-SUBDIRS := $(SUBDIRS) $(ARCHDIRS) $(TOOLSDIR)
-
-CORE_FILES := arch/vax/kernel/kernel.o arch/vax/mm/mm.o $(CORE_FILES)
-
-
+# Default target if none specified is to make a MOP image
 all: mopboot 
 
 # This will make a MOP-bootable image
 mopboot: vmlinux.SYS
 
+.PHONY: TOOLS
+TOOLS:
+	@+$(MAKE) -C arch/$(ARCH)/boot/tools
+
 # This will make a disk-bootable image.  dd this directly to a
 # disk and then tell your VAX to boot from this disk
 #
@@ -73,12 +69,12 @@
 vmlinux.bin: vmlinux
 	$(OBJCOPY) $(OBJCOPYFLAGS) $< $@
 
-vmlinux.SYS: vmlinux.bin
+vmlinux.SYS: vmlinux.bin TOOLS
 	dd if=/dev/zero bs=512 count=1 of=$@ 2>/dev/null
 	cat $< >> $@
 	$(SETCMDLINE) $@ $(DEFAULT_CMDLINE)
 
-vmlinux.dsk: vmlinux.bin
+vmlinux.dsk: vmlinux.bin TOOLS
 	$(MKBOOTBLK) $< > $@
 	cat $< >> $@