Linux Headquarters
[ Register ]
[ About us ] [ Home Page ]

Advertisement
[ Kernel ] [ Documentation ] [ Links ] [ Books ]

Advertisement

Kernel v2.4.20-rc4-ac1 /Makefile

Filename:/Makefile
Lines Added:22
Lines Deleted:10
Also changed in: (Previous) 2.4.20-rc4  2.4.20-rc3  2.4.20-rc2-ac3  2.4.20-rc2-ac2  2.4.20-rc2-ac1  2.4.20-rc1-ac4 
(Following) 2.4.20  2.4.20-ac1  2.4.20-ac2  2.4.21-pre1  2.4.21-pre2  2.4.21-pre3 

Location
[  2.4.20-rc4-ac1
   o  Makefile

Patch

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.20rc4/Makefile linux.20rc4-ac1/Makefile
--- linux.20rc4/Makefile   2002-11-26 16:55:58.000000000 +0000
+++ linux.20rc4-ac1/Makefile   2002-11-26 16:58:03.000000000 +0000
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 20
-EXTRAVERSION = -rc4
+EXTRAVERSION = -rc4-ac1
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
@@ -40,10 +40,11 @@
 MODFLAGS   = -DMODULE
 CFLAGS_KERNEL   =
 PERL      = perl
+AWK      = awk
 
 export   VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION KERNELRELEASE ARCH \
    CONFIG_SHELL TOPDIR HPATH HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
-   CPP AR NM STRIP OBJCOPY OBJDUMP MAKE MAKEFILES GENKSYMS MODFLAGS PERL
+   CPP AR NM STRIP OBJCOPY OBJDUMP MAKE MAKEFILES GENKSYMS MODFLAGS PERL AWK
 
 all:   do-it-all
 
@@ -137,8 +138,8 @@
 DRIVERS-y += drivers/char/char.o \
    drivers/block/block.o \
    drivers/misc/misc.o \
-   drivers/net/net.o \
-   drivers/media/media.o
+   drivers/net/net.o
+
 DRIVERS-$(CONFIG_AGP) += drivers/char/agp/agp.o
 DRIVERS-$(CONFIG_DRM_NEW) += drivers/char/drm/drm.o
 DRIVERS-$(CONFIG_DRM_OLD) += drivers/char/drm-4.0/drm.o
@@ -172,13 +173,14 @@
 DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a
 DRIVERS-$(CONFIG_PPC32) += drivers/macintosh/macintosh.o
 DRIVERS-$(CONFIG_MAC) += drivers/macintosh/macintosh.o
-DRIVERS-$(CONFIG_ISAPNP) += drivers/pnp/pnp.o
+DRIVERS-$(CONFIG_PNP) += drivers/pnp/pnp.o
 DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/sgi.a
 DRIVERS-$(CONFIG_VT) += drivers/video/video.o
 DRIVERS-$(CONFIG_PARIDE) += drivers/block/paride/paride.a
 DRIVERS-$(CONFIG_HAMRADIO) += drivers/net/hamradio/hamradio.o
 DRIVERS-$(CONFIG_TC) += drivers/tc/tc.a
 DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o
+DRIVERS-y +=drivers/media/media.o
 DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o
 DRIVERS-$(CONFIG_HIL) += drivers/hil/hil.o
 DRIVERS-$(CONFIG_I2O) += drivers/message/i2o/i2o.o
@@ -199,6 +201,7 @@
    kernel/ksyms.lst include/linux/compile.h \
    vmlinux System.map \
    .tmp* \
+   scripts/mkconfigs kernel/configs.c kernel/configs.o \
    drivers/char/consolemap_deftbl.c drivers/video/promcon_tbl.c \
    drivers/char/conmakehash \
    drivers/char/drm/*-mod.c \
@@ -226,6 +229,7 @@
 # files removed with 'make mrproper'
 MRPROPER_FILES = \
    include/linux/autoconf.h include/linux/version.h \
+   tmp* \
    drivers/net/hamradio/soundmodem/sm_tbl_{afsk1200,afsk2666,fsk9600}.h \
    drivers/net/hamradio/soundmodem/sm_tbl_{hapn4800,psk4800}.h \
    drivers/net/hamradio/soundmodem/sm_tbl_{afsk2400_7,afsk2400_8}.h \
@@ -243,6 +247,7 @@
    include/asm \
    .hdepend scripts/mkdep scripts/split-include scripts/docproc \
    $(TOPDIR)/include/linux/modversions.h \
+   scripts/mkconfigs kernel/configs.c kernel/configs.o \
    kernel.spec
 
 # directories removed with 'make mrproper'
@@ -316,7 +321,7 @@
 
 linuxsubdirs: $(patsubst %, _dir_%, $(SUBDIRS))
 
-$(patsubst %, _dir_%, $(SUBDIRS)) : dummy include/linux/version.h include/config/MARKER
+$(patsubst %, _dir_%, $(SUBDIRS)) : dummy include/linux/version.h tmp_include_depends
    $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" -C $(patsubst _dir_%, %, $@)
 
 $(TOPDIR)/include/linux/version.h: include/linux/version.h
@@ -356,13 +361,13 @@
 
 comma   := ,
 
-init/version.o: init/version.c include/linux/compile.h include/config/MARKER
+init/version.o: init/version.c include/linux/compile.h tmp_include_depends
    $(CC) $(CFLAGS) $(CFLAGS_KERNEL) -DUTS_MACHINE='"$(ARCH)"' -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o init/v+
ersion.o init/version.c
 
-init/main.o: init/main.c include/config/MARKER
+init/main.o: init/main.c tmp_include_depends
    $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $@ $<
 
-init/do_mounts.o: init/do_mounts.c include/config/MARKER
+init/do_mounts.o: init/do_mounts.c tmp_include_depends
    $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $@ $<
 
 fs lib mm ipc kernel drivers net: dummy
@@ -389,7 +394,7 @@
 modules: $(patsubst %, _mod_%, $(SUBDIRS))
 
 .PHONY: $(patsubst %, _mod_%, $(SUBDIRS))
-$(patsubst %, _mod_%, $(SUBDIRS)) : include/linux/version.h include/config/MARKER
+$(patsubst %, _mod_%, $(SUBDIRS)) : include/linux/version.h tmp_include_depends
    $(MAKE) -C $(patsubst _mod_%, %, $@) CFLAGS="$(CFLAGS) $(MODFLAGS)" MAKING_MODULES=1 modules
 
 .PHONY: modules_install
@@ -494,6 +499,13 @@
 ifdef CONFIG_MODVERSIONS
    $(MAKE) update-modverfile
 endif
+   (find $(TOPDIR) \( -name .depend -o -name .hdepend \) -print | xargs $(AWK) -f scripts/include_deps) > tmp_include_depends
+   sed -ne 's/^\([^ ].*\):.*/  \1 \\/p' tmp_include_depends > tmp_include_depends_1
+   (echo ""; echo "all: \\"; cat tmp_include_depends_1; echo "") >> tmp_include_depends
+   rm tmp_include_depends_1
+
+tmp_include_depends: include/config/MARKER dummy
+   $(MAKE) -r -f tmp_include_depends all
 
 ifdef CONFIG_MODVERSIONS
 MODVERFILE := $(TOPDIR)/include/linux/modversions.h


Comments: webmaster (at) linuxhq.com.
Advertising: banners (at) linuxhq.com.
Compilation ©1998-2008 Linux Headquarters, Inc.