diff options
| author | Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | 2002-05-24 08:16:45 -0500 |
|---|---|---|
| committer | Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | 2002-05-24 08:16:45 -0500 |
| commit | d8ae128a71694e8ce6675ea487288df0258431ec (patch) | |
| tree | f9d1e5b8386ba3a0eaf6b0fe22311c3d269e327b | |
| parent | 5a6bdf60e51ce7c31c301fc85082bcc56109297a (diff) | |
kbuild: Use standard multi-part object declaration in lib/*
| -rw-r--r-- | lib/Makefile | 7 | ||||
| -rw-r--r-- | lib/zlib_deflate/Makefile | 7 | ||||
| -rw-r--r-- | lib/zlib_inflate/Makefile | 9 |
3 files changed, 7 insertions, 16 deletions
diff --git a/lib/Makefile b/lib/Makefile index bc7df822e1cc..f16f1093e487 100644 --- 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 cd4ae5531da2..abcdeec762a5 100644 --- 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 40e195c8ed0f..6316d0e9a9bd 100644 --- 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 |