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, 208 deletions

diff --git a/ubi-utils/src/ubidetach.c b/ubi-utils/src/ubidetach.c
deleted file mode 100644
index 668f1bd..0000000
--- a/ubi-utils/src/ubidetach.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright (C) 2007 Nokia Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- *
- * 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., 51
- * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/*
- * An utility to delete UBI devices (detach MTD devices from UBI).
- *
- * Author: Artem Bityutskiy
- */
-
-#define PROGRAM_VERSION "1.1"
-#define PROGRAM_NAME    "ubidetach"
-
-#include <stdio.h>
-#include <stdint.h>
-#include <getopt.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <libubi.h>
-#include "common.h"
-
-#define DEFAULT_CTRL_DEV "/dev/ubi_ctrl"
-
-/* The variables below are set by command line arguments */
-struct args {
-	int devn;
-	int mtdn;
-	const char *node;
-	const char *dev;
-};
-
-static struct args args = {
-	.devn = UBI_DEV_NUM_AUTO,
-	.mtdn = -1,
-	.node = NULL,
-	.dev = NULL,
-};
-
-static const char doc[] = PROGRAM_NAME " version " PROGRAM_VERSION
-" - tool to remove UBI devices (detach MTD devices from UBI)";
-
-static const char optionsstr[] =
-"-d, --devn=<UBI device number>  UBI device number to delete\n"
-"-p, --dev-path=<path to device> or alternatively, MTD device node path to detach\n"
-"-m, --mtdn=<MTD device number>  or alternatively, MTD device number to detach\n"
-"-h, --help                      print help message\n"
-"-V, --version                   print program version";
-
-static const char usage[] =
-"Usage: " PROGRAM_NAME " [<UBI control device node file name>]\n"
-"\t[-d <UBI device number>] [-m <MTD device number>] [-p <path to device>]\n"
-"\t[--devn=<UBI device number>] [--mtdn=<MTD device number>]\n"
-"\t[--dev-path=<path to device>]\n"
-"UBI control device defaults to " DEFAULT_CTRL_DEV " if not supplied.\n"
-"Example 1: " PROGRAM_NAME " -p /dev/mtd0 - detach MTD device /dev/mtd0\n"
-"Example 2: " PROGRAM_NAME " -d 2 - delete UBI device 2 (ubi2)\n"
-"Example 3: " PROGRAM_NAME " -m 0 - detach MTD device 0 (mtd0)";
-
-static const struct option long_options[] = {
-	{ .name = "devn",     .has_arg = 1, .flag = NULL, .val = 'd' },
-	{ .name = "dev-path", .has_arg = 1, .flag = NULL, .val = 'p' },
-	{ .name = "mtdn",     .has_arg = 1, .flag = NULL, .val = 'm' },
-	{ .name = "help",     .has_arg = 0, .flag = NULL, .val = 'h' },
-	{ .name = "version",  .has_arg = 0, .flag = NULL, .val = 'V' },
-	{ NULL, 0, NULL, 0},
-};
-
-static int parse_opt(int argc, char * const argv[])
-{
-	while (1) {
-		int key, error = 0;
-
-		key = getopt_long(argc, argv, "p:m:d:hV", long_options, NULL);
-		if (key == -1)
-			break;
-
-		switch (key) {
-		case 'p':
-			args.dev = optarg;
-			break;
-		case 'd':
-			args.devn = simple_strtoul(optarg, &error);
-			if (error || args.devn < 0)
-				return errmsg("bad UBI device number: \"%s\"", optarg);
-
-			break;
-
-		case 'm':
-			args.mtdn = simple_strtoul(optarg, &error);
-			if (error || args.mtdn < 0)
-				return errmsg("bad MTD device number: \"%s\"", optarg);
-
-			break;
-
-		case 'h':
-			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 ':':
-			return errmsg("parameter is missing");
-
-		default:
-			fprintf(stderr, "Use -h for help\n");
-			return -1;
-		}
-	}
-
-	if (optind == argc)
-		args.node = DEFAULT_CTRL_DEV;
-	else if (optind != argc - 1)
-		return errmsg("more then one UBI control device specified (use -h for help)");
-	else
-		args.node = argv[optind];
-
-	if (args.mtdn == -1 && args.devn == -1 && args.dev == NULL)
-		return errmsg("neither MTD nor UBI devices were specified (use -h for help)");
-
-	if (args.devn != -1) {
-		if (args.mtdn != -1 || args.dev != NULL)
-			return errmsg("specify either MTD or UBI device (use -h for help)");
-
-	} else if (args.mtdn != -1 && args.dev != NULL)
-		return errmsg("specify either MTD number or device node (use -h for help)");
-
-	return 0;
-}
-
-int main(int argc, char * const argv[])
-{
-	int err;
-	libubi_t libubi;
-	struct ubi_info ubi_info;
-
-	err = parse_opt(argc, argv);
-	if (err)
-		return -1;
-
-	libubi = libubi_open();
-	if (!libubi) {
-		if (errno == 0)
-			return errmsg("UBI is not present in the system");
-		return sys_errmsg("cannot open libubi");
-	}
-
-	/*
-	 * Make sure the kernel is fresh enough and this feature is supported.
-	 */
-	err = ubi_get_info(libubi, &ubi_info);
-	if (err) {
-		sys_errmsg("cannot get UBI information");
-		goto out_libubi;
-	}
-
-	if (ubi_info.ctrl_major == -1) {
-		errmsg("MTD detach/detach feature is not supported by your kernel");
-		goto out_libubi;
-	}
-
-	if (args.devn != -1) {
-		err = ubi_remove_dev(libubi, args.node, args.devn);
-		if (err) {
-			sys_errmsg("cannot remove ubi%d", args.devn);
-			goto out_libubi;
-		}
-	} else {
-		if (args.dev != NULL) {
-			err = ubi_detach(libubi, args.node, args.dev);
-			if (err) {
-				sys_errmsg("cannot detach \"%s\"", args.dev);
-				goto out_libubi;
-			}
-		} else {
-			err = ubi_detach_mtd(libubi, args.node, args.mtdn);
-			if (err) {
-				sys_errmsg("cannot detach mtd%d", args.mtdn);
-				goto out_libubi;
-			}
-		}
-	}
-
-	libubi_close(libubi);
-	return 0;
-
-out_libubi:
-	libubi_close(libubi);
-	return -1;
-}
-