patch-2.3.47 linux/Makefile
Next file: linux/arch/alpha/kernel/Makefile
Previous file: linux/MAINTAINERS
Back to the patch index
Back to the overall index
- Lines: 37
- Date:
Sun Feb 20 20:14:55 2000
- Orig file:
v2.3.46/linux/Makefile
- Orig date:
Wed Feb 16 17:03:51 2000
diff -u --recursive --new-file v2.3.46/linux/Makefile linux/Makefile
@@ -1,6 +1,6 @@
VERSION = 2
PATCHLEVEL = 3
-SUBLEVEL = 46
+SUBLEVEL = 47
EXTRAVERSION =
ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
@@ -206,6 +206,10 @@
DRIVERS := $(DRIVERS) drivers/macintosh/macintosh.a
endif
+ifdef CONFIG_MAC
+DRIVERS := $(DRIVERS) drivers/macintosh/macintosh.a
+endif
+
ifeq ($(CONFIG_ISAPNP),y)
DRIVERS := $(DRIVERS) drivers/pnp/pnp.o
endif
@@ -267,8 +271,8 @@
$(LD) $(LINKFLAGS) $(HEAD) init/main.o init/version.o \
--start-group \
$(CORE_FILES) \
- $(NETWORKS) \
$(DRIVERS) \
+ $(NETWORKS) \
$(LIBS) \
--end-group \
-o vmlinux
@@ -400,6 +404,7 @@
if [ -f FC4_MODULES ]; then inst_mod FC4_MODULES fc4; fi; \
if [ -f IRDA_MODULES ]; then inst_mod IRDA_MODULES net; fi; \
if [ -f SK98LIN_MODULES ]; then inst_mod SK98LIN_MODULES net; fi; \
+ if [ -f SKFP_MODULES ]; then inst_mod SKFP_MODULES net; fi; \
if [ -f USB_MODULES ]; then inst_mod USB_MODULES usb; fi; \
if [ -f IEEE1394_MODULES ]; then inst_mod IEEE1394_MODULES ieee1394; fi; \
if [ -f PCMCIA_MODULES ]; then inst_mod PCMCIA_MODULES pcmcia; fi; \
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)