bzip2: move ifdef handling to Makefile COBJS-$(...)
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
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 @@
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 @@
/*-------------------------------------------------------------*/
/*--- 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 @@
/*-------------------------------------------------------------*/
/*--- 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 @@
/*-------------------------------------------------------------*/
/*--- 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 @@
/*-------------------------------------------------------------*/
/*--- 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 @@
/*-------------------------------------------------------------*/
/*--- end randtable.c ---*/
/*-------------------------------------------------------------*/
-
-#endif /* CONFIG_BZIP2 */