usbhid-dump: move .h files into src/ directory

No need for a two-level-deep include directory for some local include
files.  Just put them next to the .c files and all is good.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

17 files changed, 21 insertions, 42 deletions

diff --git a/usbhid-dump/Makefile.am b/usbhid-dump/Makefile.am
index 2c4eff5..b8ae148 100644
--- a/usbhid-dump/Makefile.am
+++ b/usbhid-dump/Makefile.am
@@ -4,7 +4,7 @@
 #
 # This file is part of usbhid-dump.
 
-SUBDIRS = include src
+SUBDIRS = src
 
 dist_noinst_SCRIPTS = bootstrap
 
diff --git a/usbhid-dump/configure.ac b/usbhid-dump/configure.ac
index 22888da..acde3ea 100644
--- a/usbhid-dump/configure.ac
+++ b/usbhid-dump/configure.ac
@@ -18,10 +18,7 @@ CFLAGS=$CFLAGS
 CFLAGS="-Os -Wall $CFLAGS"
 ABS_SRCDIR=`cd ${srcdir} ; pwd`
 ABS_BUILDDIR=`pwd`
-CPPFLAGS="-I${ABS_BUILDDIR} -I${ABS_BUILDDIR}/include -DNDEBUG $CPPFLAGS"
-if test "$ABS_SRCDIR" != "$ABS_BUILDDIR"; then
-    CPPFLAGS="-I${ABS_SRCDIR}/include $CPPFLAGS"
-fi
+CPPFLAGS="-I${ABS_BUILDDIR} -DNDEBUG $CPPFLAGS"
 
 
 #
@@ -78,7 +75,5 @@ fi
 # Output
 #
 AC_CONFIG_FILES([Makefile
-                 include/Makefile
-                 include/uhd/Makefile
                  src/Makefile])
 AC_OUTPUT
diff --git a/usbhid-dump/include/.gitignore b/usbhid-dump/include/.gitignore
deleted file mode 100644
index 9ee6454..0000000
--- a/usbhid-dump/include/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile.in
-/Makefile
diff --git a/usbhid-dump/include/Makefile.am b/usbhid-dump/include/Makefile.am
deleted file mode 100644
index 1d7b8b4..0000000
--- a/usbhid-dump/include/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright (C) 2010 Nikolai Kondrashov
-#
-# This file is part of usbhid-dump.
-
-SUBDIRS = uhd
diff --git a/usbhid-dump/include/uhd/.gitignore b/usbhid-dump/include/uhd/.gitignore
deleted file mode 100644
index 9ee6454..0000000
--- a/usbhid-dump/include/uhd/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile.in
-/Makefile
diff --git a/usbhid-dump/include/uhd/Makefile.am b/usbhid-dump/include/uhd/Makefile.am
deleted file mode 100644
index 77f443e..0000000
--- a/usbhid-dump/include/uhd/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright (C) 2010 Nikolai Kondrashov
-#
-# This file is part of usbhid-dump.
-
-noinst_HEADERS = \
-    dev.h           \
-    dev_list.h      \
-    iface.h         \
-    iface_list.h    \
-    misc.h
diff --git a/usbhid-dump/src/Makefile.am b/usbhid-dump/src/Makefile.am
index df551ae..af4890a 100644
--- a/usbhid-dump/src/Makefile.am
+++ b/usbhid-dump/src/Makefile.am
@@ -2,6 +2,13 @@
 #
 # Copyright (C) 2010 Nikolai Kondrashov
 
+noinst_HEADERS =		\
+		dev.h		\
+		dev_list.h	\
+		iface.h		\
+		iface_list.h	\
+		misc.h
+
 bin_PROGRAMS = usbhid-dump
 
 usbhid_dump_SOURCES =	\
diff --git a/usbhid-dump/src/dev.c b/usbhid-dump/src/dev.c
index 6cb1363..9d27eed 100644
--- a/usbhid-dump/src/dev.c
+++ b/usbhid-dump/src/dev.c
@@ -7,7 +7,7 @@
 
 #include "config.h"
 
-#include "uhd/dev.h"
+#include "dev.h"
 #include <assert.h>
 #include <stdlib.h>
 
diff --git a/usbhid-dump/include/uhd/dev.h b/usbhid-dump/src/dev.h
index bd34cb6..bd34cb6 100644
--- a/usbhid-dump/include/uhd/dev.h
+++ b/usbhid-dump/src/dev.h
diff --git a/usbhid-dump/src/dev_list.c b/usbhid-dump/src/dev_list.c
index ac90fef..618deee 100644
--- a/usbhid-dump/src/dev_list.c
+++ b/usbhid-dump/src/dev_list.c
@@ -7,8 +7,8 @@
 
 #include "config.h"
 
-#include "uhd/misc.h"
-#include "uhd/dev_list.h"
+#include "misc.h"
+#include "dev_list.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/usbhid-dump/include/uhd/dev_list.h b/usbhid-dump/src/dev_list.h
index 006cb78..e2a8bcf 100644
--- a/usbhid-dump/include/uhd/dev_list.h
+++ b/usbhid-dump/src/dev_list.h
@@ -10,7 +10,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include "uhd/dev.h"
+#include "dev.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/usbhid-dump/src/iface.c b/usbhid-dump/src/iface.c
index 0c84f0b..fced67a 100644
--- a/usbhid-dump/src/iface.c
+++ b/usbhid-dump/src/iface.c
@@ -7,7 +7,7 @@
 
 #include "config.h"
 
-#include "uhd/iface.h"
+#include "iface.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/usbhid-dump/include/uhd/iface.h b/usbhid-dump/src/iface.h
index 88c388a..f467214 100644
--- a/usbhid-dump/include/uhd/iface.h
+++ b/usbhid-dump/src/iface.h
@@ -9,7 +9,7 @@
 #define __UHD_IFACE_H__
 
 #include <stdint.h>
-#include "uhd/dev.h"
+#include "dev.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/usbhid-dump/src/iface_list.c b/usbhid-dump/src/iface_list.c
index e7b6e61..85ee7a5 100644
--- a/usbhid-dump/src/iface_list.c
+++ b/usbhid-dump/src/iface_list.c
@@ -7,8 +7,8 @@
 
 #include "config.h"
 
-#include "uhd/iface_list.h"
-#include "uhd/misc.h"
+#include "iface_list.h"
+#include "misc.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/usbhid-dump/include/uhd/iface_list.h b/usbhid-dump/src/iface_list.h
index 41b1c69..b439b2a 100644
--- a/usbhid-dump/include/uhd/iface_list.h
+++ b/usbhid-dump/src/iface_list.h
@@ -9,8 +9,8 @@
 #define __UHD_IFACE_LIST_H__
 
 #include <stdint.h>
-#include "uhd/dev_list.h"
-#include "uhd/iface.h"
+#include "dev_list.h"
+#include "iface.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/usbhid-dump/include/uhd/misc.h b/usbhid-dump/src/misc.h
index bb623b0..bb623b0 100644
--- a/usbhid-dump/include/uhd/misc.h
+++ b/usbhid-dump/src/misc.h
diff --git a/usbhid-dump/src/usbhid-dump.c b/usbhid-dump/src/usbhid-dump.c
index ae0f101..30d02b5 100644
--- a/usbhid-dump/src/usbhid-dump.c
+++ b/usbhid-dump/src/usbhid-dump.c
@@ -7,8 +7,8 @@
 
 #include "config.h"
 
-#include "uhd/iface_list.h"
-#include "uhd/misc.h"
+#include "iface_list.h"
+#include "misc.h"
 #include <libusb.h>
 
 #include <assert.h>