summaryrefslogtreecommitdiff
path: root/lib/Makefile
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-04-08 12:23:30 +0000
committerWolfgang Denk <wd@denx.de>2011-04-30 20:21:45 +0200
commite89516f031dbf711b71e6ee4d131cdc8b9946fb0 (patch)
treecb36d506165e971849cc1237565798fcc236af0b /lib/Makefile
parent56c1769806a437c994355422f5b52ca3eee70834 (diff)
downloadu-boot-imx-e89516f031dbf711b71e6ee4d131cdc8b9946fb0.zip
u-boot-imx-e89516f031dbf711b71e6ee4d131cdc8b9946fb0.tar.gz
u-boot-imx-e89516f031dbf711b71e6ee4d131cdc8b9946fb0.tar.bz2
zlib: split up to match original source tree
While looking to upgrade to zlib-1.2.5, the current mondo merge of multiple files into a single was making things way more difficult than it should have been. Hard to pick out what has been changed to port it to U-Boot, been removed as useless, and bug fixes added after the fact. So split the single file up into the original file names, and merge non-essential changes back from the original tree (for some reason, style in code in a bunch of places was changed to U-Boot style even though this isn't "U-Boot" code). The original build style is retained -- we have a single zlib.c that includes all the other files, and that is the only file we compile. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'lib/Makefile')
-rw-r--r--lib/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/Makefile b/lib/Makefile
index fcfe351..afa6914 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -52,7 +52,6 @@ COBJS-y += string.o
COBJS-y += strmhz.o
COBJS-y += time.o
COBJS-y += vsprintf.o
-COBJS-$(CONFIG_ZLIB) += zlib.o
COBJS-$(CONFIG_RBTREE) += rbtree.o
COBJS := $(COBJS-y)