diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2011-04-08 12:23:30 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-30 20:21:45 +0200 |
| commit | e89516f031dbf711b71e6ee4d131cdc8b9946fb0 (patch) | |
| tree | cb36d506165e971849cc1237565798fcc236af0b /lib/zlib/Makefile | |
| parent | 56c1769806a437c994355422f5b52ca3eee70834 (diff) | |
| download | u-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/zlib/Makefile')
| -rw-r--r-- | lib/zlib/Makefile | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/lib/zlib/Makefile b/lib/zlib/Makefile new file mode 100644 index 0000000..1596302 --- /dev/null +++ b/lib/zlib/Makefile @@ -0,0 +1,44 @@ +# +# (C) Copyright 2000-2006 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)libz.o + +COBJS-$(CONFIG_ZLIB) += zlib.o + +COBJS := $(COBJS-y) +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(call cmd_link_o_target, $(OBJS)) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### |