Commit ab76e984 authored by Mike Frysinger's avatar Mike Frysinger Committed by Wolfgang Denk

bzip2: move ifdef handling to Makefile COBJS-$(...)

Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent ae0b05df
......@@ -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
......
#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 */
#include <config.h>
#ifdef CONFIG_BZIP2
/*-------------------------------------------------------------*/
/*--- Table for doing CRCs ---*/
......@@ -144,5 +143,3 @@ UInt32 BZ2_crc32Table[256] = {
/*-------------------------------------------------------------*/
/*--- end crctable.c ---*/
/*-------------------------------------------------------------*/
#endif /* CONFIG_BZIP2 */
#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 */
#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 */
#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 */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment