diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
| commit | 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch) | |
| tree | e9ce4bc598d06374bda906f18365984bf22a526a /Makefile | |
| parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) | |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 1 -SUBLEVEL = 48 +SUBLEVEL = 55 ARCH = mips @@ -150,6 +150,10 @@ ifdef CONFIG_SBUS DRIVERS := $(DRIVERS) drivers/sbus/sbus.a endif +ifdef CONFIG_PPC +DRIVERS := $(DRIVERS) drivers/macintosh/macintosh.a +endif + ifdef CONFIG_PNP DRIVERS := $(DRIVERS) drivers/pnp/pnp.a endif @@ -203,6 +207,7 @@ symlinks: fi oldconfig: symlinks + $(MAKE) -C drivers/sound mkscript $(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in xconfig: symlinks @@ -334,16 +339,18 @@ clean: archclean rm -f core `find . -type f -name 'core' -print` rm -f vmlinux System.map rm -f .tmp* drivers/sound/configure + rm -f drivers/char/consolemap_deftbl.c drivers/char/conmakehash rm -f `find modules/ -type f -print` rm -f submenu* mrproper: clean rm -f include/linux/autoconf.h include/linux/version.h rm -f drivers/sound/local.h drivers/sound/.defines - rm -f drivers/char/uni_hash.tbl drivers/char/conmakehash rm -f drivers/net/soundmodem/sm_tbl_{afsk1200,afsk2666,fsk9600}.h rm -f drivers/net/soundmodem/sm_tbl_{hapn4800,psk4800}.h + rm -f drivers/net/soundmodem/sm_tbl_{afsk2400_7,afsk2400_8}.h rm -f drivers/net/soundmodem/gentbl + rm -f drivers/char/hfmodem/gentbl drivers/char/hfmodem/tables.h rm -f .version .config* config.in config.old rm -f scripts/tkparse scripts/kconfig.tk scripts/kconfig.tmp rm -f scripts/lxdialog/*.o scripts/lxdialog/lxdialog @@ -355,7 +362,6 @@ mrproper: clean rm -rf $(TOPDIR)/include/linux/modules rm -rf modules - distclean: mrproper rm -f core `find . \( -name '*.orig' -o -name '*.rej' -o -name '*~' \ -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ |