linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / scripts / Makefile.modpost

diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 0a64688..bf96a61 100644 (file)
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -4,7 +4,7 @@
 #
 # Stage one of module building created the following:
 # a) The individual .o files used for the module
-# b) A <module>.o file which is the .o files above linked together
+# b) A <module>.o file wich is the .o files above linked together
 # c) A <module>.mod file in $(MODVERDIR)/, listing the name of the
 #    the preliminary <module>.o file, plus all .o files
 
@@ -32,15 +32,14 @@
 # Step 4 is solely used to allow module versioning in external modules,
 # where the CRC of each module is retrieved from the Module.symers file.
 
-PHONY := _modpost
+.PHONY: _modpost
 _modpost: __modpost
 
-include include/config/auto.conf
+include .config
 include scripts/Kbuild.include
 include scripts/Makefile.lib
 
-kernelsymfile := $(objtree)/Module.symvers
-modulesymfile := $(KBUILD_EXTMOD)/Module.symvers
+symverfile := $(objtree)/Module.symvers
 
 # Step 1), find all modules listed in $(MODVERDIR)/
 __modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
@@ -55,12 +54,10 @@ quiet_cmd_modpost = MODPOST
       cmd_modpost = scripts/mod/modpost            \
         $(if $(CONFIG_MODVERSIONS),-m)             \
        $(if $(CONFIG_MODULE_SRCVERSION_ALL),-a,)  \
-       $(if $(KBUILD_EXTMOD),-i,-o) $(kernelsymfile) \
-       $(if $(KBUILD_EXTMOD),-I $(modulesymfile)) \
-       $(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \
+       $(if $(KBUILD_EXTMOD),-i,-o) $(symverfile) \
        $(filter-out FORCE,$^)
 
-PHONY += __modpost
+.PHONY: __modpost
 __modpost: $(wildcard vmlinux) $(modules:.ko=.o) FORCE
        $(call cmd,modpost)
 
@@ -72,7 +69,7 @@ $(modules:.ko=.mod.c): __modpost ;
 # Step 5), compile all *.mod.c files
 
 # modname is set to make c_flags define KBUILD_MODNAME
-modname = $(notdir $(@:.mod.o=))
+modname = $(*F)
 
 quiet_cmd_cc_o_c = CC      $@
       cmd_cc_o_c = $(CC) $(c_flags) $(CFLAGS_MODULE)   \
@@ -97,7 +94,7 @@ targets += $(modules)
 # Add FORCE to the prequisites of a target to force it to be always rebuilt.
 # ---------------------------------------------------------------------------
 
-PHONY += FORCE
+.PHONY: FORCE
 
 FORCE:
 
@@ -112,9 +109,3 @@ cmd_files := $(wildcard $(foreach f,$(targets),$(dir $(f)).$(notdir $(f)).cmd))
 ifneq ($(cmd_files),)
   include $(cmd_files)
 endif
-
-
-# Declare the contents of the .PHONY variable as phony.  We keep that
-# information in a variable se we can use it in if_changed and friends.
-
-.PHONY: $(PHONY)