From: Paul M. <le...@us...> - 2001-08-25 02:19:30
|
Update of /cvsroot/linux-mips/linux In directory usw-pr-cvs1:/tmp/cvs-serv13548 Modified Files: Makefile Log Message: Sync to 2.4.7 Index: Makefile =================================================================== RCS file: /cvsroot/linux-mips/linux/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 2001/08/23 03:17:33 1.2 --- Makefile 2001/08/25 02:19:27 1.3 *************** *** 1,5 **** VERSION = 2 PATCHLEVEL = 4 ! SUBLEVEL = 6 EXTRAVERSION = -mips --- 1,5 ---- VERSION = 2 PATCHLEVEL = 4 ! SUBLEVEL = 7 EXTRAVERSION = -mips *************** *** 89,93 **** CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \ ! -fomit-frame-pointer -fno-strict-aliasing AFLAGS := -D__ASSEMBLY__ $(CPPFLAGS) --- 89,93 ---- CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \ ! -fomit-frame-pointer -fno-strict-aliasing -fno-common AFLAGS := -D__ASSEMBLY__ $(CPPFLAGS) *************** *** 148,151 **** --- 148,152 ---- DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o DRIVERS-$(CONFIG_SCSI) += drivers/scsi/scsidrv.o + DRIVERS-$(CONFIG_FUSION_BOOT) += drivers/message/fusion/fusion.o DRIVERS-$(CONFIG_IEEE1394) += drivers/ieee1394/ieee1394drv.o *************** *** 334,338 **** etags `find include/asm-$(ARCH) -name '*.h'` find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print | xargs etags -a ! find $(SUBDIRS) init -name '*.c' | xargs etags -a # Exuberant ctags works better with -I --- 335,339 ---- etags `find include/asm-$(ARCH) -name '*.h'` find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print | xargs etags -a ! find $(SUBDIRS) init -name '*.[ch]' | xargs etags -a # Exuberant ctags works better with -I *************** *** 341,345 **** ctags $$CTAGSF `find include/asm-$(ARCH) -name '*.h'` && \ find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print | xargs ctags $$CTAGSF -a && \ ! find $(SUBDIRS) init -name '*.c' | xargs ctags $$CTAGSF -a ifdef CONFIG_MODULES --- 342,346 ---- ctags $$CTAGSF `find include/asm-$(ARCH) -name '*.h'` && \ find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print | xargs ctags $$CTAGSF -a && \ ! find $(SUBDIRS) init -name '*.[ch]' | xargs ctags $$CTAGSF -a ifdef CONFIG_MODULES *************** *** 418,424 **** distclean: mrproper ! rm -f core `find . \( -name '*.orig' -o -name '*.rej' -o -name '*~' \ ! -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ ! -o -name '.*.rej' -o -name '.SUMS' -o -size 0 \) -type f -print` TAGS tags backup: mrproper --- 419,426 ---- distclean: mrproper ! find . -type f \( -name core -o -name '*.orig' -o -name '*.rej' \ ! -o -name '*~' -o -name '*.bak' -o -name '#*#' \ ! -o -name '.*.orig' -o -name '.*.rej' -o -name '.SUMS' \ ! -o -size 0 -o -name TAGS -o -name tags \) -print | env -i xargs rm -f backup: mrproper *************** *** 442,450 **** sums: ! find . -type f -print | sort | xargs sum > .SUMS dep-files: scripts/mkdep archdep include/linux/version.h scripts/mkdep -- init/*.c > .depend ! scripts/mkdep -- `find $(FINDHPATH) -name SCCS -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend $(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS)) _FASTDEP_ALL_SUB_DIRS="$(SUBDIRS)" ifdef CONFIG_MODVERSIONS --- 444,452 ---- sums: ! find . -type f -print | sort | env -i xargs sum > .SUMS dep-files: scripts/mkdep archdep include/linux/version.h scripts/mkdep -- init/*.c > .depend ! find $(FINDHPATH) -name SCCS -prune -o -follow -name \*.h ! -name modversions.h -print | env -i PATH="$(PATH)" HPATH="$(HPATH)" xargs scripts/mkdep -- > .hdepend $(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS)) _FASTDEP_ALL_SUB_DIRS="$(SUBDIRS)" ifdef CONFIG_MODVERSIONS |