[klibc] kbuild: replace obj- with lib-

Sam Ravnborg sam at ravnborg.org
Mon Aug 1 07:39:32 PDT 2005


When we changed from built-in.o to lib.a it makes less sense
to use the obj- syntax. So switch it over to lib-

Signed-off-by: Sam Ravnborg <sam at ravnborg.org>

---
commit 1b8f997e4838bb3f152d0f54067d64cc52dbb209
tree 87746c7965fe930458f0a2485dad3d72f9c791cd
parent c8da2e7a7d748918be96965829fcf8249d87be04
author Sam Ravnborg <sam at mars.(none)> Mon, 01 Aug 2005 16:38:32 +0200
committer Sam Ravnborg <sam at mars.(none)> Mon, 01 Aug 2005 16:38:32 +0200

 ipconfig/Kbuild      |    2 +-
 nfsmount/Kbuild      |    2 +-
 scripts/Kbuild.klibc |   12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ipconfig/Kbuild b/ipconfig/Kbuild
--- a/ipconfig/Kbuild
+++ b/ipconfig/Kbuild
@@ -18,7 +18,7 @@ objs += bootp_proto.o
 
 
 # Create built-in.o with all object files (used by kinit)
-obj-y := $(objs)
+lib-y := $(objs)
 
 # .o files used to built executables
 static/ipconfig-y := $(objs)
diff --git a/nfsmount/Kbuild b/nfsmount/Kbuild
--- a/nfsmount/Kbuild
+++ b/nfsmount/Kbuild
@@ -9,7 +9,7 @@ shared-y := shared/nfsmount
 objs := main.o mount.o portmap.o dummypmap.o sunrpc.o
 
 # Create built-in.o with all .o files (used by kinit)
-obj-y := $(objs)
+lib-y := $(objs)
 
 # .o files used for executables
 static/nfsmount-y := $(objs)
diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc
--- a/scripts/Kbuild.klibc
+++ b/scripts/Kbuild.klibc
@@ -131,7 +131,7 @@ user-real-objs  := $(addprefix $(obj)/,$
 output-dirs     := $(addprefix $(obj)/,$(output-dirs))
 user-dirs       := $(addprefix $(obj)/,$(user-dirs))
 subdir-y        := $(addprefix $(obj)/,$(subdir-y))
-obj-y           := $(addprefix $(obj)/,$(obj-y))
+lib-y           := $(addprefix $(obj)/,$(lib-y))
 always          := $(addprefix $(obj)/,$(always))
 targets         := $(addprefix $(obj)/,$(targets))
 
@@ -146,11 +146,11 @@ useraflags     = -Wp,-MD,$(depfile) $(NO
 _dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))
 
 # Create directories for object files if directory does not exist
-# Needed when obj-y := dir/file.o syntax is used
+# Needed when lib-y := dir/file.o syntax is used
 _dummy := $(foreach d,$(output-dirs), $(shell [ -d $(d) ] || mkdir -p $(d)))
 
 # Do we have to make a lib.a in this dir?
-ifneq ($(strip $(obj-y) $(obj-n) $(obj-)),)
+ifneq ($(strip $(lib-y) $(lib-n) $(lib-)),)
 lib-target := $(obj)/lib.a
 endif
 
@@ -201,11 +201,11 @@ targets += $(real-objs-y)
 ifdef lib-target
 quiet_cmd_link_o_target = LD      $@
 # If the list of objects to link is empty, just create an empty lib.a
-cmd_link_o_target = $(if $(strip $(obj-y)),\
-                    rm -f $@; $(USERAR) cru $@ $(filter $(obj-y), $^),\
+cmd_link_o_target = $(if $(strip $(lib-y)),\
+                    rm -f $@; $(USERAR) cru $@ $(filter $(lib-y), $^),\
                     rm -f $@; $(USERAR) crs $@)
 
-$(lib-target): $(obj-y) FORCE
+$(lib-target): $(lib-y) FORCE
 	$(call if_changed,link_o_target)
 targets += $(lib-target)
 endif # lib-target



More information about the klibc mailing list