diff options
| author | Michal Kubecek <mkubecek@suse.cz> | 2020-03-06 18:04:04 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2020-03-13 15:10:50 -0400 |
| commit | 5a0190b2b72f8a0e6116c4981777bace2d674cc2 (patch) | |
| tree | 7df8a9a401ba3957aa66dfabcfe1971437f7e0f7 | |
| parent | 7dc0af7e386e3f7dbb20c4c0004ace450a09cf7e (diff) | |
| download | ethtool-5a0190b2b72f8a0e6116c4981777bace2d674cc2.tar.gz | |
move UAPI header copies to a separate directory
The upcoming netlink series is going to add more local copies of kernel
UAPI header files and some of them are going to include others. Keeping
them in the main directory under modified name would require modifying
those includes as well which would be impractical.
Create a subdirectory uapi and move the UAPI headers there to allow
including them in the usual way.
v3:
- use top_srcdir to fix build in a separate directory
- Makefile.am: no need to touch test_*_CFLAGS
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | internal.h | 4 | ||||
| -rw-r--r-- | uapi/linux/ethtool.h (renamed from ethtool-copy.h) | 0 | ||||
| -rw-r--r-- | uapi/linux/net_tstamp.h (renamed from net_tstamp-copy.h) | 0 |
4 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 3af4d4c..e6d6e4c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,12 +1,13 @@ AM_CFLAGS = -Wall +AM_CPPFLAGS = -I$(top_srcdir)/uapi LDADD = -lm man_MANS = ethtool.8 EXTRA_DIST = LICENSE ethtool.8 ethtool.spec.in aclocal.m4 ChangeLog autogen.sh sbin_PROGRAMS = ethtool -ethtool_SOURCES = ethtool.c ethtool-copy.h internal.h net_tstamp-copy.h \ - rxclass.c +ethtool_SOURCES = ethtool.c uapi/linux/ethtool.h internal.h \ + uapi/linux/net_tstamp.h rxclass.c if ETHTOOL_ENABLE_PRETTY_DUMP ethtool_SOURCES += \ amd8111e.c de2104x.c dsa.c e100.c e1000.c et131x.c igb.c \ @@ -44,8 +44,8 @@ typedef int32_t s32; #define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) #endif -#include "ethtool-copy.h" -#include "net_tstamp-copy.h" +#include <linux/ethtool.h> +#include <linux/net_tstamp.h> #if __BYTE_ORDER == __BIG_ENDIAN static inline u16 cpu_to_be16(u16 value) diff --git a/ethtool-copy.h b/uapi/linux/ethtool.h index 9afd2e6..9afd2e6 100644 --- a/ethtool-copy.h +++ b/uapi/linux/ethtool.h diff --git a/net_tstamp-copy.h b/uapi/linux/net_tstamp.h index 3d421d9..3d421d9 100644 --- a/net_tstamp-copy.h +++ b/uapi/linux/net_tstamp.h |