aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-06-25 00:57:37 -0400
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2011-06-25 09:10:49 +0300
commit5319b84974fcb71504aed2d1b8285e9c0a4a4bb8 (patch)
treeaa1f5fc2e0a785c1d5f65899b93ed817a23890c5
parent352d17fc103848bc511b31c3c7d9307f0c9afb02 (diff)
punt redundant libcrc32v1.4.5
The libcrc32.a is only used in one place: mkfs.ubifs. But this also uses libmtd.a, and the only file in libcrc32.a is also in libmtd.a. So libcrc32.a itself is completely redundant. Punt! Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
-rw-r--r--lib/Makefile5
-rw-r--r--mkfs.ubifs/Makefile2
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 9de6a7d..9b01d32 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -6,12 +6,11 @@ SUBDIRS =
# CFLAGS += -Werror
CPPFLAGS += -I../include
-LIBS = libmtd libcrc32
-TARGETS = libmtd.a libcrc32.a
+LIBS = libmtd
+TARGETS = libmtd.a
include ../common.mk
-$(BUILDDIR)/libcrc32.a: $(addprefix $(BUILDDIR)/, libcrc32.o)
$(BUILDDIR)/libmtd.a: $(addprefix $(BUILDDIR)/,\
libmtd.o libmtd_legacy.o libcrc32.o libfec.o)
diff --git a/mkfs.ubifs/Makefile b/mkfs.ubifs/Makefile
index 499f9e5..ba21a8c 100644
--- a/mkfs.ubifs/Makefile
+++ b/mkfs.ubifs/Makefile
@@ -7,7 +7,7 @@ ALL_SOURCES=*.[ch] hashtable/*.[ch]
TARGETS = mkfs.ubifs
LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid -L$(BUILDDIR)/../ubi-utils/ -lubi
-LDLIBS_mkfs.ubifs += -L$(BUILDDIR)/../lib -lmtd -lcrc32
+LDLIBS_mkfs.ubifs += -L$(BUILDDIR)/../lib -lmtd
LDLIBS_mkfs.ubifs += $(ZLIBLDFLAGS) $(LZOLDFLAGS)
include ../common.mk