Commit d8ae128a authored by Kai Germaschewski's avatar Kai Germaschewski

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

parent 5a6bdf60
...@@ -23,11 +23,8 @@ endif ...@@ -23,11 +23,8 @@ endif
obj-$(CONFIG_CRC32) += crc32.o obj-$(CONFIG_CRC32) += crc32.o
subdir-$(CONFIG_ZLIB_INFLATE) += zlib_inflate obj-$(CONFIG_ZLIB_INFLATE) += zlib_inflate/
subdir-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate obj-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate/
# Include the subdirs, if necessary.
obj-y += $(join $(subdir-y),$(subdir-y:%=/%.o))
include $(TOPDIR)/drivers/net/Makefile.lib include $(TOPDIR)/drivers/net/Makefile.lib
include $(TOPDIR)/drivers/usb/class/Makefile.lib include $(TOPDIR)/drivers/usb/class/Makefile.lib
......
...@@ -6,13 +6,10 @@ ...@@ -6,13 +6,10 @@
# decompression code. # decompression code.
# #
O_TARGET := zlib_deflate.o
export-objs := deflate_syms.o export-objs := deflate_syms.o
obj-y := deflate.o deftree.o deflate_syms.o obj-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate.o
obj-m := $(O_TARGET)
EXTRA_CFLAGS += -I $(TOPDIR)/lib/zlib_deflate zlib_deflate-objs := deflate.o deftree.o deflate_syms.o
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -13,14 +13,11 @@ ...@@ -13,14 +13,11 @@
# uncompression can be done without blocking on allocation). # uncompression can be done without blocking on allocation).
# #
O_TARGET := zlib_inflate.o
export-objs := inflate_syms.o export-objs := inflate_syms.o
obj-y := infblock.o infcodes.o inffast.o inflate.o \ obj-$(CONFIG_ZLIB_INFLATE) += zlib_inflate.o
inftrees.o infutil.o inflate_syms.o
obj-m := $(O_TARGET)
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 include $(TOPDIR)/Rules.make
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment