]>
Commit | Line | Data |
---|---|---|
ec8498d9 JB |
1 | --- linux-2.6.6/scripts/Makefile.modpost.orig Thu Apr 15 03:35:04 2004 |
2 | +++ linux-2.6.6/scripts/Makefile.modpost Tue Apr 20 16:43:56 2004 | |
3 | @@ -50,7 +50,7 @@ | |
9b118dba | 4 | # Includes step 3,4 |
ec8498d9 JB |
5 | quiet_cmd_modpost = MODPOST |
6 | cmd_modpost = scripts/modpost \ | |
9b118dba | 7 | - $(if $(KBUILD_EXTMOD),-i,-o) $(symverfile) \ |
06a49782 | 8 | + $(if $(CONFIG_MODVERSIONS),$(if $(filter vmlinux,$^),-o,-i) $(symverfile)) \ |
ec8498d9 JB |
9 | $(filter-out FORCE,$^) |
10 | ||
11 | __modpost: $(if $(KBUILD_EXTMOD),,$(wildcard vmlinux)) $(modules:.ko=.o) FORCE | |
52afb740 PS |
12 | --- linux-2.6.6/Makefile.orig 2004-05-23 13:18:32.000000000 +0200 |
13 | +++ linux-2.6.6/Makefile 2004-05-23 13:20:16.759551080 +0200 | |
06a49782 | 14 | @@ -397,7 +397,6 @@ |
ec8498d9 JB |
15 | # Build targets only - this includes vmlinux, arch specific targets, clean |
16 | # targets and others. In general all targets except *config targets. | |
17 | ||
18 | -ifeq ($(KBUILD_EXTMOD),) | |
19 | # Additional helpers built in scripts/ | |
20 | # Carefully list dependencies so we do not try to build scripts twice | |
21 | # in parrallel | |
06a49782 | 22 | @@ -407,6 +406,7 @@ |
ec8498d9 JB |
23 | |
24 | scripts_basic: include/linux/autoconf.h | |
25 | ||
26 | +ifeq ($(KBUILD_EXTMOD),) | |
06a49782 PS |
27 | # Objects we will link into vmlinux / subdirs we need to visit |
28 | init-y := init/ | |
29 | drivers-y := drivers/ sound/ cluster/ | |
52afb740 | 30 | @@ -957,7 +957,7 @@ |
ec8498d9 | 31 | |
52afb740 PS |
32 | module-dirs := $(addprefix _module_,$(KBUILD_EXTMOD)) |
33 | .PHONY: $(module-dirs) modules | |
34 | -$(module-dirs): crmodverdir | |
35 | +$(module-dirs): crmodverdir scripts | |
36 | $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@) | |
37 | ||
38 | modules: $(module-dirs) |