From 56868f374f5ba88e766690236a41af36a1e51949 Mon Sep 17 00:00:00 2001
From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date: Wed, 20 Feb 2008 18:00:42 +0200
Subject: ubi-tools: sanify old and new tools a bit

This commit adds compatible options to new ubimkvol, ubirmvol,
and ubiupdatevol and deletes corresponding old utilities.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
---
 ubi-utils/Makefile | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

(limited to 'ubi-utils/Makefile')

diff --git a/ubi-utils/Makefile b/ubi-utils/Makefile
index 7c573e0..8c1994c 100644
--- a/ubi-utils/Makefile
+++ b/ubi-utils/Makefile
@@ -14,8 +14,11 @@ CFLAGS := -I./inc -I./src -I$(KERNELHDR) $(OPTFLAGS) -Werror \
 	-Wwrite-strings -W -std=gnu99 -DPACKAGE_VERSION=\"1.0\"
 
 PERLPROGS = mkpfi ubicrc32.pl
-TARGETS = ubiupdatevol ubimkvol ubirmvol pfiflash pddcustomize ubimirror \
-	bin2nand nand2bin ubigen mkbootenv unubi pfi2bin ubicrc32
+
+NTARGETS = ubiattach ubicrc32 ubidetach ubimkvol ubinfo ubinize \
+	ubirmvol ubiupdatevol
+TARGETS = pfiflash pddcustomize ubimirror bin2nand nand2bin ubigen \
+	mkbootenv unubi pfi2bin $(NTARGETS)
 
 vpath   %.c ./src
 
@@ -31,19 +34,14 @@ all: $(TARGETS)
 IGNORE=${wildcard .*.c.dep}
 -include ${IGNORE}
 
+$(NTARGETS):
+	make -C new-utils $@
+	mv new-utils/$@ $@
+
 clean:
 	rm -rf *.o $(TARGETS) .*.c.dep
 	make -C new-utils clean
 
-ubiupdatevol: ubiupdatevol.o error.o libubi.o
-	$(CC) $(LDFLAGS) -o $@ $^
-
-ubimkvol: ubimkvol.o error.o libubi.o
-	$(CC) $(LDFLAGS) -o $@ $^
-
-ubirmvol: ubirmvol.o error.o libubi.o
-	$(CC) $(LDFLAGS) -o $@ $^
-
 pddcustomize: pddcustomize.o error.o libubimirror.o bootenv.o hashmap.o \
 		libubi.o crc32.o
 	$(CC) $(LDFLAGS) -o $@ $^
@@ -75,17 +73,12 @@ pfi2bin: pfi2bin.o peb.o error.o list.o crc32.o libubigen.o bootenv.o \
 		hashmap.o reader.o pfi.o
 	$(CC) $(LDFLAGS) -o $@ $^
 
-ubicrc32: ubicrc32.o crc32.o
-	$(CC) $(LDFLAGS) -o $@ $^
-
 install: ${TARGETS}
 	mkdir -p ${DESTDIR}/${SBINDIR}
 	install -m0755 ${TARGETS} ${DESTDIR}/${SBINDIR}/
 	(cd perl && install ${PERLPROGS} ${DESTDIR}/${SBINDIR}/)
-	make -C new-utils install
 
 uninstall:
 	for file in ${TARGETS} ${PERLPROGS}; do \
 		$(RM) ${DESTDIR}/${SBINDIR}/$$file; \
 	done
-	make -C new-utils uninstall
-- 
cgit v1.2.3