diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-12-07 12:03:13 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-12-07 12:03:13 +0100 |
| commit | 0ee6847f7b6d396d3756f6ecd0781a00b9cca980 (patch) | |
| tree | 1f1bed639ac0bbc9091685538c791b4648f4c342 /lib/Makefile | |
| parent | 61b62f6d33d55c9b89ba8a6fbae84cb9c33e342a (diff) | |
| parent | 8b3d10265da20b8be6138799cee704d53dee1c63 (diff) | |
| download | barebox-0ee6847f7b6d396d3756f6ecd0781a00b9cca980.tar.gz barebox-0ee6847f7b6d396d3756f6ecd0781a00b9cca980.tar.xz | |
Merge branch 'next'
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Makefile b/lib/Makefile index cb72842585..ae76b4c9a7 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -15,8 +15,8 @@ obj-y += libgen.o obj-y += stringlist.o obj-y += recursive_action.o obj-y += make_directory.o -obj-$(CONFIG_BZLIB) += bzlib.o bzlib_crctable.o bzlib_decompress.o bzlib_huffman.o bzlib_randtable.o -obj-$(CONFIG_ZLIB) += zlib.o gunzip.o +obj-$(CONFIG_BZLIB) += decompress_bunzip2.o +obj-$(CONFIG_ZLIB) += decompress_inflate.o zlib_inflate/ obj-$(CONFIG_CMDLINE_EDITING) += readline.o obj-$(CONFIG_SIMPLE_READLINE) += readline_simple.o obj-$(CONFIG_GLOB) += fnmatch.o @@ -30,3 +30,4 @@ obj-y += show_progress.o obj-$(CONFIG_LZO_DECOMPRESS) += decompress_unlzo.o obj-$(CONFIG_PROCESS_ESCAPE_SEQUENCE) += process_escape_sequence.o obj-$(CONFIG_FDT) += fdt/ +obj-y += uncompress.o |