From 417fa5b907a99e247dcc8f1e3a1d28a40c22416b Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <goliath@infraroot.at>
Date: Wed, 30 Jan 2019 13:48:58 +0100
Subject: [PATCH] Cleanup: remove unpack.h, eliminate subdirectory

Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
---
 Makefile.am                    |  2 +-
 main/cmd/{unpack => }/unpack.c | 10 +++++++++-
 main/cmd/unpack/unpack.h       | 20 --------------------
 3 files changed, 10 insertions(+), 22 deletions(-)
 rename main/cmd/{unpack => }/unpack.c (92%)
 delete mode 100644 main/cmd/unpack/unpack.h

diff --git a/Makefile.am b/Makefile.am
index eca2822..39cbd61 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,7 @@ pkg_SOURCES += main/cmd/dump/dump.c main/cmd/dump/dump.h main/cmd/dump/dump_toc.
 pkg_SOURCES += main/cmd/dump/dump_header.c
 
 # unpack command
-pkg_SOURCES += main/cmd/unpack/unpack.c main/cmd/unpack/unpack.h
+pkg_SOURCES += main/cmd/unpack.c
 
 # help command
 pkg_SOURCES += main/cmd/help.c
diff --git a/main/cmd/unpack/unpack.c b/main/cmd/unpack.c
similarity index 92%
rename from main/cmd/unpack/unpack.c
rename to main/cmd/unpack.c
index c4e8562..faf71e4 100644
--- a/main/cmd/unpack/unpack.c
+++ b/main/cmd/unpack.c
@@ -1,5 +1,13 @@
-#include "unpack.h"
+#include <getopt.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <fcntl.h>
 
+#include "pkgreader.h"
+#include "command.h"
+#include "pkgio.h"
+#include "util.h"
 
 static const struct option long_opts[] = {
 	{ "root", required_argument, NULL, 'r' },
diff --git a/main/cmd/unpack/unpack.h b/main/cmd/unpack/unpack.h
deleted file mode 100644
index f18d8a0..0000000
--- a/main/cmd/unpack/unpack.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef UNPACK_H
-#define UNPACK_H
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <getopt.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#include "image_entry.h"
-#include "pkgreader.h"
-#include "command.h"
-#include "pkgio.h"
-#include "util.h"
-
-#endif /* UNPACK_H */