summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-02-05 21:04:50 -0500
committerWolfgang Denk <wd@denx.de>2009-02-11 23:04:13 +0100
commitab76e9848a1f4db64d14233741d739a3b3360c93 (patch)
treec5ff00e883e95fa221ad35e5065650af84b316e2
parentae0b05df04e1cc65c5ad19ccd362f4be82df7316 (diff)
downloadu-boot-imx-ab76e9848a1f4db64d14233741d739a3b3360c93.zip
u-boot-imx-ab76e9848a1f4db64d14233741d739a3b3360c93.tar.gz
u-boot-imx-ab76e9848a1f4db64d14233741d739a3b3360c93.tar.bz2
bzip2: move ifdef handling to Makefile COBJS-$(...)
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--lib_generic/Makefile10
-rw-r--r--lib_generic/bzlib.c3
-rw-r--r--lib_generic/bzlib_crctable.c3
-rw-r--r--lib_generic/bzlib_decompress.c3
-rw-r--r--lib_generic/bzlib_huffman.c3
-rw-r--r--lib_generic/bzlib_randtable.c3
6 files changed, 5 insertions, 20 deletions
diff --git a/lib_generic/Makefile b/lib_generic/Makefile
index 3f04022..686601c 100644
--- a/lib_generic/Makefile
+++ b/lib_generic/Makefile
@@ -26,11 +26,11 @@ include $(TOPDIR)/config.mk
LIB = $(obj)libgeneric.a
COBJS-$(CONFIG_ADDR_MAP) += addr_map.o
-COBJS-y += bzlib.o
-COBJS-y += bzlib_crctable.o
-COBJS-y += bzlib_decompress.o
-COBJS-y += bzlib_randtable.o
-COBJS-y += bzlib_huffman.o
+COBJS-$(CONFIG_BZIP2) += bzlib.o
+COBJS-$(CONFIG_BZIP2) += bzlib_crctable.o
+COBJS-$(CONFIG_BZIP2) += bzlib_decompress.o
+COBJS-$(CONFIG_BZIP2) += bzlib_randtable.o
+COBJS-$(CONFIG_BZIP2) += bzlib_huffman.o
COBJS-y += crc16.o
COBJS-y += crc32.o
COBJS-y += ctype.o
diff --git a/lib_generic/bzlib.c b/lib_generic/bzlib.c
index 0d3f9c2..5844e18 100644
--- a/lib_generic/bzlib.c
+++ b/lib_generic/bzlib.c
@@ -1,7 +1,6 @@
#include <config.h>
#include <common.h>
#include <watchdog.h>
-#ifdef CONFIG_BZIP2
/*
* This file is a modified version of bzlib.c from the bzip2-1.0.2
@@ -1600,5 +1599,3 @@ void bz_internal_error(int errcode)
/*-------------------------------------------------------------*/
/*--- end bzlib.c ---*/
/*-------------------------------------------------------------*/
-
-#endif /* CONFIG_BZIP2 */
diff --git a/lib_generic/bzlib_crctable.c b/lib_generic/bzlib_crctable.c
index 63770cd..325b966 100644
--- a/lib_generic/bzlib_crctable.c
+++ b/lib_generic/bzlib_crctable.c
@@ -1,5 +1,4 @@
#include <config.h>
-#ifdef CONFIG_BZIP2
/*-------------------------------------------------------------*/
/*--- Table for doing CRCs ---*/
@@ -144,5 +143,3 @@ UInt32 BZ2_crc32Table[256] = {
/*-------------------------------------------------------------*/
/*--- end crctable.c ---*/
/*-------------------------------------------------------------*/
-
-#endif /* CONFIG_BZIP2 */
diff --git a/lib_generic/bzlib_decompress.c b/lib_generic/bzlib_decompress.c
index a575052..4412b8a 100644
--- a/lib_generic/bzlib_decompress.c
+++ b/lib_generic/bzlib_decompress.c
@@ -1,7 +1,6 @@
#include <config.h>
#include <common.h>
#include <watchdog.h>
-#ifdef CONFIG_BZIP2
/*-------------------------------------------------------------*/
/*--- Decompression machinery ---*/
@@ -673,5 +672,3 @@ Int32 BZ2_decompress ( DState* s )
/*-------------------------------------------------------------*/
/*--- end decompress.c ---*/
/*-------------------------------------------------------------*/
-
-#endif /* CONFIG_BZIP2 */
diff --git a/lib_generic/bzlib_huffman.c b/lib_generic/bzlib_huffman.c
index effae98..801b8ec 100644
--- a/lib_generic/bzlib_huffman.c
+++ b/lib_generic/bzlib_huffman.c
@@ -1,5 +1,4 @@
#include <config.h>
-#ifdef CONFIG_BZIP2
/*-------------------------------------------------------------*/
/*--- Huffman coding low-level stuff ---*/
@@ -228,5 +227,3 @@ void BZ2_hbCreateDecodeTables ( Int32 *limit,
/*-------------------------------------------------------------*/
/*--- end huffman.c ---*/
/*-------------------------------------------------------------*/
-
-#endif /* CONFIG_BZIP2 */
diff --git a/lib_generic/bzlib_randtable.c b/lib_generic/bzlib_randtable.c
index a0dd573..c3dc7e4 100644
--- a/lib_generic/bzlib_randtable.c
+++ b/lib_generic/bzlib_randtable.c
@@ -1,5 +1,4 @@
#include <config.h>
-#ifdef CONFIG_BZIP2
/*-------------------------------------------------------------*/
/*--- Table for randomising repetitive blocks ---*/
@@ -124,5 +123,3 @@ Int32 BZ2_rNums[512] = {
/*-------------------------------------------------------------*/
/*--- end randtable.c ---*/
/*-------------------------------------------------------------*/
-
-#endif /* CONFIG_BZIP2 */