Эх сурвалжийг харах

UAPI: Remove the objhdr-y export list

Remove the objhdr-y export list as it is no longer used.  genhdr-y should be
used instead.

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>
David Howells 13 жил өмнө
parent
commit
40f1d4c200

+ 4 - 4
Documentation/kbuild/makefiles.txt

@@ -45,7 +45,7 @@ This document describes the Linux kernel Makefiles.
 
 
 	=== 7 Kbuild syntax for exported headers
 	=== 7 Kbuild syntax for exported headers
 		--- 7.1 header-y
 		--- 7.1 header-y
-		--- 7.2 objhdr-y
+		--- 7.2 genhdr-y
 		--- 7.3 destination-y
 		--- 7.3 destination-y
 		--- 7.4 generic-y
 		--- 7.4 generic-y
 
 
@@ -1282,15 +1282,15 @@ See subsequent chapter for the syntax of the Kbuild file.
 
 
 	Subdirectories are visited before their parent directories.
 	Subdirectories are visited before their parent directories.
 
 
-	--- 7.2 objhdr-y
+	--- 7.2 genhdr-y
 
 
-	objhdr-y specifies generated files to be exported.
+	genhdr-y specifies generated files to be exported.
 	Generated files are special as they need to be looked
 	Generated files are special as they need to be looked
 	up in another directory when doing 'make O=...' builds.
 	up in another directory when doing 'make O=...' builds.
 
 
 		Example:
 		Example:
 			#include/linux/Kbuild
 			#include/linux/Kbuild
-			objhdr-y += version.h
+			genhdr-y += version.h
 
 
 	--- 7.3 destination-y
 	--- 7.3 destination-y
 
 

+ 2 - 5
scripts/Makefile.headersinst

@@ -3,8 +3,7 @@
 #
 #
 # header-y  - list files to be installed. They are preprocessed
 # header-y  - list files to be installed. They are preprocessed
 #             to remove __KERNEL__ section of the file
 #             to remove __KERNEL__ section of the file
-# objhdr-y  - Same as header-y but for generated files
-# genhdr-y  - Same as objhdr-y but in a generated/ directory
+# genhdr-y  - Same as header-y but in a generated/ directory
 #
 #
 # ==========================================================================
 # ==========================================================================
 
 
@@ -37,9 +36,8 @@ wrapper-files := $(filter $(header-y), $(generic-y))
 
 
 # all headers files for this dir
 # all headers files for this dir
 header-y      := $(filter-out $(generic-y), $(header-y))
 header-y      := $(filter-out $(generic-y), $(header-y))
-all-files     := $(header-y) $(objhdr-y) $(genhdr-y) $(wrapper-files)
+all-files     := $(header-y) $(genhdr-y) $(wrapper-files)
 input-files   := $(addprefix $(srctree)/$(obj)/,$(header-y)) \
 input-files   := $(addprefix $(srctree)/$(obj)/,$(header-y)) \
-                 $(addprefix $(objtree)/$(obj)/,$(objhdr-y)) \
                  $(addprefix $(objtree)/$(gen)/,$(genhdr-y))
                  $(addprefix $(objtree)/$(gen)/,$(genhdr-y))
 output-files  := $(addprefix $(install)/, $(all-files))
 output-files  := $(addprefix $(install)/, $(all-files))
 
 
@@ -56,7 +54,6 @@ quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\
                             file$(if $(word 2, $(all-files)),s))
                             file$(if $(word 2, $(all-files)),s))
       cmd_install = \
       cmd_install = \
         $(PERL) $< $(srctree)/$(obj) $(install) $(SRCARCH) $(header-y); \
         $(PERL) $< $(srctree)/$(obj) $(install) $(SRCARCH) $(header-y); \
-        $(PERL) $< $(objtree)/$(obj) $(install) $(SRCARCH) $(objhdr-y); \
         $(PERL) $< $(objtree)/$(gen) $(install) $(SRCARCH) $(genhdr-y); \
         $(PERL) $< $(objtree)/$(gen) $(install) $(SRCARCH) $(genhdr-y); \
         for F in $(wrapper-files); do                                   \
         for F in $(wrapper-files); do                                   \
                 echo "\#include <asm-generic/$$F>" > $(install)/$$F;    \
                 echo "\#include <asm-generic/$$F>" > $(install)/$$F;    \