diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-03 17:49:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-03 17:49:53 +0000 |
| commit | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (patch) | |
| tree | 5746fea1605ff013be9b78a1556aaad7615d664a /Makefile | |
| parent | 80ea5b1e15398277650e1197957053b5a71c08bc (diff) | |
Merge with Linux 2.1.131 plus some more MIPS goodies.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 1 -SUBLEVEL = 121 +SUBLEVEL = 131 ARCH = mips @@ -159,6 +159,10 @@ ifdef CONFIG_ZORRO DRIVERS := $(DRIVERS) drivers/zorro/zorro.a endif +ifeq ($(CONFIG_FC4),y) +DRIVERS := $(DRIVERS) drivers/fc4/fc4.a +endif + ifdef CONFIG_PPC DRIVERS := $(DRIVERS) drivers/macintosh/macintosh.a endif @@ -324,10 +328,10 @@ modules_install: if [ -f VIDEO_MODULES ]; then inst_mod VIDEO_MODULES video; fi; \ if [ -f FC4_MODULES ]; then inst_mod FC4_MODULES fc4; fi; \ \ - ls *.o > .allmods; \ - echo $$MODULES | tr ' ' '\n' | sort | comm -23 .allmods - > .misc; \ - if [ -s .misc ]; then inst_mod .misc misc; fi; \ - rm -f .misc .allmods; \ + ls *.o > $$MODLIB/.allmods; \ + echo $$MODULES | tr ' ' '\n' | sort | comm -23 $$MODLIB/.allmods - > $$MODLIB/.misc; \ + if [ -s $$MODLIB/.misc ]; then inst_mod $$MODLIB/.misc misc; fi; \ + rm -f $$MODLIB/.misc $$MODLIB/.allmods; \ ) # modules disabled.... @@ -393,7 +397,7 @@ sums: dep-files: scripts/mkdep archdep include/linux/version.h scripts/mkdep init/*.c > .depend - find $(FINDHPATH) -follow -name \*.h ! -name modversions.h -print | env -i xargs scripts/mkdep > .hdepend + find $(FINDHPATH) -follow -name \*.h ! -name modversions.h -print | xargs scripts/mkdep > .hdepend # set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i fastdep; done # let this be made through the fastdep rule in Rules.make $(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS)) _FASTDEP_ALL_SUB_DIRS="$(SUBDIRS)" |