Move macro.h to shared directory

It's not really related to libkmod, so move it to a directory in which
we keep common stuff.

diff --git a/Makefile.am b/Makefile.am
index eb63073b33fdae08ed06107d222656dfd54f571a..8724de598385d92634461040ba33a9c97e4d2218 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,6 +14,7 @@ AM_MAKEFLAGS = --no-print-directory
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -I$(top_srcdir)/libkmod \
+       -I$(top_srcdir) \
        -DSYSCONFDIR=\""$(sysconfdir)"\" \
        -DLIBEXECDIR=\""$(libexecdir)"\" \
        ${zlib_CFLAGS}
@@ -53,9 +54,9 @@ include_HEADERS = libkmod/libkmod.h
 lib_LTLIBRARIES = libkmod/libkmod.la
 
 libkmod_libkmod_la_SOURCES =\
+       shared/macro.h \
        libkmod/libkmod.h \
        libkmod/libkmod-internal.h \
-       libkmod/macro.h \
        libkmod/missing.h \
        libkmod/libkmod.c \
        libkmod/libkmod-list.c \

diff --git a/libkmod/docs/Makefile.am b/libkmod/docs/Makefile.am
index 7c675813baba58f2a9f223fa18d5033d7535ca34..673c93b115690f4606b8d3a1d8dd518ee5dd3757 100644 (file)
--- a/libkmod/docs/Makefile.am
+++ b/libkmod/docs/Makefile.am
@@ -20,8 +20,7 @@ MKHTML_OPTIONS = --path=$(abs_srcdir)/doc --path=$(abs_builddir)/doc
 HFILE_GLOB = $(top_srcdir)/libkmod/libkmod.h
 CFILE_GLOB = $(top_srcdir)/libkmod/libkmod.c $(top_srcdir)/libkmod/libkmod-module.c $(top_srcdir)/libkmod/libkmod-list.c
 
-IGNORE_HFILES = macro.h \
-               libkmod-internal.h \
+IGNORE_HFILES = libkmod-internal.h \
                libkmod-util.h \
                libkmod-array.h \
                libkmod-hash.h \

diff --git a/libkmod/libkmod-index.c b/libkmod/libkmod-index.c
index 13199a25ecafdd9f1b773efc68b3106374fff852..1c64743d0fc6c9a1fcc7d39b3665dbe7dd26a15b 100644 (file)
--- a/libkmod/libkmod-index.c
+++ b/libkmod/libkmod-index.c
@@ -27,9 +27,10 @@
 #include <assert.h>
 #include <inttypes.h>
 
+#include <shared/macro.h>
+
 #include "libkmod-internal.h"
 #include "libkmod-index.h"
-#include "macro.h"
 
 /* index.c: module index file shared functions for modprobe and depmod */
 

diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h
index 93a00c139fd94bc63e3f373627c87a889bda8f7a..5e12d0d9b4f77fc836244c451c0e75ea706fb8c9 100644 (file)
--- a/libkmod/libkmod-internal.h
+++ b/libkmod/libkmod-internal.h
@@ -5,8 +5,9 @@
 #include <syslog.h>
 #include <limits.h>
 
+#include <shared/macro.h>
+
 #include "missing.h"
-#include "macro.h"
 #include "libkmod.h"
 
 static _always_inline_ _printf_format_(2, 3) void

diff --git a/libkmod/libkmod-util.h b/libkmod/libkmod-util.h
index bc1ed4db8279ff32b553faa3611099c772272f88..f3e9c6852273c70b1a3f0ea5e59ade22307e599e 100644 (file)
--- a/libkmod/libkmod-util.h
+++ b/libkmod/libkmod-util.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "macro.h"
 
 #include <limits.h>
 #include <stdbool.h>
@@ -8,6 +7,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include <shared/macro.h>
 
 char *getline_wrapped(FILE *fp, unsigned int *linenum) __attribute__((nonnull(1)));
 #define streq(a, b) (strcmp((a), (b)) == 0)

diff --git a/libkmod/macro.h b/shared/macro.h
similarity index 97%
rename from libkmod/macro.h
rename to shared/macro.h
index b033bba6ba20de391a54b77ab77b442377d71cff..0f8e4c0d3258f624ab8fb434fad4aa196e8f9c7a 100644 (file)
--- a/libkmod/macro.h
+++ b/shared/macro.h
@@ -1,5 +1,5 @@
 /*
- * libkmod - interface to kernel module operations
+ * kmod - interface to kernel module operations
  *
  * Copyright (C) 2011-2013  ProFUSION embedded systems
  *

diff --git a/testsuite/testsuite.h b/testsuite/testsuite.h
index c90a1d5e68bf25407a4d086ed8a7bd22cf0c30a0..930f4af0f97b2e5dd12f5cb553367b4fae19cdae 100644 (file)
--- a/testsuite/testsuite.h
+++ b/testsuite/testsuite.h
@@ -21,7 +21,7 @@
 #include <stdbool.h>
 #include <stdarg.h>
 
-#include "macro.h"
+#include <shared/macro.h>
 
 struct test;
 typedef int (*testfunc)(const struct test *t);

diff --git a/tools/depmod.c b/tools/depmod.c
index e90ff8384cceb48dfac6216c6de0aee751334f89..41cad0b52409e5265e97c0fec79e2867f70e3a34 100644 (file)
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -21,6 +21,8 @@
 #include "libkmod-hash.h"
 #include "libkmod-util.h"
 
+#include <shared/macro.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <getopt.h>
@@ -119,7 +121,6 @@ static inline void _show(const char *fmt, ...)
 
 /* binary index write *************************************************/
 #include <arpa/inet.h>
-#include "macro.h"
 /* BEGIN: code from module-init-tools/index.c just modified to compile here.
  *
  * Original copyright:

diff --git a/tools/kmod.h b/tools/kmod.h
index 68a646ae2a5c8384ef5c28a25da0e8ea6b106e1e..50adda47dbcc8910b3df7fe701fc20ab95edb9e6 100644 (file)
--- a/tools/kmod.h
+++ b/tools/kmod.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "macro.h"
+#include <shared/macro.h>
 
 struct kmod_cmd {
        const char *name;

diff --git a/tools/modprobe.c b/tools/modprobe.c
index 6b34658d71e093bfcf2c8032dd99f655bc1a378c..eb3a36b7daf9efc90f2a3ca1826f9012916fb982 100644 (file)
--- a/tools/modprobe.c
+++ b/tools/modprobe.c
@@ -33,7 +33,7 @@
 
 #include "libkmod.h"
 #include "libkmod-array.h"
-#include "macro.h"
+#include <shared/macro.h>
 
 #include "kmod.h"
 

diff --git a/tools/rmmod.c b/tools/rmmod.c
index df2f0416ed0f1c0ad4081d885f0a722f3a490a37..8a3c22e69dc3e4397b454206b44ff9240a54fa62 100644 (file)
--- a/tools/rmmod.c
+++ b/tools/rmmod.c
@@ -26,7 +26,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "libkmod.h"
-#include "macro.h"
+#include <shared/macro.h>
 
 #include "kmod.h"