kbuild: Use standard multi-part object declaration in lib/*

diff --git a/lib/Makefile b/lib/Makefile
index bc7df822e1cc3b75dae1bfd4ba20790d2ba92a5f..f16f1093e4873c66c4560dcd567c3b60195bfc64 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -23,11 +23,8 @@ endif
 
 obj-$(CONFIG_CRC32)    += crc32.o
 
-subdir-$(CONFIG_ZLIB_INFLATE) += zlib_inflate
-subdir-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate
-
-# Include the subdirs, if necessary.
-obj-y += $(join $(subdir-y),$(subdir-y:%=/%.o))
+obj-$(CONFIG_ZLIB_INFLATE) += zlib_inflate/
+obj-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate/
 
 include $(TOPDIR)/drivers/net/Makefile.lib
 include $(TOPDIR)/drivers/usb/class/Makefile.lib

diff --git a/lib/zlib_deflate/Makefile b/lib/zlib_deflate/Makefile
index cd4ae5531da25d243a6085f00292da21d32a158b..abcdeec762a503b75d4b599d005d52d7d07c59ae 100644 (file)
--- a/lib/zlib_deflate/Makefile
+++ b/lib/zlib_deflate/Makefile
@@ -6,13 +6,10 @@
 # decompression code.
 #
 
-O_TARGET    := zlib_deflate.o
-
 export-objs := deflate_syms.o
 
-obj-y := deflate.o deftree.o deflate_syms.o
-obj-m := $(O_TARGET)
+obj-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate.o
 
-EXTRA_CFLAGS += -I $(TOPDIR)/lib/zlib_deflate
+zlib_deflate-objs := deflate.o deftree.o deflate_syms.o
 
 include $(TOPDIR)/Rules.make

diff --git a/lib/zlib_inflate/Makefile b/lib/zlib_inflate/Makefile
index 40e195c8ed0fc5ab4090672c45008b374d028af2..6316d0e9a9bda668158b2a2f17791b4f05f9b632 100644 (file)
--- a/lib/zlib_inflate/Makefile
+++ b/lib/zlib_inflate/Makefile
@@ -13,14 +13,11 @@
 # uncompression can be done without blocking on allocation).
 #
 
-O_TARGET    := zlib_inflate.o
-
 export-objs := inflate_syms.o
 
-obj-y := infblock.o infcodes.o inffast.o inflate.o \
-        inftrees.o infutil.o inflate_syms.o
-obj-m := $(O_TARGET)
+obj-$(CONFIG_ZLIB_INFLATE) += zlib_inflate.o
 
-EXTRA_CFLAGS += -I $(TOPDIR)/lib/zlib_inflate
+zlib_inflate-objs := infblock.o infcodes.o inffast.o inflate.o \
+                    inftrees.o infutil.o inflate_syms.o
 
 include $(TOPDIR)/Rules.make