rewrite build system to avoid recursion

The ubi-utils/src/ subdir is tossed as it just complicates things for no
real gain.  The dictionary.h header is relocated to the ubi-utils/include/
since other headers in there need it.

The top level clean is replaced with a `find -delete` on objects, so it
might prune more than necessary, but many projects now do this sort of
thing and no one complained there.

A "mkdep" helper generates the actual rule, and the variables are used
with "foreach" to expand these automatically.

The tests subdir is updated only to reflect the ubi-utils source move.
Otherwise, it is left untouched as making that non-recursive isn't really
worth the effort.

While we're gutting things, also through in kbuild style output while
building to make things more legible.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Artem Bityutskiy <dedekind1@gmail.com>

1 files changed, 0 insertions, 245 deletions

diff --git a/ubi-utils/src/ubirsvol.c b/ubi-utils/src/ubirsvol.c
deleted file mode 100644
index 65f579c..0000000
--- a/ubi-utils/src/ubirsvol.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright (c) International Business Machines Corp., 2006
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
- * the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
- * An utility to resize UBI volumes.
- *
- * Authors: Artem Bityutskiy <dedekind@infradead.org>
- *          Frank Haverkamp <haver@vnet.ibm.com>
- */
-
-#define PROGRAM_VERSION "1.1"
-#define PROGRAM_NAME    "ubirsvol"
-
-#include <stdio.h>
-#include <stdint.h>
-#include <getopt.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <libubi.h>
-#include "common.h"
-#include "ubiutils-common.h"
-
-/* The variables below are set by command line arguments */
-struct args {
-	int vol_id;
-	const char *node;
-	const char *name;
-	long long bytes;
-	int lebs;
-};
-
-static struct args args = {
-	.vol_id = -1,
-	.bytes = -1,
-	.lebs = -1,
-};
-
-static const char doc[] = PROGRAM_NAME " version " PROGRAM_VERSION
-				 " - a tool to resize UBI volumes.";
-
-static const char optionsstr[] =
-"-n, --vol_id=<volume id>   volume ID to resize\n"
-"-N, --name=<volume name>   volume name to resize\n"
-"-s, --size=<bytes>         volume size volume size in bytes, kilobytes (KiB)\n"
-"                           or megabytes (MiB)\n"
-"-S, --lebs=<LEBs count>    alternative way to give volume size in logical\n"
-"                           eraseblocks\n"
-"-h, -?, --help             print help message\n"
-"-V, --version              print program version";
-
-
-static const char usage[] =
-"Usage: " PROGRAM_NAME " <UBI device node file name> [-n <volume id>] [--vol_id=<volume id>]\n\n"
-"         [-N <volume name>] [--name=<volume name>] [-s <bytes>] [-S <LEBs>] [-h] [--help]\n\n"
-"Example: " PROGRAM_NAME " /dev/ubi0 -n 1 -s 1MiB resize UBI volume 1 to 1 MiB on\n"
-"         UBI device corresponding to /dev/ubi0\n"
-"         " PROGRAM_NAME " /dev/ubi0 -N my_vol -s 1MiB - resize UBI volume named \"my_vol\" to 1 MiB\n"
-"	  on UBI device corresponding to /dev/ubi0";
-
-static const struct option long_options[] = {
-	{ .name = "vol_id",  .has_arg = 1, .flag = NULL, .val = 'n' },
-	{ .name = "name",    .has_arg = 1, .flag = NULL, .val = 'N' },
-	{ .name = "help",    .has_arg = 0, .flag = NULL, .val = 'h' },
-	{ .name = "version", .has_arg = 0, .flag = NULL, .val = 'V' },
-	{ .name = "size",    .has_arg = 1, .flag = NULL, .val = 's' },
-	{ .name = "lebs",    .has_arg = 1, .flag = NULL, .val = 'S' },
-	{ NULL, 0, NULL, 0},
-};
-
-static int param_sanity_check(void)
-{
-	if (args.vol_id == -1 && !args.name) {
-		errmsg("please, specify either volume ID or volume name");
-		return -1;
-	}
-
-	if (args.vol_id != -1 && args.name) {
-		errmsg("please, specify either volume ID or volume name, not both");
-		return -1;
-	}
-
-	if (args.bytes == -1 && args.lebs == -1)
-		return errmsg("volume size was not specified (use -h for help)");
-
-	if (args.bytes != -1 && args.lebs != -1)
-		return errmsg("size specified with more then one option");
-
-	return 0;
-}
-
-static int parse_opt(int argc, char * const argv[])
-{
-	while (1) {
-		int key, error = 0;
-
-		key = getopt_long(argc, argv, "s:S:n:N:h?V", long_options, NULL);
-		if (key == -1)
-			break;
-
-		switch (key) {
-		case 's':
-			args.bytes = ubiutils_get_bytes(optarg);
-			if (args.bytes <= 0)
-				return errmsg("bad volume size: \"%s\"", optarg);
-			break;
-
-		case 'S':
-			args.lebs = simple_strtoull(optarg, &error);
-			if (error || args.lebs <= 0)
-				return errmsg("bad LEB count: \"%s\"", optarg);
-			break;
-
-		case 'n':
-			args.vol_id = simple_strtoul(optarg, &error);
-			if (error || args.vol_id < 0) {
-				errmsg("bad volume ID: " "\"%s\"", optarg);
-				return -1;
-			}
-			break;
-
-		case 'N':
-			args.name = optarg;
-			break;
-
-		case 'h':
-		case '?':
-			printf("%s\n\n", doc);
-			printf("%s\n\n", usage);
-			printf("%s\n", optionsstr);
-			exit(EXIT_SUCCESS);
-
-		case 'V':
-			fprintf(stderr, "%s\n", PROGRAM_VERSION);
-			exit(EXIT_SUCCESS);
-
-		case ':':
-			errmsg("parameter is missing");
-			return -1;
-
-		default:
-			fprintf(stderr, "Use -h for help\n");
-			return -1;
-		}
-	}
-
-	if (optind == argc) {
-		errmsg("UBI device name was not specified (use -h for help)");
-		return -1;
-	} else if (optind != argc - 1) {
-		errmsg("more then one UBI device specified (use -h for help)");
-		return -1;
-	}
-
-	args.node = argv[optind];
-
-	if (param_sanity_check())
-		return -1;
-
-	return 0;
-}
-
-int main(int argc, char * const argv[])
-{
-	int err;
-	libubi_t libubi;
-	struct ubi_dev_info dev_info;
-	struct ubi_vol_info vol_info;
-
-	err = parse_opt(argc, argv);
-	if (err)
-		return -1;
-
-	libubi = libubi_open();
-	if (!libubi)
-		return sys_errmsg("cannot open libubi");
-
-	err = ubi_probe_node(libubi, args.node);
-	if (err == 2) {
-		errmsg("\"%s\" is an UBI volume node, not an UBI device node",
-		       args.node);
-		goto out_libubi;
-	} else if (err < 0) {
-		if (errno == ENODEV)
-			errmsg("\"%s\" is not an UBI device node", args.node);
-		else
-			sys_errmsg("error while probing \"%s\"", args.node);
-	}
-
-	err = ubi_get_dev_info(libubi, args.node, &dev_info);
-	if (err) {
-		sys_errmsg("cannot get information about UBI device \"%s\"",
-			   args.node);
-		goto out_libubi;
-	}
-
-	if (args.name) {
-		err = ubi_get_vol_info1_nm(libubi, dev_info.dev_num,
-					   args.name, &vol_info);
-		if (err) {
-			sys_errmsg("cannot find UBI volume \"%s\"", args.name);
-			goto out_libubi;
-		}
-
-		args.vol_id = vol_info.vol_id;
-	} else {
-		err = ubi_get_vol_info1(libubi, dev_info.dev_num,
-					   args.vol_id, &vol_info);
-		if (err) {
-			sys_errmsg("cannot find UBI volume ID %d", args.vol_id);
-			goto out_libubi;
-		}
-	}
-
-	if (args.lebs != -1)
-		args.bytes = vol_info.leb_size * args.lebs;
-
-	err = ubi_rsvol(libubi, args.node, args.vol_id, args.bytes);
-	if (err) {
-		sys_errmsg("cannot UBI resize volume");
-		goto out_libubi;
-	}
-
-	libubi_close(libubi);
-	return 0;
-
-out_libubi:
-	libubi_close(libubi);
-	return -1;
-}