summaryrefslogtreecommitdiffstats
path: root/lib/Makefile
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-01-08 15:14:17 -0800
committerH. Peter Anvin <hpa@zytor.com>2009-01-08 15:14:17 -0800
commit889c92d21db40be0b7d22a59395060237895bb85 (patch)
treedb76e1e002e450cccc1b7a8119ad629eccc24da8 /lib/Makefile
parent6c11b12ac6f101732d43b5682f5b3ae4dda4205f (diff)
downloadlinux-889c92d21db40be0b7d22a59395060237895bb85.tar.gz
linux-889c92d21db40be0b7d22a59395060237895bb85.tar.bz2
linux-889c92d21db40be0b7d22a59395060237895bb85.zip
bzip2/lzma: centralize format detection
Centralize the compression format detection to a common routine in the lib directory, and use it for both initramfs and initrd. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'lib/Makefile')
-rw-r--r--lib/Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/Makefile b/lib/Makefile
index d9ac5a414fa7..790de7c25d0d 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -11,7 +11,8 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \
rbtree.o radix-tree.o dump_stack.o \
idr.o int_sqrt.o extable.o prio_tree.o \
sha1.o irq_regs.o reciprocal_div.o argv_split.o \
- proportions.o prio_heap.o ratelimit.o show_mem.o is_single_threaded.o
+ proportions.o prio_heap.o ratelimit.o show_mem.o \
+ is_single_threaded.o decompress.o
lib-$(CONFIG_MMU) += ioremap.o
lib-$(CONFIG_SMP) += cpumask.o
@@ -65,9 +66,9 @@ obj-$(CONFIG_REED_SOLOMON) += reed_solomon/
obj-$(CONFIG_LZO_COMPRESS) += lzo/
obj-$(CONFIG_LZO_DECOMPRESS) += lzo/
-obj-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o
-obj-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o
-obj-$(CONFIG_DECOMPRESS_LZMA) += decompress_unlzma.o
+lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o
+lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o
+lib-$(CONFIG_DECOMPRESS_LZMA) += decompress_unlzma.o
obj-$(CONFIG_TEXTSEARCH) += textsearch.o
obj-$(CONFIG_TEXTSEARCH_KMP) += ts_kmp.o